From 34a931f84573fde28af4bae53836a725188aa92f Mon Sep 17 00:00:00 2001
From: seb <seb@usr-src.org>
Date: Sat, 28 Jun 2014 16:37:29 +0200
Subject: [PATCH 1/6] [FIX] server: db service, fix the filestore copy when
 duplicating a database

---
 openerp/service/db.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/service/db.py b/openerp/service/db.py
index 33bfc910ebf..afe136ed743 100644
--- a/openerp/service/db.py
+++ b/openerp/service/db.py
@@ -134,7 +134,7 @@ def exp_duplicate_database(db_original_name, db_name):
     from_fs = openerp.tools.config.filestore(db_original_name)
     to_fs = openerp.tools.config.filestore(db_name)
     if os.path.exists(from_fs) and not os.path.exists(to_fs):
-        shutil.copy(from_fs, to_fs)
+        shutil.copytree(from_fs, to_fs)
     return True
 
 def exp_get_progress(id):

From 4ff1c333d90f12318a7348d8d686f754e1552a0c Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sat, 28 Jun 2014 17:32:01 +0200
Subject: [PATCH 2/6] [IMP] menuitems cleanups

Remove Tools
Move cron, action rules and subscription to Automation
Move and rename ir_property models to Parameters
---
 addons/base_action_rule/base_action_rule_view.xml |  5 +----
 addons/multi_company/res_company_view.xml         |  9 ++-------
 addons/subscription/subscription_view.xml         | 14 ++++----------
 openerp/addons/base/base_menu.xml                 |  2 ++
 openerp/addons/base/ir/ir_cron_view.xml           |  2 +-
 openerp/addons/base/ir/ir_logging_view.xml        |  2 +-
 openerp/addons/base/ir/ir_model_view.xml          |  1 -
 openerp/addons/base/res/ir_property_view.xml      |  2 +-
 openerp/addons/base/res/res_company_view.xml      |  6 ++----
 9 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/addons/base_action_rule/base_action_rule_view.xml b/addons/base_action_rule/base_action_rule_view.xml
index 8ed9b2d7b4b..2087d51a0d7 100644
--- a/addons/base_action_rule/base_action_rule_view.xml
+++ b/addons/base_action_rule/base_action_rule_view.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem id="base.menu_base_action_rule_admin" name="Automated Actions"
-            parent="base.menu_custom" />
-
         <!-- Action Rule Form View -->
         <record id="view_base_action_rule_form" model="ir.ui.view">
             <field name="name">base.action.rule.form</field>
@@ -114,7 +111,7 @@
         </record>
 
         <menuitem id="menu_base_action_rule_form"
-            parent="base.menu_base_action_rule_admin" action="base_action_rule_act" sequence="1"/>
+            parent="base.menu_automation" action="base_action_rule_act" sequence="1"/>
 
     </data>
 </openerp>
diff --git a/addons/multi_company/res_company_view.xml b/addons/multi_company/res_company_view.xml
index d69eb6e533d..c7df582a632 100644
--- a/addons/multi_company/res_company_view.xml
+++ b/addons/multi_company/res_company_view.xml
@@ -56,21 +56,16 @@
         </record>
 
         <record id="action_inventory_form" model="ir.actions.act_window">
-            <field name="name">Default Company per Object</field>
+            <field name="name">Company Defaults</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">multi_company.default</field>
             <field name="view_type">form</field>
             <field name="search_view_id" ref="view_inventory_search"/>
         </record>
 
-        <menuitem id="menu_custom_multicompany"
-            name="Multi-Companies"
-            parent="base.menu_custom"
-            sequence="50"/>
-
         <menuitem id="base.menu_action_inventory_form" 
             action="action_inventory_form"
-            parent="menu_custom_multicompany"/>
+            parent="base.menu_ir_property"/>
     </data>
 </openerp>
 
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index 593eefb65a2..7ee225805bb 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <!-- Top menu item -->
-        <menuitem name="Tools" id="base.menu_tools" sequence="120" groups="base.group_tool_user"/>
-        <menuitem id="next_id_45" name="Recurring Events" parent="base.menu_tools" sequence="4"/>
 
         <!-- Subscription Views -->
         <record id="view_subscription_form" model="ir.ui.view">
@@ -85,7 +82,7 @@
         </record>
 
         <record id="action_subscription_form" model="ir.actions.act_window">
-            <field name="name">Subscriptions</field>
+            <field name="name">Recurring Documents</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">subscription.subscription</field>
             <field name="view_type">form</field>
@@ -93,7 +90,7 @@
             <field name="context">{'search_default_User':1}</field>
             <field name="search_view_id" ref="view_subscription_filter"/>
         </record>
-        <menuitem action="action_subscription_form" id="menu_action_subscription_form" parent="subscription.next_id_45"/>
+        <menuitem action="action_subscription_form" id="menu_action_subscription_form" parent="base.menu_automation"/>
 
         <record id="subscription_subscription_history_tree" model="ir.ui.view">
             <field name="name">subscription.subscription.history.tree</field>
@@ -181,17 +178,14 @@
         </record>
 
         <record id="action_document_form" model="ir.actions.act_window">
-            <field name="name">Document Types</field>
+            <field name="name">Recurring Types</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">subscription.document</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="document_tree"/>
             <field name="search_view_id" ref="view_subscription_document_filter"/>
         </record>
-        <menuitem name="Configuration" parent="base.menu_tools"
-              id="base.menu_lunch_survey_root" sequence="20" groups="base.group_tool_manager"/>
-        <menuitem id="config_recuuring_event" name="Recurring Events" parent="base.menu_lunch_survey_root" sequence="4"/>
-        <menuitem action="action_document_form" id="menu_action_document_form" parent="config_recuuring_event"/>
+        <menuitem id="menu_action_document_form" action="action_document_form" parent="base.menu_automation"/>
 
     </data>
 </openerp>
diff --git a/openerp/addons/base/base_menu.xml b/openerp/addons/base/base_menu.xml
index 19f1e8465e2..d9cd0c4e8bf 100644
--- a/openerp/addons/base/base_menu.xml
+++ b/openerp/addons/base/base_menu.xml
@@ -25,6 +25,8 @@
             <menuitem id="menu_custom" name="Technical" parent="menu_administration" sequence="110" groups="base.group_no_one"/>
                 <menuitem id="next_id_2" name="User Interface" parent="menu_custom"/>
                 <menuitem id="menu_email" name="Email" parent="menu_custom" sequence="1"/>
+                <menuitem id="next_id_9" name="Database Structure" parent="base.menu_custom"/>
+                <menuitem id="menu_automation" name="Automation" parent="base.menu_custom"/>
                 <menuitem id="menu_security" name="Security" parent="menu_custom" sequence="25"/>
                 <menuitem id="menu_ir_property" name="Parameters" parent="menu_custom" sequence="24"/>
 
diff --git a/openerp/addons/base/ir/ir_cron_view.xml b/openerp/addons/base/ir/ir_cron_view.xml
index 9d54931a8ce..f65b374f677 100644
--- a/openerp/addons/base/ir/ir_cron_view.xml
+++ b/openerp/addons/base/ir/ir_cron_view.xml
@@ -86,7 +86,7 @@
             <field name="context">{'active_test': False}</field>
             <field name="view_id" ref="ir_cron_view_tree"/>
         </record>
-        <menuitem id="menu_ir_cron_act" action="ir_cron_act" parent="base.next_id_6"/>
+        <menuitem id="menu_ir_cron_act" action="ir_cron_act" parent="base.menu_automation"/>
 
     </data>
 </openerp>
diff --git a/openerp/addons/base/ir/ir_logging_view.xml b/openerp/addons/base/ir/ir_logging_view.xml
index 1c2f3d84b86..6ecd6fa437b 100644
--- a/openerp/addons/base/ir/ir_logging_view.xml
+++ b/openerp/addons/base/ir/ir_logging_view.xml
@@ -61,6 +61,6 @@
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="ir_logging_search_view" />
         </record>
-        <menuitem parent="base.menu_custom" id="ir_logging_all_menu" action="ir_logging_all_act" />
+        <menuitem parent="base.next_id_9" id="ir_logging_all_menu" action="ir_logging_all_act" />
     </data>
 </openerp>
diff --git a/openerp/addons/base/ir/ir_model_view.xml b/openerp/addons/base/ir/ir_model_view.xml
index 0d2f49e0c7b..bdd5868ce03 100644
--- a/openerp/addons/base/ir/ir_model_view.xml
+++ b/openerp/addons/base/ir/ir_model_view.xml
@@ -145,7 +145,6 @@
             <field name="context">{'manual':True}</field>
             <field name="view_id" ref="view_model_tree"/>
         </record>
-        <menuitem id="next_id_9" name="Database Structure" parent="base.menu_custom" groups="base.group_no_one"/>
         <menuitem action="action_model_model" id="ir_model_model_menu" parent="next_id_9"/>
 
         <!-- ir model fields -->
diff --git a/openerp/addons/base/res/ir_property_view.xml b/openerp/addons/base/res/ir_property_view.xml
index 37fb1b742aa..97afe1aafda 100644
--- a/openerp/addons/base/res/ir_property_view.xml
+++ b/openerp/addons/base/res/ir_property_view.xml
@@ -57,7 +57,7 @@
             </field>
         </record>
         <record id="ir_property_form" model="ir.actions.act_window">
-            <field name="name">Configuration Parameters</field>
+            <field name="name">Company Properties</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">ir.property</field>
             <field name="view_type">form</field>
diff --git a/openerp/addons/base/res/res_company_view.xml b/openerp/addons/base/res/res_company_view.xml
index 214166a14d9..f1fb225d951 100644
--- a/openerp/addons/base/res/res_company_view.xml
+++ b/openerp/addons/base/res/res_company_view.xml
@@ -4,8 +4,6 @@
         <menuitem id="menu_res_company_global" parent="base.menu_administration" name="Companies" sequence="2"
             groups="base.group_no_one"/>
 
-        <menuitem id="menu_custom_multicompany" parent="base.menu_custom" name="Multi-Companies" sequence="50"/>
-
         <report id="preview_report" model="res.company" name="preview.report" multi="True" rml="base/report/preview_report.rml" string="Preview Report"/>
         <record id="bank_account_update" model="ir.actions.act_window">
             <field name="name">Company Bank Accounts</field>
@@ -207,13 +205,13 @@
             </field>
         </record>
         <record id="action_inventory_form" model="ir.actions.act_window">
-            <field name="name">Default Company per Object</field>
+            <field name="name">Company Defaults</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">multi_company.default</field>
             <field name="view_type">form</field>
             <field name="search_view_id" ref="view_inventory_search"/>
         </record>
-        <menuitem id="menu_action_inventory_form"  parent="menu_custom_multicompany" action="action_inventory_form"/>
+        <menuitem id="menu_action_inventory_form"  parent="base.menu_ir_property" action="action_inventory_form"/>
 
     </data>
 </openerp>

From 25d0a3ecb1a1bf89f91c58aebaab0fc1bbf12f13 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sat, 28 Jun 2014 19:59:59 +0200
Subject: [PATCH 3/6] [FIX] phantomjs test remove injection

It's now deprecated, assets bundles should be used instead.
---
 addons/website_event_sale/tests/test_ui.py    | 10 +++------
 ....tour.sale.js => website_sale_tour_buy.js} |  0
 ...tour.shop.js => website_sale_tour_shop.js} |  0
 .../website_sale/tests/test_sale_process.py   | 10 +++------
 addons/website_sale/views/templates.xml       | 21 ++++++++++---------
 .../tests/customize_test.py                   |  6 +-----
 6 files changed, 18 insertions(+), 29 deletions(-)
 rename addons/website_sale/static/src/js/{website.tour.sale.js => website_sale_tour_buy.js} (100%)
 rename addons/website_sale/static/src/js/{website.tour.shop.js => website_sale_tour_shop.js} (100%)

diff --git a/addons/website_event_sale/tests/test_ui.py b/addons/website_event_sale/tests/test_ui.py
index 28195e6495f..94395bb3c2d 100644
--- a/addons/website_event_sale/tests/test_ui.py
+++ b/addons/website_event_sale/tests/test_ui.py
@@ -2,19 +2,15 @@ import os
 
 import openerp.tests
 
-inject = [
-    ("openerp.Tour", os.path.join(os.path.dirname(__file__), '../../web/static/src/js/tour.js')),
-]
-
 @openerp.tests.common.at_install(False)
 @openerp.tests.common.post_install(True)
 class TestUi(openerp.tests.HttpCase):
     def test_admin(self):
-        self.phantom_js("/", "openerp.Tour.run('event_buy_tickets', 'test')", "openerp.Tour.tours.event_buy_tickets", inject=inject)
+        self.phantom_js("/", "openerp.Tour.run('event_buy_tickets', 'test')", "openerp.Tour.tours.event_buy_tickets")
 
     def test_demo(self):
-        self.phantom_js("/", "openerp.Tour.run('event_buy_tickets', 'test')", "openerp.Tour.tours.event_buy_tickets", login="demo", password="demo", inject=inject);
+        self.phantom_js("/", "openerp.Tour.run('event_buy_tickets', 'test')", "openerp.Tour.tours.event_buy_tickets", login="demo", password="demo");
 
     def test_public(self):
-        self.phantom_js("/", "openerp.Tour.run('event_buy_tickets', 'test')", "openerp.Tour.tours.event_buy_tickets", login=None, inject=inject);
+        self.phantom_js("/", "openerp.Tour.run('event_buy_tickets', 'test')", "openerp.Tour.tours.event_buy_tickets", login=None);
 
diff --git a/addons/website_sale/static/src/js/website.tour.sale.js b/addons/website_sale/static/src/js/website_sale_tour_buy.js
similarity index 100%
rename from addons/website_sale/static/src/js/website.tour.sale.js
rename to addons/website_sale/static/src/js/website_sale_tour_buy.js
diff --git a/addons/website_sale/static/src/js/website.tour.shop.js b/addons/website_sale/static/src/js/website_sale_tour_shop.js
similarity index 100%
rename from addons/website_sale/static/src/js/website.tour.shop.js
rename to addons/website_sale/static/src/js/website_sale_tour_shop.js
diff --git a/addons/website_sale/tests/test_sale_process.py b/addons/website_sale/tests/test_sale_process.py
index 3f79ac0ea81..d81d4d0caa4 100644
--- a/addons/website_sale/tests/test_sale_process.py
+++ b/addons/website_sale/tests/test_sale_process.py
@@ -2,10 +2,6 @@ import os
 
 import openerp.tests
 
-inject = [
-    ("openerp.Tour", os.path.join(os.path.dirname(__file__), '../../web/static/src/js/tour.js')),
-]
-
 @openerp.tests.common.at_install(False)
 @openerp.tests.common.post_install(True)
 class TestUi(openerp.tests.HttpCase):
@@ -13,10 +9,10 @@ class TestUi(openerp.tests.HttpCase):
         self.phantom_js("/", "openerp.Tour.run('shop', 'test')", "openerp.Tour.tours.shop", login="admin")
 
     def test_02_admin_checkout(self):
-        self.phantom_js("/", "openerp.Tour.run('shop_buy_product', 'test')", "openerp.Tour.tours.shop_buy_product", login="admin", inject=inject)
+        self.phantom_js("/", "openerp.Tour.run('shop_buy_product', 'test')", "openerp.Tour.tours.shop_buy_product", login="admin")
 
     def test_03_demo_checkout(self):
-        self.phantom_js("/", "openerp.Tour.run('shop_buy_product', 'test')", "openerp.Tour.tours.shop_buy_product", login="demo", inject=inject)
+        self.phantom_js("/", "openerp.Tour.run('shop_buy_product', 'test')", "openerp.Tour.tours.shop_buy_product", login="demo")
 
     def test_04_public_checkout(self):
-        self.phantom_js("/", "openerp.Tour.run('shop_buy_product', 'test')", "openerp.Tour.tours.shop_buy_product", inject=inject)
+        self.phantom_js("/", "openerp.Tour.run('shop_buy_product', 'test')", "openerp.Tour.tours.shop_buy_product")
diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index 262b289a326..2f7a248f8f6 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -4,21 +4,21 @@
 
 <!-- Layout and common templates -->
 
-<template id="assets_editor" inherit_id="website.assets_editor" name="Shop Editor" groups="base.group_sale_manager">
+<template id="assets_frontend" inherit_id="website.assets_frontend" name="Shop">
   <xpath expr="." position="inside">
-      <script type="text/javascript" src="/website_sale/static/src/js/website_sale.editor.js"></script>
-      <script type="text/javascript" src="/website_sale/static/src/js/website.tour.shop.js"></script>
+      <link rel='stylesheet' href='/website_sale/static/src/css/website_sale.css'/>
+      <link rel='stylesheet' href='/website_sale/static/src/css/website_mail.css'/>
+      <script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
+      <script type="text/javascript" src="/website_sale/static/src/js/website_sale_payment.js"></script>
+      <script type="text/javascript" src="/website_sale/static/src/js/website_sale_validate.js"></script>
+      <script type="text/javascript" src="/website_sale/static/src/js/website_sale_tour_buy.js"></script>
   </xpath>
 </template>
 
-<template id="assets_frontend" inherit_id="website.assets_frontend" name="Shop">
+<template id="assets_editor" inherit_id="website.assets_editor" name="Shop Editor" groups="base.group_sale_manager">
   <xpath expr="." position="inside">
-      <script type="text/javascript" src="/website_sale/static/src/js/website.tour.sale.js"></script>
-      <script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
-      <link rel='stylesheet' href='/website_sale/static/src/css/website_sale.css'/>
-      <link rel='stylesheet' href='/website_sale/static/src/css/website_mail.css'/>
-      <script type="text/javascript" src="/website_sale/static/src/js/website_sale_payment.js"></script>
-      <script type="text/javascript" src="/website_sale/static/src/js/website_sale_validate.js"></script>
+      <script type="text/javascript" src="/website_sale/static/src/js/website_sale.editor.js"></script>
+      <script type="text/javascript" src="/website_sale/static/src/js/website_sale_tour_shop.js"></script>
   </xpath>
 </template>
 
@@ -33,6 +33,7 @@
       </li>
   </xpath>
 </template>
+
 <template id="search" name="Search hidden fields">
   <t t-if="attrib_values">
     <t t-foreach="attrib_values" t-as="a">
diff --git a/addons/website_sale_options/tests/customize_test.py b/addons/website_sale_options/tests/customize_test.py
index abec0bedacd..a91435c5a0b 100644
--- a/addons/website_sale_options/tests/customize_test.py
+++ b/addons/website_sale_options/tests/customize_test.py
@@ -2,12 +2,8 @@ import os
 
 import openerp.tests
 
-inject = [
-    ("openerp.Tour", os.path.join(os.path.dirname(__file__), '../../web/static/src/js/tour.js')),
-]
-
 @openerp.tests.common.at_install(False)
 @openerp.tests.common.post_install(True)
 class TestUi(openerp.tests.HttpCase):
     def test_01_admin_shop_tour(self):
-        self.phantom_js("/", "openerp.Tour.run('shop_customize', 'test')", "openerp.Tour.tours.shop_customize", login="admin", inject=inject)
+        self.phantom_js("/", "openerp.Tour.run('shop_customize', 'test')", "openerp.Tour.tours.shop_customize", login="admin")

From c60798d3b04d8c425f2521c41039afd531b0ee9d Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sun, 29 Jun 2014 03:46:29 +0200
Subject: [PATCH 4/6] MERGE] odoo bus, im_chat and im_livechat

Add a generic bus for instant communication based on postgres LISTEN/NOTIFY and HTTP comet.
Both threaded and gevent greenlet mode are supported. Chat should now work on every platform.

im_chat improvements
- proper support for multiple windows
- present, away and offline status
- improved data model for multi user chat session

im_livechat improvements
- standard css js assets are now used
- qweb templates are now used instead of jinnja
---
 addons/bus/__init__.py                        |    1 +
 addons/bus/__openerp__.py                     |   13 +
 addons/bus/bus.py                             |  194 +
 addons/bus/security/ir.model.access.csv       |    2 +
 addons/bus/static/src/js/bus.js               |   49 +
 addons/bus/views/bus.xml                      |   12 +
 addons/im/Gruntfile.js                        |   20 -
 addons/im/__init__.py                         |    2 -
 addons/im/im.py                               |  362 -
 addons/im/package.json                        |    6 -
 addons/im/security/im_security.xml            |   26 -
 addons/im/security/ir.model.access.csv        |    4 -
 addons/im/static/src/js/im.js                 |  176 -
 addons/im/static/src/js/im_common.js          |  562 -
 addons/im/static/src/xml/im.xml               |   32 -
 addons/im/static/src/xml/im_common.xml        |   42 -
 addons/im/views/im.xml                        |   15 -
 addons/im/watcher.py                          |   85 -
 addons/im_chat/__init__.py                    |    1 +
 addons/{im => im_chat}/__openerp__.py         |    9 +-
 addons/im_chat/im_chat.py                     |  364 +
 addons/im_chat/security/im_security.xml       |   37 +
 addons/im_chat/security/ir.model.access.csv   |    5 +
 .../static/description/icon.png               |  Bin
 .../{im => im_chat}/static/src/audio/purr.mp3 |  Bin
 .../{im => im_chat}/static/src/audio/purr.ogg |  Bin
 .../static/src/audio/ting.mp3}                |  Bin
 .../static/src/audio/ting.ogg}                |  Bin
 .../static/src/css/im_chat.css}               |    4 +-
 .../static/src/css/im_common.css              |   56 +-
 .../static/src/img/avatar.jpg}                |  Bin
 .../static/src/img/button-gloss.png           |  Bin
 .../src/img/glyphicons-halflings-white.png    |  Bin
 .../static/src/img/glyphicons-halflings.png   |  Bin
 .../{im => im_chat}/static/src/img/green.png  |  Bin
 .../{im => im_chat}/static/src/img/logo.png   |  Bin
 addons/im_chat/static/src/img/musti.png       |  Bin 0 -> 1017 bytes
 addons/im_chat/static/src/img/pinky.png       |  Bin 0 -> 2978 bytes
 .../{im => im_chat}/static/src/img/wood.png   |  Bin
 addons/im_chat/static/src/img/yellow.png      |  Bin 0 -> 855 bytes
 addons/im_chat/static/src/js/im_chat.js       |  596 ++
 addons/im_chat/static/src/xml/im_chat.xml     |   93 +
 addons/im_chat/views/im_chat.xml              |   14 +
 addons/im_livechat/__init__.py                |    1 -
 addons/im_livechat/__openerp__.py             |    6 +-
 addons/im_livechat/im_livechat.py             |  184 +-
 addons/im_livechat/include.html               |    2 -
 addons/im_livechat/loader.js                  |   47 -
 .../security/im_livechat_security.xml         |    4 +-
 .../im_livechat/security/ir.model.access.csv  |    2 -
 addons/im_livechat/static/ext/.bowerrc        |    3 -
 addons/im_livechat/static/ext/Gruntfile.js    |   20 -
 addons/im_livechat/static/ext/Makefile        |    3 -
 addons/im_livechat/static/ext/bower.json      |   18 -
 addons/im_livechat/static/ext/package.json    |    6 -
 .../static/ext/static/js/livesupport.js       |  125 -
 .../lib/jquery-achtung/src/ui.achtung.css     |  346 -
 .../lib/jquery-achtung/src/ui.achtung.js      |  282 -
 .../static/ext/static/lib/jquery/jquery.js    | 9472 -----------------
 .../static/ext/static/lib/qweb/qweb2.js       |  736 --
 .../ext/static/lib/requirejs/require.js       | 2053 ----
 .../ext/static/lib/underscore/underscore.js   |  999 --
 addons/im_livechat/static/ext/test.html       |   10 -
 .../im_livechat/static/src/js/im_livechat.js  |  146 +
 .../livechat.xml => src/xml/im_livechat.xml}  |    0
 addons/im_livechat/views/im_livechat.xml      |  144 +
 .../{ => views}/im_livechat_view.xml          |   31 +-
 addons/im_livechat/web_page.html              |   61 -
 addons/website_livechat/__openerp__.py        |    6 +-
 .../views/website_livechat.xml                |    6 +-
 70 files changed, 1860 insertions(+), 15635 deletions(-)
 create mode 100644 addons/bus/__init__.py
 create mode 100644 addons/bus/__openerp__.py
 create mode 100644 addons/bus/bus.py
 create mode 100644 addons/bus/security/ir.model.access.csv
 create mode 100644 addons/bus/static/src/js/bus.js
 create mode 100644 addons/bus/views/bus.xml
 delete mode 100644 addons/im/Gruntfile.js
 delete mode 100644 addons/im/__init__.py
 delete mode 100644 addons/im/im.py
 delete mode 100644 addons/im/package.json
 delete mode 100644 addons/im/security/im_security.xml
 delete mode 100644 addons/im/security/ir.model.access.csv
 delete mode 100644 addons/im/static/src/js/im.js
 delete mode 100644 addons/im/static/src/js/im_common.js
 delete mode 100644 addons/im/static/src/xml/im.xml
 delete mode 100644 addons/im/static/src/xml/im_common.xml
 delete mode 100644 addons/im/views/im.xml
 delete mode 100644 addons/im/watcher.py
 create mode 100644 addons/im_chat/__init__.py
 rename addons/{im => im_chat}/__openerp__.py (76%)
 create mode 100644 addons/im_chat/im_chat.py
 create mode 100644 addons/im_chat/security/im_security.xml
 create mode 100644 addons/im_chat/security/ir.model.access.csv
 rename addons/{im => im_chat}/static/description/icon.png (100%)
 rename addons/{im => im_chat}/static/src/audio/purr.mp3 (100%)
 rename addons/{im => im_chat}/static/src/audio/purr.ogg (100%)
 rename addons/{im/static/src/audio/Ting.mp3 => im_chat/static/src/audio/ting.mp3} (100%)
 rename addons/{im/static/src/audio/Ting.ogg => im_chat/static/src/audio/ting.ogg} (100%)
 rename addons/{im/static/src/css/im.css => im_chat/static/src/css/im_chat.css} (99%)
 rename addons/{im => im_chat}/static/src/css/im_common.css (81%)
 rename addons/{im/static/src/img/avatar/avatar.jpeg => im_chat/static/src/img/avatar.jpg} (100%)
 rename addons/{im => im_chat}/static/src/img/button-gloss.png (100%)
 rename addons/{im => im_chat}/static/src/img/glyphicons-halflings-white.png (100%)
 rename addons/{im => im_chat}/static/src/img/glyphicons-halflings.png (100%)
 rename addons/{im => im_chat}/static/src/img/green.png (100%)
 rename addons/{im => im_chat}/static/src/img/logo.png (100%)
 create mode 100644 addons/im_chat/static/src/img/musti.png
 create mode 100644 addons/im_chat/static/src/img/pinky.png
 rename addons/{im => im_chat}/static/src/img/wood.png (100%)
 create mode 100644 addons/im_chat/static/src/img/yellow.png
 create mode 100644 addons/im_chat/static/src/js/im_chat.js
 create mode 100644 addons/im_chat/static/src/xml/im_chat.xml
 create mode 100644 addons/im_chat/views/im_chat.xml
 delete mode 100644 addons/im_livechat/include.html
 delete mode 100644 addons/im_livechat/loader.js
 delete mode 100644 addons/im_livechat/static/ext/.bowerrc
 delete mode 100644 addons/im_livechat/static/ext/Gruntfile.js
 delete mode 100644 addons/im_livechat/static/ext/Makefile
 delete mode 100644 addons/im_livechat/static/ext/bower.json
 delete mode 100644 addons/im_livechat/static/ext/package.json
 delete mode 100644 addons/im_livechat/static/ext/static/js/livesupport.js
 delete mode 100644 addons/im_livechat/static/ext/static/lib/jquery-achtung/src/ui.achtung.css
 delete mode 100644 addons/im_livechat/static/ext/static/lib/jquery-achtung/src/ui.achtung.js
 delete mode 100644 addons/im_livechat/static/ext/static/lib/jquery/jquery.js
 delete mode 100644 addons/im_livechat/static/ext/static/lib/qweb/qweb2.js
 delete mode 100644 addons/im_livechat/static/ext/static/lib/requirejs/require.js
 delete mode 100644 addons/im_livechat/static/ext/static/lib/underscore/underscore.js
 delete mode 100644 addons/im_livechat/static/ext/test.html
 create mode 100644 addons/im_livechat/static/src/js/im_livechat.js
 rename addons/im_livechat/static/{ext/static/js/livechat.xml => src/xml/im_livechat.xml} (100%)
 create mode 100644 addons/im_livechat/views/im_livechat.xml
 rename addons/im_livechat/{ => views}/im_livechat_view.xml (85%)
 delete mode 100644 addons/im_livechat/web_page.html

diff --git a/addons/bus/__init__.py b/addons/bus/__init__.py
new file mode 100644
index 00000000000..a64d1f14026
--- /dev/null
+++ b/addons/bus/__init__.py
@@ -0,0 +1 @@
+import bus
diff --git a/addons/bus/__openerp__.py b/addons/bus/__openerp__.py
new file mode 100644
index 00000000000..35f8f9473ac
--- /dev/null
+++ b/addons/bus/__openerp__.py
@@ -0,0 +1,13 @@
+{
+    'name' : 'IM Bus',
+    'version': '1.0',
+    'author': 'OpenERP SA',
+    'category': 'Hidden',
+    'complexity': 'easy',
+    'description': "Instant Messaging Bus allow you to send messages to users, in live.",
+    'depends': ['base', 'web'],
+    'data': [
+        'views/bus.xml',
+        'security/ir.model.access.csv',
+    ],
+}
diff --git a/addons/bus/bus.py b/addons/bus/bus.py
new file mode 100644
index 00000000000..dc6ff6d7f1a
--- /dev/null
+++ b/addons/bus/bus.py
@@ -0,0 +1,194 @@
+# -*- coding: utf-8 -*-
+import datetime
+import json
+import logging
+import select
+import threading
+import time
+import random
+
+import simplejson
+import openerp
+from openerp.osv import osv, fields
+from openerp.http import request
+from openerp.tools.misc import DEFAULT_SERVER_DATETIME_FORMAT
+
+_logger = logging.getLogger(__name__)
+
+TIMEOUT = 50
+
+#----------------------------------------------------------
+# Bus
+#----------------------------------------------------------
+def json_dump(v):
+    return simplejson.dumps(v, separators=(',', ':'))
+
+def hashable(key):
+    if isinstance(key, list):
+        key = tuple(key)
+    return key
+
+class ImBus(osv.Model):
+    _name = 'bus.bus'
+    _columns = {
+        'id' : fields.integer('Id'),
+        'create_date' : fields.datetime('Create date'),
+        'channel' : fields.char('Channel'),
+        'message' : fields.char('Message'),
+    }
+
+    def gc(self, cr, uid):
+        timeout_ago = datetime.datetime.utcnow()-datetime.timedelta(seconds=TIMEOUT*2)
+        domain = [('create_date', '<', timeout_ago.strftime(DEFAULT_SERVER_DATETIME_FORMAT))]
+        ids  = self.search(cr, openerp.SUPERUSER_ID, domain)
+        self.unlink(cr, openerp.SUPERUSER_ID, ids)
+
+    def sendmany(self, cr, uid, notifications):
+        channels = set()
+        for channel, message in notifications:
+            channels.add(channel)
+            values = {
+                "channel" : json_dump(channel),
+                "message" : json_dump(message)
+            }
+            cr.commit()
+            self.pool['bus.bus'].create(cr, openerp.SUPERUSER_ID, values)
+            if random.random() < 0.01:
+                self.gc(cr, uid)
+        if channels:
+            with openerp.sql_db.db_connect('postgres').cursor() as cr2:
+                cr2.execute("notify imbus, %s", (json_dump(list(channels)),))
+
+    def sendone(self, cr, uid, channel, message):
+        self.sendmany(cr, uid, [[channel, message]])
+
+    def poll(self, cr, uid, channels, last=0):
+        # first poll return the notification in the 'buffer'
+        if last == 0:
+            timeout_ago = datetime.datetime.utcnow()-datetime.timedelta(seconds=TIMEOUT)
+            domain = [('create_date', '>', timeout_ago.strftime(DEFAULT_SERVER_DATETIME_FORMAT))]
+        else:
+            # else returns the unread notifications
+            domain = [('id','>',last)]
+        channels = [json_dump(c) for c in channels]
+        domain.append(('channel','in',channels))
+        notifications = self.search_read(cr, openerp.SUPERUSER_ID, domain)
+        return [{"id":notif["id"], "channel": simplejson.loads(notif["channel"]), "message":simplejson.loads(notif["message"])} for notif in notifications]
+
+class ImDispatch(object):
+    def __init__(self):
+        self.channels = {}
+
+    def poll(self, dbname, channels, last, timeout=TIMEOUT):
+        # Dont hang ctrl-c for a poll request, we need to bypass private
+        # attribute access because we dont know before starting the thread that
+        # it will handle a longpolling request
+        if not openerp.evented:
+            current = threading.current_thread()
+            current._Thread__daemonic = True
+            # rename the thread to avoid tests waiting for a longpolling
+            current.setName("openerp.longpolling.request.%s" % current.ident)
+
+        registry = openerp.registry(dbname)
+
+        # immediatly returns if past notifications exist
+        with registry.cursor() as cr:
+            notifications = registry['bus.bus'].poll(cr, openerp.SUPERUSER_ID, channels, last)
+        # or wait for future ones
+        if not notifications:
+            event = self.Event()
+            for c in channels:
+                self.channels.setdefault(hashable(c), []).append(event)
+            try:
+                event.wait(timeout=timeout)
+                with registry.cursor() as cr:
+                    notifications = registry['bus.bus'].poll(cr, openerp.SUPERUSER_ID, channels, last)
+            except Exception:
+                # timeout
+                pass
+        return notifications
+
+    def loop(self):
+        """ Dispatch postgres notifications to the relevant polling threads/greenlets """
+        _logger.info("Bus.loop listen imbus on db postgres")
+        with openerp.sql_db.db_connect('postgres').cursor() as cr:
+            conn = cr._cnx
+            cr.execute("listen imbus")
+            cr.commit();
+            while True:
+                if select.select([conn], [], [], TIMEOUT) == ([],[],[]):
+                    pass
+                else:
+                    conn.poll()
+                    channels = []
+                    while conn.notifies:
+                        channels.extend(json.loads(conn.notifies.pop().payload))
+                    # dispatch to local threads/greenlets
+                    events = set()
+                    for c in channels:
+                        events.update(self.channels.pop(hashable(c),[]))
+                    for e in events:
+                        e.set()
+
+    def run(self):
+        while True:
+            try:
+                self.loop()
+            except Exception, e:
+                _logger.exception("Bus.loop error, sleep and retry")
+                time.sleep(TIMEOUT)
+
+    def start(self):
+        if openerp.evented:
+            # gevent mode
+            import gevent
+            self.Event = gevent.event.Event
+            gevent.spawn(self.run)
+        elif openerp.multi_process:
+            # disabled in prefork mode
+            return
+        else:
+            # threaded mode
+            self.Event = threading.Event
+            t = threading.Thread(name="%s.Bus" % __name__, target=self.run)
+            t.daemon = True
+            t.start()
+        return self
+
+dispatch = ImDispatch().start()
+
+#----------------------------------------------------------
+# Controller
+#----------------------------------------------------------
+class Controller(openerp.http.Controller):
+    """ Examples:
+    openerp.jsonRpc('/longpolling/poll','call',{"channels":["c1"],last:0}).then(function(r){console.log(r)});
+    openerp.jsonRpc('/longpolling/send','call',{"channel":"c1","message":"m1"});
+    openerp.jsonRpc('/longpolling/send','call',{"channel":"c2","message":"m2"});
+    """
+
+    @openerp.http.route('/longpolling/send', type="json", auth="public")
+    def send(self, channel, message):
+        if not isinstance(channel, basestring):
+            raise Exception("bus.Bus only string channels are allowed.")
+        registry, cr, uid, context = request.registry, request.cr, request.session.uid, request.context
+        return registry['bus.bus'].sendone(cr, uid, channel, message)
+
+    # override to add channels
+    def _poll(self, dbname, channels, last, options):
+        request.cr.close()
+        request._cr = None
+        return dispatch.poll(dbname, channels, last)
+
+    @openerp.http.route('/longpolling/poll', type="json", auth="public")
+    def poll(self, channels, last, options=None):
+        if options is None:
+            options = {}
+        if not dispatch:
+            raise Exception("bus.Bus unavailable")
+        if [c for c in channels if not isinstance(c, basestring)]:
+            print channels
+            raise Exception("bus.Bus only string channels are allowed.")
+        return self._poll(request.db, channels, last, options)
+
+# vim:et:
diff --git a/addons/bus/security/ir.model.access.csv b/addons/bus/security/ir.model.access.csv
new file mode 100644
index 00000000000..8a679b74f81
--- /dev/null
+++ b/addons/bus/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_bus_bus,bus.bus public,model_bus_bus,,0,0,0,0
\ No newline at end of file
diff --git a/addons/bus/static/src/js/bus.js b/addons/bus/static/src/js/bus.js
new file mode 100644
index 00000000000..34fae260a3a
--- /dev/null
+++ b/addons/bus/static/src/js/bus.js
@@ -0,0 +1,49 @@
+(function() {
+    var bus = openerp.bus = {};
+
+    bus.ERROR_DELAY = 30000;
+
+    bus.Bus = openerp.Widget.extend({
+        init: function(){
+            this._super();
+            this.options = {};
+            this.activated = false;
+            this.channels = [];
+            this.last = 0;
+        },
+        start_polling: function(){
+            if(!this.activated){
+                this.poll();
+            }
+        },
+        poll: function() {
+            var self = this;
+            self.activated = true;
+            var data = {'channels': self.channels, 'last': self.last, 'options' : self.options};
+            openerp.jsonRpc('/longpolling/poll', 'call', data).then(function(result) {
+                _.each(result, _.bind(self.on_notification, self));
+                self.poll();
+            }, function(unused, e) {
+                setTimeout(_.bind(self.poll, self), bus.ERROR_DELAY);
+            });
+        },
+        on_notification: function(notification) {
+            if (notification.id > this.last) {
+                this.last = notification.id;
+            }
+            this.trigger("notification", [notification.channel, notification.message]);
+        },
+        add_channel: function(channel){
+            if(!_.contains(this.channels, channel)){
+                this.channels.push(channel);
+            }
+        },
+        delete_channel: function(channel){
+            this.channels = _.without(this.channels, channel);
+        },
+    });
+
+    // singleton
+    bus.bus = new bus.Bus();
+    return bus;
+})();
\ No newline at end of file
diff --git a/addons/bus/views/bus.xml b/addons/bus/views/bus.xml
new file mode 100644
index 00000000000..4f24e27f897
--- /dev/null
+++ b/addons/bus/views/bus.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- vim:fdn=3:
+-->
+<openerp>
+    <data>
+        <template id="assets_backend" name="im assets" inherit_id="web.assets_backend">
+            <xpath expr="." position="inside">
+                <script type="text/javascript" src="/bus/static/src/js/bus.js"></script>
+            </xpath>
+        </template>
+    </data>
+</openerp>
diff --git a/addons/im/Gruntfile.js b/addons/im/Gruntfile.js
deleted file mode 100644
index e8c88bbec9a..00000000000
--- a/addons/im/Gruntfile.js
+++ /dev/null
@@ -1,20 +0,0 @@
-module.exports = function(grunt) {
-
-    grunt.initConfig({
-        jshint: {
-            src: ['static/src/js/*.js'],
-            options: {
-                sub: true, //[] instead of .
-                evil: true, //eval
-                laxbreak: true, //unsafe line breaks
-            },
-        },
-    });
-
-    grunt.loadNpmTasks('grunt-contrib-jshint');
-
-    grunt.registerTask('test', []);
-
-    grunt.registerTask('default', ['jshint']);
-
-};
\ No newline at end of file
diff --git a/addons/im/__init__.py b/addons/im/__init__.py
deleted file mode 100644
index 23c6ad13350..00000000000
--- a/addons/im/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-
-import im
diff --git a/addons/im/im.py b/addons/im/im.py
deleted file mode 100644
index af3e8e5b10b..00000000000
--- a/addons/im/im.py
+++ /dev/null
@@ -1,362 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-import datetime
-import json
-import logging
-import select
-import time
-
-import openerp
-import openerp.tools.config
-import openerp.modules.registry
-from openerp import http
-from openerp.http import request
-from openerp.osv import osv, fields, expression
-from openerp.tools.misc import DEFAULT_SERVER_DATETIME_FORMAT
-
-_logger = logging.getLogger(__name__)
-
-def listen_channel(cr, channel_name, handle_message, check_stop=(lambda: False), check_stop_timer=60.):
-    """
-        Begin a loop, listening on a PostgreSQL channel. This method does never terminate by default, you need to provide a check_stop
-        callback to do so. This method also assume that all notifications will include a message formated using JSON (see the
-        corresponding notify_channel() method).
-
-        :param db_name: database name
-        :param channel_name: the name of the PostgreSQL channel to listen
-        :param handle_message: function that will be called when a message is received. It takes one argument, the message
-            attached to the notification.
-        :type handle_message: function (one argument)
-        :param check_stop: function that will be called periodically (see the check_stop_timer argument). If it returns True
-            this function will stop to watch the channel.
-        :type check_stop: function (no arguments)
-        :param check_stop_timer: The maximum amount of time between calls to check_stop_timer (can be shorter if messages
-            are received).
-    """
-    try:
-        conn = cr._cnx
-        cr.execute("listen " + channel_name + ";")
-        cr.commit();
-        stopping = False
-        while not stopping:
-            if check_stop():
-                stopping = True
-                break
-            if select.select([conn], [], [], check_stop_timer) == ([],[],[]):
-                pass
-            else:
-                conn.poll()
-                while conn.notifies:
-                    message = json.loads(conn.notifies.pop().payload)
-                    handle_message(message)
-    finally:
-        try:
-            cr.execute("unlisten " + channel_name + ";")
-            cr.commit()
-        except:
-            pass # can't do anything if that fails
-
-def notify_channel(cr, channel_name, message):
-    """
-        Send a message through a PostgreSQL channel. The message will be formatted using JSON. This method will
-        commit the given transaction because the notify command in Postgresql seems to work correctly when executed in
-        a separate transaction (despite what is written in the documentation).
-
-        :param cr: The cursor.
-        :param channel_name: The name of the PostgreSQL channel.
-        :param message: The message, must be JSON-compatible data.
-    """
-    cr.commit()
-    cr.execute("notify " + channel_name + ", %s", [json.dumps(message)])
-    cr.commit()
-
-POLL_TIMER = 30
-DISCONNECTION_TIMER = POLL_TIMER + 5
-WATCHER_ERROR_DELAY = 10
-
-class LongPollingController(http.Controller):
-
-    @http.route('/longpolling/im/poll', type="json", auth="none")
-    def poll(self, last=None, users_watch=None, db=None, uid=None, password=None, uuid=None):
-        assert_uuid(uuid)
-        if not openerp.evented:
-            raise Exception("Not usable in a server not running gevent")
-        from openerp.addons.im.watcher import ImWatcher
-        if db is not None:
-            openerp.service.security.check(db, uid, password)
-        else:
-            uid = request.session.uid
-            db = request.session.db
-
-        registry = openerp.modules.registry.RegistryManager.get(db)
-        with registry.cursor() as cr:
-            registry.get('im.user').im_connect(cr, uid, uuid=uuid, context=request.context)
-            my_id = registry.get('im.user').get_my_id(cr, uid, uuid, request.context)
-        num = 0
-        while True:
-            with registry.cursor() as cr:
-                res = registry.get('im.message').get_messages(cr, uid, last, users_watch, uuid=uuid, context=request.context)
-            if num >= 1 or len(res["res"]) > 0:
-                return res
-            last = res["last"]
-            num += 1
-            ImWatcher.get_watcher(res["dbname"]).stop(my_id, users_watch or [], POLL_TIMER)
-
-    @http.route('/longpolling/im/activated', type="json", auth="none")
-    def activated(self):
-        return not not openerp.evented
-
-    @http.route('/longpolling/im/gen_uuid', type="json", auth="none")
-    def gen_uuid(self):
-        import uuid
-        return "%s" % uuid.uuid1()
-
-def assert_uuid(uuid):
-    if not isinstance(uuid, (str, unicode, type(None))) and uuid != False:
-        raise Exception("%s is not a uuid" % uuid)
-
-
-class im_message(osv.osv):
-    _name = 'im.message'
-
-    _order = "date desc"
-
-    _columns = {
-        'message': fields.text(string="Message", required=True),
-        'from_id': fields.many2one("im.user", "From", required= True, ondelete='cascade'),
-        'session_id': fields.many2one("im.session", "Session", required=True, select=True, ondelete='cascade'),
-        'to_id': fields.many2many("im.user", "im_message_users", 'message_id', 'user_id', 'To'),
-        'date': fields.datetime("Date", required=True, select=True),
-        'technical': fields.boolean("Technical Message"),
-    }
-
-    _defaults = {
-        'date': lambda *args: datetime.datetime.now().strftime(DEFAULT_SERVER_DATETIME_FORMAT),
-        'technical': False,
-    }
-    
-    def get_messages(self, cr, uid, last=None, users_watch=None, uuid=None, context=None):
-        assert_uuid(uuid)
-        users_watch = users_watch or []
-
-        # complex stuff to determine the last message to show
-        users = self.pool.get("im.user")
-        my_id = users.get_my_id(cr, uid, uuid, context=context)
-        c_user = users.browse(cr, openerp.SUPERUSER_ID, my_id, context=context)
-        if last:
-            if c_user.im_last_received < last:
-                users.write(cr, openerp.SUPERUSER_ID, my_id, {'im_last_received': last}, context=context)
-        else:
-            last = c_user.im_last_received or -1
-
-        # how fun it is to always need to reorder results from read
-        mess_ids = self.search(cr, openerp.SUPERUSER_ID, ["&", ['id', '>', last], "|", ['from_id', '=', my_id], ['to_id', 'in', [my_id]]], order="id", context=context)
-        mess = self.read(cr, openerp.SUPERUSER_ID, mess_ids, ["id", "message", "from_id", "session_id", "date", "technical"], context=context)
-        index = {}
-        for i in xrange(len(mess)):
-            index[mess[i]["id"]] = mess[i]
-        mess = []
-        for i in mess_ids:
-            mess.append(index[i])
-
-        if len(mess) > 0:
-            last = mess[-1]["id"]
-        users_status = users.read(cr, openerp.SUPERUSER_ID, users_watch, ["im_status"], context=context)
-        return {"res": mess, "last": last, "dbname": cr.dbname, "users_status": users_status}
-
-    def post(self, cr, uid, message, to_session_id, technical=False, uuid=None, context=None):
-        assert_uuid(uuid)
-        my_id = self.pool.get('im.user').get_my_id(cr, uid, uuid)
-        session_user_ids = self.pool.get('im.session').get_session_users(cr, uid, to_session_id, context=context).get("user_ids", [])
-        to_ids = [user_id for user_id in session_user_ids if user_id != my_id]
-        self.create(cr, openerp.SUPERUSER_ID, {"message": message, 'from_id': my_id,
-            'to_id': [(6, 0, to_ids)], 'session_id': to_session_id, 'technical': technical}, context=context)
-        notify_channel(cr, "im_channel", {'type': 'message', 'receivers': [my_id] + to_ids})
-        return False
-
-class im_session(osv.osv):
-    _name = 'im.session'
-
-    def _calc_name(self, cr, uid, ids, something, something_else, context=None):
-        res = {}
-        for obj in self.browse(cr, uid, ids, context=context):
-            res[obj.id] = ", ".join([x.name for x in obj.user_ids])
-        return res
-
-    _columns = {
-        'user_ids': fields.many2many('im.user', 'im_session_im_user_rel', 'im_session_id', 'im_user_id', 'Users'),
-        "name": fields.function(_calc_name, string="Name", type='char'),
-    }
-
-    # Todo: reuse existing sessions if possible
-    def session_get(self, cr, uid, users_to, uuid=None, context=None):
-        my_id = self.pool.get("im.user").get_my_id(cr, uid, uuid, context=context)
-        users = [my_id] + users_to
-        domain = []
-        for user_to in users:
-            domain.append(('user_ids', 'in', [user_to]))
-        sids = self.search(cr, openerp.SUPERUSER_ID, domain, context=context, limit=1)
-        session_id = None
-        for session in self.browse(cr, uid, sids, context=context):
-            if len(session.user_ids) == len(users):
-                session_id = session.id
-                break
-        if not session_id:
-            session_id = self.create(cr, openerp.SUPERUSER_ID, {
-                'user_ids': [(6, 0, users)]
-            }, context=context)
-        return self.read(cr, uid, session_id, context=context)
-
-    def get_session_users(self, cr, uid, session_id, context=None):
-        return self.read(cr, openerp.SUPERUSER_ID, session_id, ['user_ids'], context=context)
-
-    def add_to_session(self, cr, uid, session_id, user_id, uuid=None, context=None):
-        my_id = self.pool.get("im.user").get_my_id(cr, uid, uuid, context=context)
-        session = self.read(cr, uid, session_id, context=context)
-        if my_id not in session.get("user_ids"):
-            raise Exception("Not allowed to modify a session when you are not in it.")
-        self.write(cr, uid, session_id, {"user_ids": [(4, user_id)]}, context=context)
-
-    def remove_me_from_session(self, cr, uid, session_id, uuid=None, context=None):
-        my_id = self.pool.get("im.user").get_my_id(cr, uid, uuid, context=context)
-        self.write(cr, openerp.SUPERUSER_ID, session_id, {"user_ids": [(3, my_id)]}, context=context)
-
-class im_user(osv.osv):
-    _name = "im.user"
-
-    def _im_status(self, cr, uid, ids, something, something_else, context=None):
-        res = {}
-        current = datetime.datetime.now()
-        delta = datetime.timedelta(0, DISCONNECTION_TIMER)
-        data = self.read(cr, openerp.SUPERUSER_ID, ids, ["im_last_status_update", "im_last_status"], context=context)
-        for obj in data:
-            last_update = datetime.datetime.strptime(obj["im_last_status_update"], DEFAULT_SERVER_DATETIME_FORMAT)
-            res[obj["id"]] = obj["im_last_status"] and (last_update + delta) > current
-        return res
-
-    def _status_search(self, cr, uid, obj, name, domain, context=None):
-        current = datetime.datetime.now()
-        delta = datetime.timedelta(0, DISCONNECTION_TIMER)
-        field, operator, value = domain[0]
-        if operator in expression.NEGATIVE_TERM_OPERATORS:
-            value = not value
-        if value:
-            return ['&', ('im_last_status', '=', True), ('im_last_status_update', '>', (current - delta).strftime(DEFAULT_SERVER_DATETIME_FORMAT))]
-        else:
-            return ['|', ('im_last_status', '=', False), ('im_last_status_update', '<=', (current - delta).strftime(DEFAULT_SERVER_DATETIME_FORMAT))]
-    # TODO: Remove fields arg in trunk. Also in im.js.
-    def search_users(self, cr, uid, text_search, fields, limit, context=None):
-        my_id = self.get_my_id(cr, uid, None, context)
-        group_employee = self.pool['ir.model.data'].get_object_reference(cr, uid, 'base', 'group_user')[1]
-        found = self.search(cr, uid, [["name", "ilike", text_search], ["id", "<>", my_id], ["uuid", "=", False], ["im_status", "=", True], ["user_id.groups_id", "in", [group_employee]]],
-            order="name asc", limit=limit, context=context)
-        if len(found) < limit:
-            found += self.search(cr, uid, [["name", "ilike", text_search], ["id", "<>", my_id], ["uuid", "=", False], ["im_status", "=", True], ["id", "not in", found]],
-                order="name asc", limit=limit, context=context)
-        if len(found) < limit:
-            found += self.search(cr, uid, [["name", "ilike", text_search], ["id", "<>", my_id], ["uuid", "=", False], ["im_status", "=", False], ["id", "not in", found]],
-                order="name asc", limit=limit-len(found), context=context)
-        users = self.read(cr,openerp.SUPERUSER_ID, found, ["name", "user_id", "uuid", "im_status"], context=context)
-        users.sort(key=lambda obj: found.index(obj['id']))
-        return users
-
-    def im_connect(self, cr, uid, uuid=None, context=None):
-        assert_uuid(uuid)
-        return self._im_change_status(cr, uid, True, uuid, context)
-
-    def im_disconnect(self, cr, uid, uuid=None, context=None):
-        assert_uuid(uuid)
-        return self._im_change_status(cr, uid, False, uuid, context)
-
-    def _im_change_status(self, cr, uid, new_one, uuid=None, context=None):
-        assert_uuid(uuid)
-        id = self.get_my_id(cr, uid, uuid, context=context)
-        current_status = self.read(cr, openerp.SUPERUSER_ID, id, ["im_status"], context=None)["im_status"]
-        self.write(cr, openerp.SUPERUSER_ID, id, {"im_last_status": new_one, 
-            "im_last_status_update": datetime.datetime.now().strftime(DEFAULT_SERVER_DATETIME_FORMAT)}, context=context)
-        if current_status != new_one:
-            notify_channel(cr, "im_channel", {'type': 'status', 'user': id})
-        return True
-
-    def get_my_id(self, cr, uid, uuid=None, context=None):
-        assert_uuid(uuid)
-        if uuid:
-            users = self.search(cr, openerp.SUPERUSER_ID, [["uuid", "=", uuid]], context=None)
-        else:
-            users = self.search(cr, openerp.SUPERUSER_ID, [["user_id", "=", uid]], context=None)
-        my_id = users[0] if len(users) >= 1 else False
-        if not my_id:
-            my_id = self.create(cr, openerp.SUPERUSER_ID, {"user_id": uid if not uuid else False, "uuid": uuid if uuid else False}, context=context)
-        return my_id
-
-    def assign_name(self, cr, uid, uuid, name, context=None):
-        assert_uuid(uuid)
-        id = self.get_my_id(cr, uid, uuid, context=context)
-        self.write(cr, openerp.SUPERUSER_ID, id, {"assigned_name": name}, context=context)
-        return True
-
-    def _get_name(self, cr, uid, ids, name, arg, context=None):
-        res = {}
-        for record in self.browse(cr, uid, ids, context=context):
-            res[record.id] = record.assigned_name
-            if record.user_id:
-                res[record.id] = record.user_id.name
-                continue
-        return res
-
-    def get_users(self, cr, uid, ids, context=None):
-        return self.read(cr,openerp.SUPERUSER_ID, ids, ["name", "im_status", "uuid"], context=context)
-
-    _columns = {
-        'name': fields.function(_get_name, type='char', size=200, string="Name", store=True, readonly=True),
-        'assigned_name': fields.char(string="Assigned Name", size=200, required=False),
-        'image': fields.related('user_id', 'image_small', type='binary', string="Image", readonly=True),
-        'user_id': fields.many2one("res.users", string="User", select=True, ondelete='cascade', oldname='user'),
-        'uuid': fields.char(string="UUID", size=50, select=True),
-        'im_last_received': fields.integer(string="Instant Messaging Last Received Message"),
-        'im_last_status': fields.boolean(strint="Instant Messaging Last Status"),
-        'im_last_status_update': fields.datetime(string="Instant Messaging Last Status Update"),
-        'im_status': fields.function(_im_status, string="Instant Messaging Status", type='boolean', fnct_search=_status_search),
-    }
-
-    _defaults = {
-        'im_last_received': -1,
-        'im_last_status': False,
-        'im_last_status_update': lambda *args: datetime.datetime.now().strftime(DEFAULT_SERVER_DATETIME_FORMAT),
-    }
-
-    _sql_constraints = [
-        ('user_uniq', 'unique (user_id)', 'Only one chat user per OpenERP user.'),
-        ('uuid_uniq', 'unique (uuid)', 'Chat identifier already used.'),
-    ]
-
-class res_users(osv.osv):
-    _inherit = "res.users"
-
-    def _get_im_user(self, cr, uid, ids, field_name, arg, context=None):
-        result = dict.fromkeys(ids, False)
-        for index, im_user in enumerate(self.pool['im.user'].search_read(cr, uid, domain=[('user_id', 'in', ids)], fields=['name', 'user_id'], context=context)):
-            result[ids[index]] = im_user.get('user_id') and (im_user['user_id'][0], im_user['name']) or False
-        return result
-
-    _columns = {
-        'im_user_id' : fields.function(_get_im_user, type='many2one', string="IM User", relation="im.user"),
-    }
diff --git a/addons/im/package.json b/addons/im/package.json
deleted file mode 100644
index 3ce6500a077..00000000000
--- a/addons/im/package.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "devDependencies": {
-    "grunt": "*",
-    "grunt-contrib-jshint": "*"
-  }
-}
diff --git a/addons/im/security/im_security.xml b/addons/im/security/im_security.xml
deleted file mode 100644
index 6713b88cda6..00000000000
--- a/addons/im/security/im_security.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-        <record id="message_rule_1" model="ir.rule">
-            <field name="name">Can only read messages from a session where user is</field>
-            <field name="model_id" ref="model_im_message"/>
-            <field name="groups" eval="[(6,0,[ref('base.group_user')])]"/>
-            <field name="domain_force">[('session_id.user_ids', 'in', user.im_user_id.id)]</field>
-            <field name="perm_read" eval="1"/>
-            <field name="perm_write" eval="0"/>
-            <field name="perm_create" eval="0"/>
-            <field name="perm_unlink" eval="0"/>
-        </record>
-
-        <record id="users_rule_1" model="ir.rule">
-            <field name="name">Can only modify your user</field>
-            <field name="model_id" ref="model_im_user"/>
-            <field name="groups" eval="[(6,0,[ref('base.group_user')])]"/>
-            <field name="domain_force">[('user_id', '=', user.id)]</field>
-            <field name="perm_read" eval="0"/>
-            <field name="perm_write" eval="1"/>
-            <field name="perm_create" eval="1"/>
-            <field name="perm_unlink" eval="1"/>
-        </record>
-    </data>
-</openerp>
diff --git a/addons/im/security/ir.model.access.csv b/addons/im/security/ir.model.access.csv
deleted file mode 100644
index d35d694661a..00000000000
--- a/addons/im/security/ir.model.access.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_im_message,im.message,model_im_message,,1,0,1,0
-access_im_user,im.user,model_im_user,,1,1,1,0
-access_im_session,im.session,model_im_session,,1,1,1,0
\ No newline at end of file
diff --git a/addons/im/static/src/js/im.js b/addons/im/static/src/js/im.js
deleted file mode 100644
index 3731c8e80d7..00000000000
--- a/addons/im/static/src/js/im.js
+++ /dev/null
@@ -1,176 +0,0 @@
-
-(function() {
-    "use strict";
-
-    var instance = openerp;
-
-    openerp.im = {};
-
-    var USERS_LIMIT = 20;
-
-    var _t = instance.web._t;
-    var QWeb = instance.web.qweb;
-
-    instance.web.UserMenu.include({
-        do_update: function(){
-            var self = this;
-            this.update_promise.then(function() {
-                im_common.notification = function(message) {
-                    instance.client.do_warn(message);
-                };
-                // TODO: allow to use a different host for the chat
-                im_common.connection = new openerp.Session(self, null, {session_id: openerp.session.session_id});
-
-                var im = new instance.im.InstantMessaging(self);
-                im.appendTo(instance.client.$el);
-                var button = new instance.im.ImTopButton(this);
-                button.on("clicked", im, im.switch_display);
-                button.appendTo(window.$('.oe_systray'));
-            });
-            return this._super.apply(this, arguments);
-        },
-    });
-
-    instance.im.ImTopButton = instance.web.Widget.extend({
-        template:'ImTopButton',
-        events: {
-            "click": "clicked",
-        },
-        clicked: function(ev) {
-            ev.preventDefault();
-            this.trigger("clicked");
-        },
-    });
-
-    instance.im.InstantMessaging = instance.web.Widget.extend({
-        template: "InstantMessaging",
-        events: {
-            "keydown .oe_im_searchbox": "input_change",
-            "keyup .oe_im_searchbox": "input_change",
-            "change .oe_im_searchbox": "input_change",
-        },
-        init: function(parent) {
-            this._super(parent);
-            this.shown = false;
-            this.set("right_offset", 0);
-            this.set("current_search", "");
-            this.users = [];
-            this.c_manager = new im_common.ConversationManager(this);
-            window.im_conversation_manager = this.c_manager;
-            this.on("change:right_offset", this.c_manager, _.bind(function() {
-                this.c_manager.set("right_offset", this.get("right_offset"));
-            }, this));
-            this.user_search_dm = new instance.web.DropMisordered();
-        },
-        start: function() {
-            var self = this;
-            this.$el.css("right", -this.$el.outerWidth());
-            $(window).scroll(_.bind(this.calc_box, this));
-            $(window).resize(_.bind(this.calc_box, this));
-            this.calc_box();
-            this.on("change:current_search", this, this.search_changed);
-            return this.c_manager.start_polling().then(function() {
-                self.c_manager.on("new_conversation", self, function(conv) {
-                    conv.$el.droppable({
-                        drop: function(event, ui) {
-                            self.add_user(conv, ui.draggable.data("user"));
-                        }
-                    });
-                });
-                self.search_changed();
-            });
-        },
-        calc_box: function() {
-            var $topbar = window.$('#oe_main_menu_navbar'); // .oe_topbar is replaced with .navbar of bootstrap3
-            var top = $topbar.offset().top + $topbar.height();
-            top = Math.max(top - $(window).scrollTop(), 0);
-            this.$el.css("top", top);
-            this.$el.css("bottom", 0);
-        },
-        input_change: function() {
-            this.set("current_search", this.$(".oe_im_searchbox").val());
-        },
-        search_changed: function(e) {
-            var users = new instance.web.Model("im.user");
-            var self = this;
-            // TODO: Remove fields arg in trunk. Also in im.js.
-            return this.user_search_dm.add(users.call("search_users", [this.get("current_search"), ["name", "user_id", "uuid", "im_status"],
-                    USERS_LIMIT], {context:new instance.web.CompoundContext()})).then(function(users) {
-                var logged_users = _.filter(users, function(u) { return !!u.im_status; });
-                var non_logged_users = _.filter(users, function(u) { return !u.im_status; });
-                users = logged_users.concat(non_logged_users);
-                self.c_manager.add_to_user_cache(users);
-                self.$(".oe_im_input").val("");
-                var old_users = self.users;
-                self.users = [];
-                _.each(users, function(user) {
-                    var widget = new instance.im.UserWidget(self, self.c_manager.get_user(user.id));
-                    widget.appendTo(self.$(".oe_im_users"));
-                    widget.on("activate_user", self, function(user) {self.c_manager.chat_with_users([user]);});
-                    self.users.push(widget);
-                });
-                _.each(old_users, function(user) {
-                    user.destroy();
-                });
-            });
-        },
-        switch_display: function() {
-            var fct =  _.bind(function(place) {
-                this.set("right_offset", place + this.$el.outerWidth());
-            }, this);
-            var opt = {
-                step: fct,
-            };
-            if (this.shown) {
-                this.$el.animate({
-                    right: -this.$el.outerWidth(),
-                }, opt);
-            } else {
-                if (! this.c_manager.get_activated()) {
-                    this.do_warn("Instant Messaging is not activated on this server.", "");
-                    return;
-                }
-                this.$el.animate({
-                    right: 0,
-                }, opt);
-            }
-            this.shown = ! this.shown;
-        },
-        add_user: function(conversation, user) {
-            conversation.add_user(user);
-        },
-    });
-
-    instance.im.UserWidget = instance.web.Widget.extend({
-        "template": "UserWidget",
-        events: {
-            "click": "activate_user",
-        },
-        init: function(parent, user) {
-            this._super(parent);
-            this.user = user;
-            this.user.add_watcher();
-        },
-        start: function() {
-            this.$el.data("user", this.user);
-            this.$el.draggable({helper: "clone"});
-            var change_status = function() {
-                this.$(".oe_im_user_online").toggle(this.user.get("im_status") === true);
-            };
-            this.user.on("change:im_status", this, change_status);
-            change_status.call(this);
-        },
-        activate_user: function() {
-            this.trigger("activate_user", this.user);
-        },
-        destroy: function() {
-            this.user.remove_watcher();
-            this._super();
-        },
-    });
-
-    im_common.technical_messages_handlers.force_kitten = function() {
-        openerp.webclient.to_kitten();
-    };
-
-})();
diff --git a/addons/im/static/src/js/im_common.js b/addons/im/static/src/js/im_common.js
deleted file mode 100644
index 5a88ddfb581..00000000000
--- a/addons/im/static/src/js/im_common.js
+++ /dev/null
@@ -1,562 +0,0 @@
-
-/*
-    This file must compile in EcmaScript 3 and work in IE7.
-
-    Prerequisites to use this module:
-    - load the im_common.xml qweb template into openerp.qweb
-    - implement all the stuff defined later
-*/
-
-(function() {
-
-function declare($, _, openerp) {
-    /* jshint es3: true */
-    "use strict";
-
-    var im_common = {};
-
-    /*
-        All of this must be defined to use this module
-    */
-    _.extend(im_common, {
-        notification: function(message) {
-            throw new Error("Not implemented");
-        },
-        connection: null
-    });
-
-    var _t = openerp._t;
-
-    var ERROR_DELAY = 5000;
-
-    im_common.ImUser = openerp.Class.extend(openerp.PropertiesMixin, {
-        init: function(parent, user_rec) {
-            openerp.PropertiesMixin.init.call(this, parent);
-            
-            user_rec.image_url = im_common.connection.url('/web/binary/image', {model:'im.user', field: 'image', id: user_rec.id});
-
-            this.set(user_rec);
-            this.set("watcher_count", 0);
-            this.on("change:watcher_count", this, function() {
-                if (this.get("watcher_count") === 0)
-                    this.destroy();
-            });
-        },
-        destroy: function() {
-            this.trigger("destroyed");
-            openerp.PropertiesMixin.destroy.call(this);
-        },
-        add_watcher: function() {
-            this.set("watcher_count", this.get("watcher_count") + 1);
-        },
-        remove_watcher: function() {
-            this.set("watcher_count", this.get("watcher_count") - 1);
-        }
-    });
-
-    im_common.ConversationManager = openerp.Class.extend(openerp.PropertiesMixin, {
-        init: function(parent, options) {
-            openerp.PropertiesMixin.init.call(this, parent);
-            this.options = _.clone(options) || {};
-            _.defaults(this.options, {
-                inputPlaceholder: _t("Say something..."),
-                defaultMessage: null,
-                userName: _t("Anonymous"),
-                anonymous_mode: false
-            });
-            this.set("right_offset", 0);
-            this.set("bottom_offset", 0);
-            this.conversations = [];
-            this.on("change:right_offset", this, this.calc_positions);
-            this.on("change:bottom_offset", this, this.calc_positions);
-            this.set("window_focus", true);
-            this.set("waiting_messages", 0);
-            this.focus_hdl = _.bind(function() {
-                this.set("window_focus", true);
-            }, this);
-            $(window).bind("focus", this.focus_hdl);
-            this.blur_hdl = _.bind(function() {
-                this.set("window_focus", false);
-            }, this);
-            $(window).bind("blur", this.blur_hdl);
-            this.on("change:window_focus", this, this.window_focus_change);
-            this.window_focus_change();
-            this.on("change:waiting_messages", this, this.messages_change);
-            this.messages_change();
-            this.create_ting();
-            this.activated = false;
-            this.users_cache = {};
-            this.last = null;
-            this.unload_event_handler = _.bind(this.unload, this);
-        },
-        start_polling: function() {
-            var self = this;
-            var def = $.when();
-            var uuid = false;
-
-            if (this.options.anonymous_mode) {
-                uuid = localStorage["oe_livesupport_uuid"] || false;
-
-                if (! uuid) {
-                    def = im_common.connection.rpc("/longpolling/im/gen_uuid", {}).then(function(my_uuid) {
-                        uuid = my_uuid;
-                        localStorage["oe_livesupport_uuid"] = uuid;
-                    });
-                }
-                def = def.then(function() {
-                    return im_common.connection.model("im.user").call("assign_name", [uuid, self.options.userName]);
-                });
-            }
-
-            return def.then(function() {
-                return im_common.connection.model("im.user").call("get_my_id", [uuid]);
-            }).then(function(my_user_id) {
-                self.my_id = my_user_id;
-                return self.ensure_users([self.my_id]);
-            }).then(function() {
-                var me = self.users_cache[self.my_id];
-                delete self.users_cache[self.my_id];
-                self.me = me;
-                me.set("name", _t("You"));
-                return im_common.connection.rpc("/longpolling/im/activated", {}, {shadow: true});
-            }).then(function(activated) {
-                if (activated) {
-                    self.activated = true;
-                    $(window).on("unload", self.unload_event_handler);
-                    self.poll();
-                } else {
-                    return $.Deferred().reject();
-                }
-            }, function(a, e) {
-                e.preventDefault();
-            });
-        },
-        unload: function() {
-            return im_common.connection.model("im.user").call("im_disconnect", [], {uuid: this.me.get("uuid"), context: {}});
-        },
-        ensure_users: function(user_ids) {
-            var no_cache = {};
-            _.each(user_ids, function(el) {
-                if (! this.users_cache[el])
-                    no_cache[el] = el;
-            }, this);
-            var self = this;
-            var def;
-            if (_.size(no_cache) === 0)
-                def = $.when();
-            else
-                def = im_common.connection.model("im.user").call("get_users", [_.values(no_cache)]).then(function(users) {
-                    self.add_to_user_cache(users);
-                });
-            return def.then(function() {
-                return _.map(user_ids, function(id) { return self.get_user(id); });
-            });
-        },
-        add_to_user_cache: function(user_recs) {
-            _.each(user_recs, function(user_rec) {
-                if (! this.users_cache[user_rec.id]) {
-                    var user = new im_common.ImUser(this, user_rec);
-                    this.users_cache[user_rec.id] = user;
-                    user.on("destroyed", this, function() {
-                        delete this.users_cache[user_rec.id];
-                    });
-                }
-            }, this);
-        },
-        get_user: function(user_id) {
-            return this.users_cache[user_id];
-        },
-        poll: function() {
-            var self = this;
-            var user_ids = _.map(this.users_cache, function(el) {
-                return el.get("id");
-            });
-            im_common.connection.rpc("/longpolling/im/poll", {
-                last: this.last,
-                users_watch: user_ids,
-                uuid: self.me.get("uuid")
-            }, {shadow: true}).then(function(result) {
-                _.each(result.users_status, function(el) {
-                    if (self.get_user(el.id))
-                        self.get_user(el.id).set(el);
-                });
-                self.last = result.last;
-                self.received_messages(result.res).then(function() {
-                    self.poll();
-                });
-            }, function(unused, e) {
-                e.preventDefault();
-                setTimeout(_.bind(self.poll, self), ERROR_DELAY);
-            });
-        },
-        get_activated: function() {
-            return this.activated;
-        },
-        create_ting: function() {
-            if (typeof(Audio) === "undefined") {
-                this.ting = {play: function() {}};
-                return;
-            }
-            var kitten = jQuery.deparam !== undefined && jQuery.deparam(jQuery.param.querystring()).kitten !== undefined;
-            this.ting = new Audio(im_common.connection.url(
-                "/im/static/src/audio/" +
-                (kitten ? "purr" : "Ting") +
-                (new Audio().canPlayType("audio/ogg; codecs=vorbis") ? ".ogg": ".mp3")
-            ));
-        },
-        window_focus_change: function() {
-            if (this.get("window_focus")) {
-                this.set("waiting_messages", 0);
-            }
-        },
-        messages_change: function() {
-            if (! openerp.webclient || !openerp.webclient.set_title_part)
-                return;
-            openerp.webclient.set_title_part("im_messages", this.get("waiting_messages") === 0 ? undefined :
-                _.str.sprintf(_t("%d Messages"), this.get("waiting_messages")));
-        },
-        chat_with_users: function(users) {
-            var self = this;
-            return im_common.connection.model("im.session").call("session_get", [_.map(users, function(user) {return user.get("id");}),
-                    self.me.get("uuid")]).then(function(session) {
-                return self.activate_session(session.id, true);
-            });
-        },
-        chat_with_all_users: function() {
-            var self = this;
-            return im_common.connection.model("im.user").call("search", [[["uuid", "=", false]]]).then(function(user_ids) {
-                return self.ensure_users(_.without(user_ids, self.me.get("id")));
-            }).then(function(users) {
-                return self.chat_with_users(users);
-            });
-        },
-        activate_session: function(session_id, focus, message) {
-            var self = this;
-            var conv = _.find(this.conversations, function(conv) {return conv.session_id == session_id;});
-            var def = $.when();
-            if (! conv) {
-                conv = new im_common.Conversation(this, this, session_id, this.options);
-                def = conv.appendTo($("body")).then(_.bind(function() {
-                    conv.on("destroyed", this, function() {
-                        this.conversations = _.without(this.conversations, conv);
-                        this.calc_positions();
-                    });
-                    this.conversations.push(conv);
-                    this.calc_positions();
-                    this.trigger("new_conversation", conv);
-                }, this));
-                def = def.then(function(){
-                    return self.load_history(conv, message);
-                });
-            }
-            if (focus) {
-                def = def.then(function() {
-                    conv.focus();
-                });
-            }
-            return def.then(function() {return conv});
-        },
-        load_history: function(conv, message){
-            var self = this;
-            var domain = [["session_id", "=", conv.session_id]];
-            if (!_.isUndefined(message)){
-                domain.push(["date", "<", message.date]);
-            }
-            return im_common.connection.model("im.message").call("search_read", [domain, [], 0, 10]).then(function(messages){
-                messages.reverse();
-                var users = _.unique(_.map(messages, function(message){
-                    return message.from_id[0];
-                }));
-                return self.ensure_users(users).then(function(){
-                    return self.received_messages(messages, true);
-                });
-            });
-        },
-        received_messages: function(messages, seen) {
-            var self = this;
-            var defs = [];
-            var received = false;
-            if (_.isUndefined(seen)){
-                seen = false;
-            }
-            _.each(messages, function(message) {
-                if (! message.technical) {
-                    defs.push(self.activate_session(message.session_id[0], false, message).then(function(conv) {
-                        received = self.my_id !== message.from_id[0];
-                        return conv.received_message(message);
-                    }));
-                } else {
-                    var json = JSON.parse(message.message);
-                    message.json = json;
-                    defs.push($.when(im_common.technical_messages_handlers[json.type](self, message)));
-                }
-            });
-            return $.when.apply($, defs).then(function(){
-                if (! self.get("window_focus") && received && !seen) {
-                    self.set("waiting_messages", self.get("waiting_messages") + messages.length);
-                    self.ting.play();
-                    self.create_ting();
-                }
-            });
-        },
-        calc_positions: function() {
-            var current = this.get("right_offset");
-            _.each(_.range(this.conversations.length), function(i) {
-                this.conversations[i].set("bottom_position", this.get("bottom_offset"));
-                this.conversations[i].set("right_position", current);
-                current += this.conversations[i].$().outerWidth(true);
-            }, this);
-        },
-        destroy: function() {
-            $(window).off("unload", this.unload_event_handler);
-            $(window).unbind("blur", this.blur_hdl);
-            $(window).unbind("focus", this.focus_hdl);
-            openerp.PropertiesMixin.destroy.call(this);
-        }
-    });
-
-    im_common.Conversation = openerp.Widget.extend({
-        className: "openerp_style oe_im_chatview",
-        events: {
-            "keydown input": "keydown",
-            "click .oe_im_chatview_close": "close",
-            "click .oe_im_chatview_header": "show_hide"
-        },
-        init: function(parent, c_manager, session_id, options) {
-            this._super(parent);
-            this.c_manager = c_manager;
-            this.options = options || {};
-            this.session_id = session_id;
-            this.set("right_position", 0);
-            this.set("bottom_position", 0);
-            this.shown = true;
-            this.set("pending", 0);
-            this.inputPlaceholder = this.options.defaultInputPlaceholder;
-            this.set("users", []);
-            this.set("disconnected", false);
-            this.others = [];
-        },
-        start: function() {
-            var self = this;
-
-            self.$().append(openerp.qweb.render("im_common.conversation", {widget: self}));
-            this.$().hide();
-
-            var change_status = function() {
-                var disconnected = _.every(this.get("users"), function(u) { return u.get("im_status") === false; });
-                self.set("disconnected", disconnected);
-                this.$(".oe_im_chatview_users").html(openerp.qweb.render("im_common.conversation.header",
-                    {widget: self, to_url: _.bind(im_common.connection.url, im_common.connection)}));
-            };
-            this.on("change:users", this, function(unused, ev) {
-                _.each(ev.oldValue, function(user) {
-                    user.off("change:im_status", self, change_status);
-                });
-                _.each(ev.newValue, function(user) {
-                    user.on("change:im_status", self, change_status);
-                });
-                change_status.call(self);
-                _.each(ev.oldValue, function(user) {
-                    if (! _.contains(ev.newValue, user)) {
-                        user.remove_watcher();
-                    }
-                });
-                _.each(ev.newValue, function(user) {
-                    if (! _.contains(ev.oldValue, user)) {
-                        user.add_watcher();
-                    }
-                });
-            });
-            this.on("change:disconnected", this, function() {
-                self.$().toggleClass("oe_im_chatview_disconnected_status", this.get("disconnected"));
-                self._go_bottom();
-            });
-
-            self.on("change:right_position", self, self.calc_pos);
-            self.on("change:bottom_position", self, self.calc_pos);
-            self.full_height = self.$().height();
-            self.calc_pos();
-            self.on("change:pending", self, _.bind(function() {
-                if (self.get("pending") === 0) {
-                    self.$(".oe_im_chatview_nbr_messages").text("");
-                } else {
-                    self.$(".oe_im_chatview_nbr_messages").text("(" + self.get("pending") + ")");
-                }
-            }, self));
-
-            return this.refresh_users().then(function() {
-                self.$().show();
-            });
-        },
-        refresh_users: function() {
-            var self = this;
-            var user_ids;
-            return im_common.connection.model("im.session").call("get_session_users", [self.session_id]).then(function(session) {
-                user_ids = _.without(session.user_ids, self.c_manager.me.get("id"));
-                return self.c_manager.ensure_users(user_ids);
-            }).then(function(users) {
-                self.set("users", users);
-            });
-        },
-        show_hide: function() {
-            if (this.shown) {
-                this.$().animate({
-                    height: this.$(".oe_im_chatview_header").outerHeight()
-                });
-            } else {
-                this.$().animate({
-                    height: this.full_height
-                });
-            }
-            this.shown = ! this.shown;
-            if (this.shown) {
-                this.set("pending", 0);
-            }
-        },
-        calc_pos: function() {
-            this.$().css("right", this.get("right_position"));
-            this.$().css("bottom", this.get("bottom_position"));
-        },
-        received_message: function(message) {
-            if (this.shown) {
-                this.set("pending", 0);
-            } else {
-                this.set("pending", this.get("pending") + 1);
-            }
-            this.c_manager.ensure_users([message.from_id[0]]).then(_.bind(function(users) {
-                var user = users[0];
-                if (! _.contains(this.get("users"), user) && ! _.contains(this.others, user)) {
-                    this.others.push(user);
-                    user.add_watcher();
-                }
-                this._add_bubble(user, message.message, openerp.str_to_datetime(message.date));
-            }, this));
-        },
-        keydown: function(e) {
-            if(e && e.which !== 13) {
-                return;
-            }
-            var mes = this.$("input").val();
-            if (! mes.trim()) {
-                return;
-            }
-            this.$("input").val("");
-            this.send_message(mes);
-        },
-        send_message: function(message, technical) {
-            technical = technical || false;
-            var send_it = _.bind(function() {
-                var model = im_common.connection.model("im.message");
-                return model.call("post", [message, this.session_id, technical], {uuid: this.c_manager.me.get("uuid"), context: {}});
-            }, this);
-            var tries = 0;
-            send_it().then(_.bind(function() {}, function(error, e) {
-                e.preventDefault();
-                tries += 1;
-                if (tries < 3)
-                    return send_it();
-            }));
-        },
-        _add_bubble: function(user, item, date) {
-            var items = [item];
-            if (user === this.last_user) {
-                this.last_bubble.remove();
-                items = this.last_items.concat(items);
-            }
-            this.last_user = user;
-            this.last_items = items;
-            var zpad = function(str, size) {
-                str = "" + str;
-                return new Array(size - str.length + 1).join('0') + str;
-            };
-            date = "" + zpad(date.getHours(), 2) + ":" + zpad(date.getMinutes(), 2);
-            var to_show = _.map(items, im_common.escape_keep_url);
-            this.last_bubble = $(openerp.qweb.render("im_common.conversation_bubble", {"items": to_show, "user": user, "time": date}));
-            $(this.$(".oe_im_chatview_conversation")).append(this.last_bubble);
-            this._go_bottom();
-        },
-        _go_bottom: function() {
-            this.$(".oe_im_chatview_content").scrollTop($(this.$(".oe_im_chatview_content").children()[0]).height());
-        },
-        add_user: function(user) {
-            if (user === this.me || _.contains(this.get("users"), user))
-                return;
-            im_common.connection.model("im.session").call("add_to_session",
-                    [this.session_id, user.get("id"), this.c_manager.me.get("uuid")]).then(_.bind(function() {
-                this.send_message(JSON.stringify({"type": "session_modified", "action": "added", "user_id": user.get("id")}), true);
-            }, this));
-        },
-        focus: function() {
-            this.$(".oe_im_chatview_input").focus();
-            if (! this.shown)
-                this.show_hide();
-        },
-        close: function() {
-            var def = $.when();
-            if (this.get("users").length > 1) {
-                def = im_common.connection.model("im.session").call("remove_me_from_session",
-                        [this.session_id, this.c_manager.me.get("uuid")]).then(_.bind(function() {
-                    return this.send_message(JSON.stringify({"type": "session_modified", "action": "removed",
-                        "user_id": this.c_manager.me.get("id")}), true)
-                }, this))
-            }
-
-            return def.then(_.bind(function() {
-                this.destroy();
-            }, this));
-        },
-        destroy: function() {
-            _.each(this.get("users"), function(user) {
-                user.remove_watcher();
-            })
-            _.each(this.others, function(user) {
-                user.remove_watcher();
-            })
-            this.trigger("destroyed");
-            return this._super();
-        }
-    });
-
-    im_common.technical_messages_handlers = {};
-
-    im_common.technical_messages_handlers.session_modified = function(c_manager, message) {
-        var def = $.when();
-        if (message.json.action === "added" && message.json.user_id === c_manager.me.get("id")) {
-            def = c_manager.activate_session(message.session_id[0], true);
-        }
-        return def.then(function() {
-            var conv = _.find(c_manager.conversations, function(conv) {return conv.session_id == message.session_id[0];});
-            if (conv)
-                return conv.refresh_users();
-            return undefined;
-        });
-    };
-
-    var url_regex = /(http|https|ftp|ftps)\:\/\/[a-zA-Z0-9\-\.]+\.[a-zA-Z]{2,3}(\/\S*)?/gi;
-
-    im_common.escape_keep_url = function(str) {
-        var last = 0;
-        var txt = "";
-        while (true) {
-            var result = url_regex.exec(str);
-            if (! result)
-                break;
-            txt += _.escape(str.slice(last, result.index));
-            last = url_regex.lastIndex;
-            var url = _.escape(result[0]);
-            txt += '<a href="' + url + '" target="_blank">' + url + '</a>';
-        }
-        txt += _.escape(str.slice(last, str.length));
-        return txt;
-    };
-
-    return im_common;
-}
-
-if (typeof(define) !== "undefined") {
-    define(["jquery", "underscore", "openerp"], declare);
-} else {
-    window.im_common = declare($, _, openerp);
-}
-
-})();
diff --git a/addons/im/static/src/xml/im.xml b/addons/im/static/src/xml/im.xml
deleted file mode 100644
index 0c5e61824e2..00000000000
--- a/addons/im/static/src/xml/im.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vim:fdl=1:
--->
-<templates xml:space="preserve">
-    <t t-name="InstantMessaging">
-        <div class="oe_im">
-            <div class="oe_im_frame_header">
-                <span class="oe_e oe_im_search_icon">ô</span>
-                <input class="oe_im_searchbox" t-att-placeholder="_t('Search users...')"/>
-                <span class="oe_e oe_im_search_clear">[</span>
-            </div>
-            <div class="oe_im_users"></div>
-            <div class="oe_im_content"></div>
-        </div>
-    </t>
-    <t t-name="ImTopButton">
-        <li t-att-title='_t("Display Instant Messaging")'>
-            <a href="#">
-                <i id="oe_topbar_imbutton_icon" class="fa fa-comments-o"/>
-            </a>
-        </li>
-    </t>
-    <t t-name="UserWidget">
-        <div class="oe_im_user">
-            <span class="oe_im_user_clip">
-                <img t-att-src='widget.user.get("image_url")' class="oe_im_user_avatar"/>
-            </span>
-            <span class="oe_im_user_name"><t t-esc="widget.user.get('name')"/></span>
-            <img t-att-src="_s +'/im/static/src/img/green.png'" class="oe_im_user_online"/>
-        </div>
-    </t>
-</templates>
\ No newline at end of file
diff --git a/addons/im/static/src/xml/im_common.xml b/addons/im/static/src/xml/im_common.xml
deleted file mode 100644
index efaaf602577..00000000000
--- a/addons/im/static/src/xml/im_common.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<templates>
-<t t-name="im_common.conversation">
-    <div class="oe_im_chatview_header">
-        <span class="oe_im_chatview_users"/>
-        <scan class="oe_im_chatview_nbr_messages" />
-        <button class="oe_im_chatview_close">×</button>
-    </div>
-    <div class="oe_im_chatview_disconnected">
-        All users are offline. They will receive your messages on their next connection.
-    </div>
-    <div class="oe_im_chatview_content">
-        <div class="oe_im_chatview_conversation"></div>
-    </div>
-    <div class="oe_im_chatview_footer">
-        <input class="oe_im_chatview_input" t-att-placeholder="widget.inputPlaceholder" />
-    </div>
-</t>
-
-<t t-name="im_common.conversation.header">
-    <span t-foreach="widget.get('users')" t-as="user">
-        <img t-if="user.get('im_status')" t-att-src="to_url('/im/static/src/img/green.png')" class="oe_im_chatview_online"/>
-        <t t-esc="user.get('name')"/>
-    </span>
-</t>
-
-<t t-name="im_common.conversation_bubble">
-    <div class="oe_im_chatview_bubble">
-        <div class="oe_im_chatview_clip">
-            <img class="oe_im_chatview_avatar" t-att-src="user.get('image_url')"/>
-        </div>
-        <div class="oe_im_chatview_from"><t t-esc="user.get('name')"/></div>
-        <div class="oe_im_chatview_bubble_list">
-            <t t-foreach="items" t-as="item">
-                <div class="oe_im_chatview_bubble_item"><t t-raw="item"/></div>
-            </t>
-        </div>
-        <div class="oe_im_chatview_time"><t t-esc="time"/></div>
-    </div>
-</t>
-</templates>
\ No newline at end of file
diff --git a/addons/im/views/im.xml b/addons/im/views/im.xml
deleted file mode 100644
index ef91b1c62a6..00000000000
--- a/addons/im/views/im.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- vim:fdn=3:
--->
-<openerp>
-    <data>
-        <template id="assets_backend" name="im assets" inherit_id="web.assets_backend">
-            <xpath expr="." position="inside">
-                <link rel="stylesheet" href="/im/static/src/css/im.css"/>
-                <link rel="stylesheet" href="/im/static/src/css/im_common.css"/>
-                <script type="text/javascript" src="/im/static/src/js/im_common.js"></script>
-                <script type="text/javascript" src="/im/static/src/js/im.js"></script>
-            </xpath>
-        </template>
-    </data>
-</openerp>
diff --git a/addons/im/watcher.py b/addons/im/watcher.py
deleted file mode 100644
index c733b189778..00000000000
--- a/addons/im/watcher.py
+++ /dev/null
@@ -1,85 +0,0 @@
-
-import openerp
-import openerp.tools.config
-import openerp.modules.registry
-from openerp.tools.misc import DEFAULT_SERVER_DATETIME_FORMAT
-import datetime
-from openerp.osv import osv, fields
-import time
-import logging
-import json
-import select
-import gevent
-import gevent.event
-from openerp.addons.im.im import *
-
-_logger = logging.getLogger(__name__)
-
-class ImWatcher(object):
-    watchers = {}
-
-    @staticmethod
-    def get_watcher(db_name):
-        if not ImWatcher.watchers.get(db_name):
-            ImWatcher(db_name)
-        return ImWatcher.watchers[db_name]
-
-    def __init__(self, db_name):
-        self.db_name = db_name
-        ImWatcher.watchers[db_name] = self
-        self.waiting = 0
-        self.wait_id = 0
-        self.users = {}
-        self.users_watch = {}
-        gevent.spawn(self.loop)
-
-    def loop(self):
-        _logger.info("Begin watching on channel im_channel for database " + self.db_name)
-        stop = False
-        while not stop:
-            try:
-                registry = openerp.modules.registry.RegistryManager.get(self.db_name)
-                with registry.cursor() as cr:
-                    listen_channel(cr, "im_channel", self.handle_message, self.check_stop)
-                    stop = True
-            except:
-                # if something crash, we wait some time then try again
-                _logger.exception("Exception during watcher activity")
-                time.sleep(WATCHER_ERROR_DELAY)
-        _logger.info("End watching on channel im_channel for database " + self.db_name)
-        del ImWatcher.watchers[self.db_name]
-
-    def handle_message(self, message):
-        if message["type"] == "message":
-            for receiver in message["receivers"]:
-                for waiter in self.users.get(receiver, {}).values():
-                    waiter.set()
-        else: #type status
-            for waiter in self.users_watch.get(message["user"], {}).values():
-                waiter.set()
-
-    def check_stop(self):
-        return self.waiting == 0
-
-    def _get_wait_id(self):
-        self.wait_id += 1
-        return self.wait_id
-
-    def stop(self, user_id, watch_users, timeout=None):
-        wait_id = self._get_wait_id()
-        event = gevent.event.Event()
-        self.waiting += 1
-        self.users.setdefault(user_id, {})[wait_id] = event
-        for watch in watch_users:
-            self.users_watch.setdefault(watch, {})[wait_id] = event
-        try:
-            event.wait(timeout)
-        finally:
-            for watch in watch_users:
-                del self.users_watch[watch][wait_id]
-                if len(self.users_watch[watch]) == 0:
-                    del self.users_watch[watch]
-            del self.users[user_id][wait_id]
-            if len(self.users[user_id]) == 0:
-                del self.users[user_id]
-            self.waiting -= 1
diff --git a/addons/im_chat/__init__.py b/addons/im_chat/__init__.py
new file mode 100644
index 00000000000..cea212f0705
--- /dev/null
+++ b/addons/im_chat/__init__.py
@@ -0,0 +1 @@
+import im_chat
diff --git a/addons/im/__openerp__.py b/addons/im_chat/__openerp__.py
similarity index 76%
rename from addons/im/__openerp__.py
rename to addons/im_chat/__openerp__.py
index 63a5148a747..8b736bb7b4a 100644
--- a/addons/im/__openerp__.py
+++ b/addons/im_chat/__openerp__.py
@@ -1,7 +1,8 @@
 {
     'name' : 'Instant Messaging',
     'version': '1.0',
-    'summary': 'Live Chat, Talks with Others',
+    'summary': 'OpenERP Chat',
+    'author': 'OpenERP SA',
     'sequence': '18',
     'category': 'Tools',
     'complexity': 'easy',
@@ -16,11 +17,9 @@ chat in real time. It support several chats in parallel.
     'data': [
         'security/ir.model.access.csv',
         'security/im_security.xml',
-        'views/im.xml',
+        'views/im_chat.xml',
     ],
-    'depends' : ['base', 'web'],
+    'depends' : ['base', 'web', 'bus'],
     'qweb': ['static/src/xml/*.xml'],
-    'installable': True,
-    'auto_install': False,
     'application': True,
 }
diff --git a/addons/im_chat/im_chat.py b/addons/im_chat/im_chat.py
new file mode 100644
index 00000000000..3617962aa16
--- /dev/null
+++ b/addons/im_chat/im_chat.py
@@ -0,0 +1,364 @@
+# -*- coding: utf-8 -*-
+import base64
+import datetime
+import logging
+import time
+import uuid
+import random
+
+import simplejson
+
+import openerp
+from openerp.http import request
+from openerp.osv import osv, fields
+from openerp.tools.misc import DEFAULT_SERVER_DATETIME_FORMAT
+from openerp.addons.bus.bus import TIMEOUT
+
+_logger = logging.getLogger(__name__)
+
+DISCONNECTION_TIMER = TIMEOUT + 5
+AWAY_TIMER = 600 # 10 minutes
+
+#----------------------------------------------------------
+# Models
+#----------------------------------------------------------
+class im_chat_conversation_state(osv.Model):
+    """ Adds a state on the m2m between user and session.  """
+    _name = 'im_chat.conversation_state'
+    _table = "im_chat_session_res_users_rel"
+
+    _columns = {
+        "state" : fields.selection([('open', 'Open'), ('folded', 'Folded'), ('closed', 'Closed')]),
+        "session_id" : fields.many2one('im_chat.session', 'Session', required=True, ondelete="cascade"),
+        "user_id" : fields.many2one('res.users', 'Users', required=True, ondelete="cascade"),
+    }
+    _defaults = {
+        "state" : 'open'
+    }
+
+class im_chat_session(osv.Model):
+    """ Conversations."""
+    _order = 'id desc'
+    _name = 'im_chat.session'
+    _rec_name = 'uuid'
+
+    _columns = {
+        'uuid': fields.char('UUID', size=50, select=True),
+        'message_ids': fields.one2many('im_chat.message', 'to_id', 'Messages'),
+        'user_ids': fields.many2many('res.users', 'im_chat_session_res_users_rel', 'session_id', 'user_id', "Session Users"),
+        'session_res_users_rel': fields.one2many('im_chat.conversation_state', 'session_id', 'Relation Session Users'),
+    }
+    _defaults = {
+        'uuid': lambda *args: '%s' % uuid.uuid4(),
+    }
+
+    def users_infos(self, cr, uid, ids, context=None):
+        """ get the user infos for all the user in the session """
+        for session in self.pool["im_chat.session"].browse(cr, uid, ids, context=context):
+            users_infos = self.pool["res.users"].read(cr, uid, [u.id for u in session.user_ids], ['id','name', 'im_status'], context=context)
+            return users_infos
+
+    def is_private(self, cr, uid, ids, context=None):
+        for session_id in ids:
+            """ return true if the session is private between users no external messages """
+            mess_ids = self.pool["im_chat.message"].search(cr, uid, [('to_id','=',session_id),('from_id','=',None)], context=context)
+            return len(mess_ids) == 0
+
+    def session_info(self, cr, uid, ids, context=None):
+        """ get the session info/header of a given session """
+        for session in self.browse(cr, uid, ids, context=context):
+            info = {
+                'uuid': session.uuid,
+                'users': session.users_infos(),
+                'state': 'open',
+            }
+            # add uid_state if available
+            if uid:
+                domain = [('user_id','=',uid), ('session_id','=',session.id)]
+                uid_state = self.pool['im_chat.conversation_state'].search_read(cr, uid, domain, ['state'], context=context)
+                if uid_state:
+                    info['state'] = uid_state[0]['state']
+            return info
+
+    def session_get(self, cr, uid, user_to, context=None):
+        """ returns the canonical session between 2 users, create it if needed """
+        session_id = False
+        if user_to:
+            sids = self.search(cr, uid, [('user_ids','in', user_to),('user_ids', 'in', [uid])], context=context, limit=1)
+            for sess in self.browse(cr, uid, sids, context=context):
+                if len(sess.user_ids) == 2 and sess.is_private():
+                    session_id = sess.id
+                    break
+            else:
+                session_id = self.create(cr, uid, { 'user_ids': [(6,0, (user_to, uid))] }, context=context)
+        return self.session_info(cr, uid, [session_id], context=context)
+
+    def update_state(self, cr, uid, uuid, state=None, context=None):
+        """ modify the fold_state of the given session, and broadcast to himself (e.i. : to sync multiple tabs) """
+        domain = [('user_id','=',uid), ('session_id.uuid','=',uuid)]
+        ids = self.pool['im_chat.conversation_state'].search(cr, uid, domain, context=context)
+        for sr in self.pool['im_chat.conversation_state'].browse(cr, uid, ids, context=context):
+            if not state:
+                state = sr.state
+                if sr.state == 'open':
+                    state = 'folded'
+                else:
+                    state = 'open'
+            self.pool['im_chat.conversation_state'].write(cr, uid, ids, {'state': state}, context=context)
+            self.pool['bus.bus'].sendone(cr, uid, (cr.dbname, 'im_chat.session', uid), sr.session_id.session_info())
+
+    def add_user(self, cr, uid, uuid, user_id, context=None):
+        """ add the given user to the given session """
+        sids = self.search(cr, uid, [('uuid', '=', uuid)], context=context, limit=1)
+        for session in self.browse(cr, uid, sids, context=context):
+            if user_id not in [u.id for u in session.user_ids]:
+                self.write(cr, uid, [session.id], {'user_ids': [(4, user_id)]}, context=context)
+                # notify the all the channel users and anonymous channel
+                notifications = []
+                for channel_user_id in session.user_ids:
+                    info = self.session_info(cr, channel_user_id.id, [session.id], context=context)
+                    notifications.append([(cr.dbname, 'im_chat.session', channel_user_id.id), info])
+                # Anonymous are not notified when a new user is added : cannot exec session_info as uid = None
+                info = self.session_info(cr, openerp.SUPERUSER_ID, [session.id], context=context)
+                notifications.append([session.uuid, info])
+                self.pool['bus.bus'].sendmany(cr, uid, notifications)
+                # send a message to the conversation
+                user = self.pool['res.users'].read(cr, uid, user_id, ['name'], context=context)
+                self.pool["im_chat.message"].post(cr, uid, uid, session.uuid, "meta", user['name'] + " joined the conversation.", context=context)
+
+    def get_image(self, cr, uid, uuid, user_id, context=None):
+        """ get the avatar of a user in the given session """
+        #default image
+        image_b64 = 'R0lGODlhAQABAIABAP///wAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw=='
+        # get the session
+        if user_id:
+            session_id = self.pool["im_chat.session"].search(cr, uid, [('uuid','=',uuid), ('user_ids','in', user_id)])
+            if session_id:
+                # get the image of the user
+                res = self.pool["res.users"].read(cr, uid, [user_id], ["image_small"])[0]
+                image_b64 = res["image_small"]
+        return image_b64
+
+class im_chat_message(osv.Model):
+    """ Sessions messsages type can be 'message' or 'meta'.
+        For anonymous message, the from_id is False.
+        Messages are sent to a session not to users.
+    """
+    _name = 'im_chat.message'
+    _order = "id desc"
+    _columns = {
+        'create_date': fields.datetime('Create Date', required=True, select=True),
+        'from_id': fields.many2one('res.users', 'Author'),
+        'to_id': fields.many2one('im_chat.session', 'Session To', required=True, select=True, ondelete='cascade'),
+        'type': fields.selection([('message','Message'), ('meta','Meta')], 'Type'),
+        'message': fields.char('Message'),
+    }
+    _defaults = {
+        'type' : 'message',
+    }
+
+    def init_messages(self, cr, uid, context=None):
+        """ get unread messages and old messages received less than AWAY_TIMER
+            ago and the session_info for open or folded window
+        """
+        # get the message since the AWAY_TIMER
+        threshold = datetime.datetime.now() - datetime.timedelta(seconds=AWAY_TIMER)
+        threshold = threshold.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
+        domain = [('to_id.user_ids', 'in', [uid]), ('create_date','>',threshold)]
+
+        # get the message since the last poll of the user
+        presence_ids = self.pool['im_chat.presence'].search(cr, uid, [('user_id', '=', uid)], context=context)
+        if presence_ids:
+            presence = self.pool['im_chat.presence'].browse(cr, uid, presence_ids, context=context)[0]
+            threshold = presence.last_poll
+            domain.append(('create_date','>',threshold))
+        messages = self.search_read(cr, uid, domain, ['from_id','to_id','create_date','type','message'], order='id asc', context=context)
+
+        # get the session of the messages and the not-closed ones
+        session_ids = map(lambda m: m['to_id'][0], messages)
+        domain = [('user_id','=',uid), '|', ('state','!=','closed'), ('session_id', 'in', session_ids)]
+        session_rels_ids = self.pool['im_chat.conversation_state'].search(cr, uid, domain, context=context)
+        # re-open the session where a message have been recieve recently
+        session_rels = self.pool['im_chat.conversation_state'].browse(cr, uid, session_rels_ids, context=context)
+
+        reopening_session = []
+        notifications = []
+        for sr in session_rels:
+            si = sr.session_id.session_info()
+            si['state'] = sr.state
+            if sr.state == 'closed':
+                si['state'] = 'folded'
+                reopening_session.append(sr.id)
+            notifications.append([(cr.dbname,'im_chat.session', uid), si])
+        for m in messages:
+            notifications.append([(cr.dbname,'im_chat.session', uid), m])
+        self.pool['im_chat.conversation_state'].write(cr, uid, reopening_session, {'state': 'folded'}, context=context)
+        return notifications
+
+    def post(self, cr, uid, from_uid, uuid, message_type, message_content, context=None):
+        """ post and broadcast a message, return the message id """
+        message_id = False
+        Session = self.pool['im_chat.session']
+        session_ids = Session.search(cr, uid, [('uuid','=',uuid)], context=context)
+        notifications = []
+        for session in Session.browse(cr, uid, session_ids, context=context):
+            # build the new message
+            vals = {
+                "from_id": from_uid,
+                "to_id": session.id,
+                "type": message_type,
+                "message": message_content,
+            }
+            # save it
+            message_id = self.create(cr, uid, vals, context=context)
+            # broadcast it to channel (anonymous users) and users_ids
+            data = self.read(cr, uid, [message_id], ['from_id','to_id','create_date','type','message'], context=context)[0]
+            notifications.append([uuid, data])
+            for user in session.user_ids:
+                notifications.append([(cr.dbname, 'im_chat.session', user.id), data])
+            self.pool['bus.bus'].sendmany(cr, uid, notifications)
+        return message_id
+
+class im_chat_presence(osv.Model):
+    """ im_chat_presence status can be: online, away or offline.
+        This model is a one2one, but is not attached to res_users to avoid database concurrence errors
+    """
+    _name = 'im_chat.presence'
+
+    _columns = {
+        'user_id' : fields.many2one('res.users', 'Users', required=True, select=True),
+        'last_poll': fields.datetime('Last Poll'),
+        'last_presence': fields.datetime('Last Presence'),
+        'status' : fields.selection([('online','Online'), ('away','Away'), ('offline','Offline')], 'IM Status'),
+    }
+    _defaults = {
+        'last_poll' : fields.datetime.now,
+        'last_presence' : fields.datetime.now,
+        'status' : 'offline'
+    }
+    _sql_constraints = [('im_chat_user_status_unique','unique(user_id)', 'A user can only have one IM status.')]
+
+    def update(self, cr, uid, presence=True, context=None):
+        """ register the poll, and change its im status if necessary. It also notify the Bus if the status has changed. """
+        presence_ids = self.search(cr, uid, [('user_id', '=', uid)], context=context)
+        presences = self.browse(cr, uid, presence_ids, context=context)
+        # set the default values
+        send_notification = True
+        vals = {
+            'last_poll': time.strftime(DEFAULT_SERVER_DATETIME_FORMAT),
+            'status' : presences and presences[0].status or 'offline'
+        }
+        # update the user or a create a new one
+        if not presences:
+            vals['status'] = 'online'
+            vals['user_id'] = uid
+            self.create(cr, uid, vals, context=context)
+        else:
+            if presence:
+                vals['last_presence'] = time.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
+                vals['status'] = 'online'
+            else:
+                threshold = datetime.datetime.now() - datetime.timedelta(seconds=AWAY_TIMER)
+                if datetime.datetime.strptime(presences[0].last_presence, DEFAULT_SERVER_DATETIME_FORMAT) < threshold:
+                    vals['status'] = 'away'
+            send_notification = presences[0].status != vals['status']
+            # write only if the last_poll is passed TIMEOUT, or if the status has changed
+            delta = datetime.datetime.now() - datetime.datetime.strptime(presences[0].last_poll, DEFAULT_SERVER_DATETIME_FORMAT)
+            if (delta > datetime.timedelta(seconds=TIMEOUT) or send_notification):
+                self.write(cr, uid, presence_ids, vals, context=context)
+        # avoid TransactionRollbackError
+        cr.commit()
+        # notify if the status has changed
+        if send_notification:
+            self.pool['bus.bus'].sendone(cr, uid, (cr.dbname,'im_chat.presence'), {'id': uid, 'im_status': vals['status']})
+        # gc : disconnect the users having a too old last_poll. 1 on 100 chance to do it.
+        if random.random() < 0.01:
+            self.check_users_disconnection(cr, uid, context=context)
+        return True
+
+    def check_users_disconnection(self, cr, uid, context=None):
+        """ disconnect the users having a too old last_poll """
+        dt = (datetime.datetime.now() - datetime.timedelta(0, DISCONNECTION_TIMER)).strftime(DEFAULT_SERVER_DATETIME_FORMAT)
+        presence_ids = self.search(cr, uid, [('last_poll', '<', dt), ('status' , '!=', 'offline')], context=context)
+        self.write(cr, uid, presence_ids, {'status': 'offline'}, context=context)
+        presences = self.browse(cr, uid, presence_ids, context=context)
+        notifications = []
+        for presence in presences:
+            notifications.append([(cr.dbname,'im_chat.presence'), {'id': presence.user_id.id, 'im_status': presence.status}])
+        self.pool['bus.bus'].sendmany(cr, uid, notifications)
+        return True
+
+class res_users(osv.Model):
+    _inherit = "res.users"
+
+    def _get_im_status(self, cr, uid, ids, fields, arg, context=None):
+        """ function computing the im_status field of the users """
+        r = dict((i, 'offline') for i in ids)
+        status_ids = self.pool['im_chat.presence'].search(cr, uid, [('user_id', 'in', ids)], context=context)
+        status =  self.pool['im_chat.presence'].browse(cr, uid, status_ids, context=context)
+        for s in status:
+            r[s.user_id.id] = s.status
+        return r
+
+    _columns = {
+        'im_status' : fields.function(_get_im_status, type="char", string="IM Status"),
+    }
+
+    def im_search(self, cr, uid, name, limit, context=None):
+        """ search users with a name and return its id, name and im_status """
+        group_user_id = self.pool.get("ir.model.data").get_object_reference(cr, uid, 'base', 'group_user')[1]
+        user_ids = self.name_search(cr, uid, name, [('id','!=', uid), ('groups_id', 'in', [group_user_id])], limit=limit, context=context)
+        domain = [('user_id', 'in', [i[0] for i in user_ids])]
+        ids = self.pool['im_chat.presence'].search(cr, uid, domain, order="last_poll desc", context=context)
+        presences = self.pool['im_chat.presence'].read(cr, uid, ids, ['user_id','status'], context=context)
+        res = []
+        for user_id in user_ids:
+            user = {
+                'id' : user_id[0],
+                'name' : user_id[1]
+            }
+            tmp = filter(lambda p: p['user_id'][0] == user_id[0], presences)
+            user['im_status'] = len(tmp) > 0 and tmp[0]['status'] or 'offline'
+            res.append(user)
+        return res
+
+#----------------------------------------------------------
+# Controllers
+#----------------------------------------------------------
+class Controller(openerp.addons.bus.bus.Controller):
+    def _poll(self, dbname, channels, last, options):
+        if request.session.uid:
+            registry, cr, uid, context = request.registry, request.cr, request.session.uid, request.context
+            registry.get('im_chat.presence').update(cr, uid, ('im_presence' in options), context=context)
+            # listen to connection and disconnections
+            channels.append((request.db,'im_chat.presence'))
+            # channel to receive message
+            channels.append((request.db,'im_chat.session', request.uid))
+        return super(Controller, self)._poll(dbname, channels, last, options)
+
+    @openerp.http.route('/im_chat/init', type="json", auth="none")
+    def init(self):
+        registry, cr, uid, context = request.registry, request.cr, request.session.uid, request.context
+        notifications = registry['im_chat.message'].init_messages(cr, uid, context=context)
+        return notifications
+
+    @openerp.http.route('/im_chat/post', type="json", auth="none")
+    def post(self, uuid, message_type, message_content):
+        registry, cr, uid, context = request.registry, request.cr, request.session.uid, request.context
+        # execute the post method as SUPERUSER_ID
+        message_id = registry["im_chat.message"].post(cr, openerp.SUPERUSER_ID, uid, uuid, message_type, message_content, context=context)
+        return message_id
+
+    @openerp.http.route(['/im_chat/image/<string:uuid>/<string:user_id>'], type='http', auth="none")
+    def image(self, uuid, user_id):
+        registry, cr, context, uid = request.registry, request.cr, request.context, request.session.uid
+        # get the image
+        Session = registry.get("im_chat.session")
+        image_b64 = Session.get_image(cr, openerp.SUPERUSER_ID, uuid, simplejson.loads(user_id), context)
+        # built the response
+        image_data = base64.b64decode(image_b64)
+        headers = [('Content-Type', 'image/png')]
+        headers.append(('Content-Length', len(image_data)))
+        return request.make_response(image_data, headers)
+
+# vim:et:
diff --git a/addons/im_chat/security/im_security.xml b/addons/im_chat/security/im_security.xml
new file mode 100644
index 00000000000..93d82b8cb0e
--- /dev/null
+++ b/addons/im_chat/security/im_security.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <record id="message_rule_1" model="ir.rule">
+            <field name="name">Can only read messages that you sent or messages sent to you</field>
+            <field name="model_id" ref="model_im_chat_message"/>
+            <field name="groups" eval="[(6,0,[ref('base.group_user')])]"/>
+            <field name="domain_force">[('to_id.user_ids', 'in', [user.id])]</field>
+            <field name="perm_unlink" eval="0"/>
+            <field name="perm_write" eval="0"/>
+            <field name="perm_read" eval="1"/>
+            <field name="perm_create" eval="1"/>
+        </record>
+
+        <record id="users_rule_1" model="ir.rule">
+            <field name="name">Can only modify your session</field>
+            <field name="model_id" ref="model_im_chat_session"/>
+            <field name="groups" eval="[(6,0,[ref('base.group_user')])]"/>
+            <field name="domain_force">[('user_ids', 'in', [user.id])]</field>
+            <field name="perm_unlink" eval="0"/>
+            <field name="perm_write" eval="1"/>
+            <field name="perm_read" eval="1"/>
+            <field name="perm_create" eval="1"/>
+        </record>
+
+        <record id="session_relation_rule_1" model="ir.rule">
+            <field name="name">Can only modify your own session relations</field>
+            <field name="model_id" ref="model_im_chat_conversation_state"/>
+            <field name="groups" eval="[(6,0,[ref('base.group_user')])]"/>
+            <field name="domain_force">[('user_id', '=', user.id)]</field>
+            <field name="perm_unlink" eval="1"/>
+            <field name="perm_write" eval="1"/>
+            <field name="perm_read" eval="1"/>
+            <field name="perm_create" eval="1"/>
+        </record>
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/im_chat/security/ir.model.access.csv b/addons/im_chat/security/ir.model.access.csv
new file mode 100644
index 00000000000..a85541d1aa4
--- /dev/null
+++ b/addons/im_chat/security/ir.model.access.csv
@@ -0,0 +1,5 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_im_chat_message,im_chat.message,model_im_chat_message,base.group_user,1,0,1,0
+access_im_chat_session,im_chat.session,model_im_chat_session,base.group_user,1,1,1,0
+access_im_chat_conversation_state,im_chat.conversation_state,model_im_chat_conversation_state,base.group_user,1,1,1,0
+access_im_chat_presence,im_chat.presence,model_im_chat_presence,base.group_user,1,1,1,1
diff --git a/addons/im/static/description/icon.png b/addons/im_chat/static/description/icon.png
similarity index 100%
rename from addons/im/static/description/icon.png
rename to addons/im_chat/static/description/icon.png
diff --git a/addons/im/static/src/audio/purr.mp3 b/addons/im_chat/static/src/audio/purr.mp3
similarity index 100%
rename from addons/im/static/src/audio/purr.mp3
rename to addons/im_chat/static/src/audio/purr.mp3
diff --git a/addons/im/static/src/audio/purr.ogg b/addons/im_chat/static/src/audio/purr.ogg
similarity index 100%
rename from addons/im/static/src/audio/purr.ogg
rename to addons/im_chat/static/src/audio/purr.ogg
diff --git a/addons/im/static/src/audio/Ting.mp3 b/addons/im_chat/static/src/audio/ting.mp3
similarity index 100%
rename from addons/im/static/src/audio/Ting.mp3
rename to addons/im_chat/static/src/audio/ting.mp3
diff --git a/addons/im/static/src/audio/Ting.ogg b/addons/im_chat/static/src/audio/ting.ogg
similarity index 100%
rename from addons/im/static/src/audio/Ting.ogg
rename to addons/im_chat/static/src/audio/ting.ogg
diff --git a/addons/im/static/src/css/im.css b/addons/im_chat/static/src/css/im_chat.css
similarity index 99%
rename from addons/im/static/src/css/im.css
rename to addons/im_chat/static/src/css/im_chat.css
index d383ffac07d..eb8faf52f8b 100644
--- a/addons/im/static/src/css/im.css
+++ b/addons/im_chat/static/src/css/im_chat.css
@@ -40,7 +40,7 @@
 .oe_im_frame_header .oe_im_search_icon {
     position: absolute;
     color: #888;
-    top: 2px;
+    top: -4px;
     left: 9px;
     font-size: 28px;
     font-family: "entypoRegular" !important;
@@ -106,4 +106,4 @@
     height: 11px;
     vertical-align: middle;
     border: 0;
-}
+}
\ No newline at end of file
diff --git a/addons/im/static/src/css/im_common.css b/addons/im_chat/static/src/css/im_common.css
similarity index 81%
rename from addons/im/static/src/css/im_common.css
rename to addons/im_chat/static/src/css/im_common.css
index 30275833b2d..ef13d2a9c0d 100644
--- a/addons/im/static/src/css/im_common.css
+++ b/addons/im_chat/static/src/css/im_common.css
@@ -73,19 +73,36 @@
     border-bottom: 1px solid #AEB9BD;
     cursor: pointer;
 }
-.oe_im_chatview .oe_im_chatview_close {
+
+.oe_im_chatview .oe_im_chatview_header_name{
+    max-width: 75%;
+    word-wrap: break-word;
+    display: inline-block;
+    height: 15px;
+
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+.oe_im_chatview .oe_im_chatview_right {
     padding: 0;
+    background: transparent;
+    border: 0;
+    float: right;
+    color: gray ;
+}
+.oe_im_chatview .oe_im_chatview_right div, .oe_im_chatview .oe_im_chatview_right button{
     cursor: pointer;
     background: transparent;
     border: 0;
+    margin-left: 5px;
     -webkit-appearance: none;
     font-size: 18px;
     line-height: 16px;
-    float: right;
     font-weight: bold;
-    color: black;
     text-shadow: 0 1px 0 white;
-    opacity: 0.2;
+    opacity: 0.9;
+    display: inline-block;
 }
 .oe_im_chatview .oe_im_chatview_content {
     overflow: auto;
@@ -120,15 +137,34 @@
     -webkit-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.2);
     box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.2);
 }
-.oe_im_chatview .oe_im_chatview_bubble {
+.oe_im_chatview .oe_im_chatview_message_bubble {
     background: white;
     position: relative;
+    min-height: 32px;
     padding: 3px;
     margin: 3px;
     -moz-border-radius: 3px;
     -webkit-border-radius: 3px;
     border-radius: 3px;
 }
+
+.oe_im_chatview .oe_im_chatview_message_bubble .smiley{
+    font-size: 18px;
+}
+
+.oe_im_chatview .oe_im_chatview_technical_bubble {
+    background: #D8D8D8;
+    position: relative;
+    min-height: 32px;
+    padding: 3px;
+    margin: 3px;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    border-radius: 3px;
+
+    font-style:italic;
+}
+
 .oe_im_chatview .oe_im_chatview_clip {
     position: relative;
     float: left;
@@ -187,3 +223,13 @@
     width: 11px;
     height: 11px;
 }
+
+.oe_im_chatview .oe_im_chatview_date_separator {
+    background: transparent;
+    position: relative;
+    padding: 3px;
+    color: #aaa;
+    margin: 3px;
+    text-align: right;
+    font-size: 12px;
+}
\ No newline at end of file
diff --git a/addons/im/static/src/img/avatar/avatar.jpeg b/addons/im_chat/static/src/img/avatar.jpg
similarity index 100%
rename from addons/im/static/src/img/avatar/avatar.jpeg
rename to addons/im_chat/static/src/img/avatar.jpg
diff --git a/addons/im/static/src/img/button-gloss.png b/addons/im_chat/static/src/img/button-gloss.png
similarity index 100%
rename from addons/im/static/src/img/button-gloss.png
rename to addons/im_chat/static/src/img/button-gloss.png
diff --git a/addons/im/static/src/img/glyphicons-halflings-white.png b/addons/im_chat/static/src/img/glyphicons-halflings-white.png
similarity index 100%
rename from addons/im/static/src/img/glyphicons-halflings-white.png
rename to addons/im_chat/static/src/img/glyphicons-halflings-white.png
diff --git a/addons/im/static/src/img/glyphicons-halflings.png b/addons/im_chat/static/src/img/glyphicons-halflings.png
similarity index 100%
rename from addons/im/static/src/img/glyphicons-halflings.png
rename to addons/im_chat/static/src/img/glyphicons-halflings.png
diff --git a/addons/im/static/src/img/green.png b/addons/im_chat/static/src/img/green.png
similarity index 100%
rename from addons/im/static/src/img/green.png
rename to addons/im_chat/static/src/img/green.png
diff --git a/addons/im/static/src/img/logo.png b/addons/im_chat/static/src/img/logo.png
similarity index 100%
rename from addons/im/static/src/img/logo.png
rename to addons/im_chat/static/src/img/logo.png
diff --git a/addons/im_chat/static/src/img/musti.png b/addons/im_chat/static/src/img/musti.png
new file mode 100644
index 0000000000000000000000000000000000000000..f6843ddf95cd65ee956a7e37b0fa1e7d7b3bf12e
GIT binary patch
literal 1017
zcmZvZPe@cz7{yOoVuG`XpqwH!xDrIf3~iN?soqRwuRm%~gub8_FD<w&Y-%w@+5cw@
z^q@uNBCKXActqk0qDf+;C>Qw_HoOXFU?AE|LW>ILbZuATfqM?$<%4^FoGW_!_WHVD
z9f10%7TK$^asJd+E05f}ngyz%@7%w2k(!kfNF?S%rLv5YpBZ^uV##CPp=U8`a!g}N
zFa<veHxAo?j6n~B1&<RB(-sF!N{wBD9q^-YTVRJE1@s2c^XNFVESe@YjY5<GA8-L1
zkbn-gQ=l_JD@}8dnxyC=I($T3wActq2ptXdN_6tHJepZ*V-zVO<s<1LZo`m>=?K#!
z9nvCAQX>V+DEshTxHfDFsY71~i%Ix#xCZPPWElEFSd7ANfg6G?ARC}pU=jGAY#}Tn
z>Z8R)$cB(;&=<lYl0M=t3>z_tuwH>hl*{maxGroPQbJcdC5L&7p2@7nvH7+t3iDWS
zIAJkua!{ib>_SCh9zBPSMa!hAQ4<suSSZk&pp&LGNK;blqUiV^3nhAaIv%Yo%`s}J
zzlHsa1y&SRfrZ)G*<!Jn%jG5~C&$OfM@L6fsnpQWP%@bu7#N7h<9&U7hGBGecE)0{
z*4EZ=INaRa91I2nfdGG(hKKJZ5((7}sGge-mCBU9Kil+8T`W4aw|yTr7pIS^;eIr-
zWq*I}adJ=Kbz^Ph)l@&H`h$nIum5_gsrTu(OJa8Q$ne|uA6{1Hj&$Em-&#}s;n?xD
zE86CY?~Kq)=Iiy#wT=0v%;~jN!v|`XpQ(AY?DO+$Z;Tz8gTH>PxOscmk<8L{$2Z;?
zd6@4w`AM`FKKJy7x80v!nQ*S2xOVhh?}K7yCLLQPs=7~K*j%^z=cC2$jl*8&%$65R
lM(TI0*>LgUrIT}kvsmA=yJ_FYFTLu^h;D6<JZbAb{|6B@^_~C#

literal 0
HcmV?d00001

diff --git a/addons/im_chat/static/src/img/pinky.png b/addons/im_chat/static/src/img/pinky.png
new file mode 100644
index 0000000000000000000000000000000000000000..4466946601cdcd743b93705fe33d5a9dcf4da29f
GIT binary patch
literal 2978
zcmV;T3tjYyP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XU
z000XU0RWnu7ytkYO=&|zP*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-oy)cUY767Czti
zWe-+D*zmEJY=HnGBdiF>5Lu!Sk^o_Z5E4Meg@_7P6crJiNL9pw)e1<Rh~l6qxMx9%
zh+2zPTsZC@+^4mDdhhM+``7!t=bY#K&Uw!dfDsZVk>;Xm069{HJUZAPk55R%$-RIA
z6-eL&AQ0xu!e<4=008g<d3b(wus{3(uWtYX0C3eVBofEr|AV?vCRYF;kpSQ#66Xs6
zkWv81E>y@A0LT~suv4>S3ILP<0Bm`DLLvaF4FK%)Nj?Pt*r}7;7Xa9z9H|HZjR63e
zC`Tj$K)V27Re@400>HumpsYY5E(E}?0f1SyGDiY{y#)Yvj#!WnKwtoXnL;eg03bL5
z07D)V%>y7z1E4U{zu>7~aD})?0RX_umCct+(lZpemCzb@^6=o|A>zVpu|i=NDG+7}
z<RYAxn<EoQ=L1a63;+Nc`O(4tI6si*=H%h#X6J10^u?n7Yw&L(J|Xen{=AF=1OO0D
z&+pn_<>l4`aK{0#b-!z=TL9Wt0BGO&T{GJWpjryhdijfaIQ&2!o}p04JRKYg3k&Tf
zVxhe-<BLB3GvROGi+=X}Kpy_vdhh^onn0PYz@vlxaba$Du2PQY%LGC(ZujRS{>O!X
z{f;To;xw^bEES6JSc$k$B2CA6xl)ltA<32E66t?3@gJ7`36pmX0IY^jz)rRYwaaY4
ze(nJRiw;=Qb^t(r^DT@T3y}a2XEZW-_W%Hszxj_qD**t_m!#tW0KDiJT&R>6OvVTR
z07RgHDzHHZ48atvzz&?j9lXF70$~P3Knx_nJP<+#<bWIsp%|7y8C1YJ*aWq(0~(+a
zn&A+%!7(@u=im}tf$MM=24EPT!Wg`U2?RmN2oqr;I*1Wsj@Tm32p5@-1R`NbG?IX%
zAnAw{Q6k02a-;&OLTZs+NF(wsauhj@TtNDe+sGg?iu{VaM=_LvvQY!n0(C&Ss2>`N
z#-MZ2bTkiLfR>_b(HgWKJ%F~Nr_oF3b#wrIijHG|(J>BYjM-sajE6;FiC7vY#};Gd
zST$CUHDeuEH+B^pz@B062qXfFfD`NpUW5?BY=V%GM_5c)L#QR}BeW8_2v-S%gfYS=
zB9o|3v?Y2H`NVi)I<b&gMyw|8As!)~C0-{E6JL`^Bo4`v<W349C6F>n3rTB8+ej^>
zQ=~r95NVuDChL%G$=>7$vVg20myx%S50Foi`^m%Pw-h?Xh~i8Mq9jtJloCocWk2Nv
zrJpiFnV_ms&8eQ$2&#xWpIS+6pmtC%Q-`S&G<BLK&6^fO%cL!%)zF%0XKD9nFX?o;
z3EhJpMVHW*(rf4k>F4Q#^mhymh7E(qNMa}%YZ-ePrx>>xFPTiH1=E+A$W$=bG8>s^
zm=Bn5Rah$aDtr}@$`X}2l~$F0mFKEdRdZE8)p@E5RI61Ft6o-prbbn>P~)iy)E2AN
zsU20jsWz_8Qg>31P|s0cqrPALg8E|(vWA65poU1JRAaZs8I2(p#xiB`SVGovRs-uS
zYnV-9TeA7=Om+qP8+I>yOjAR1s%ETak!GFdam@h^#<Ae=IoX^_&LPeX&U-BbEk7->
z)@rS0t$wXH+Irf)+G6c;?H29p+V6F6oj{!|o%K3xI`?%6x;DB|x`n#ib<gTP(_`y-
z=?V49^$zLX(MR=d^rQ6`>hIR?(H}Q3Gzd138Ei2)WAMz7W9Vy`X}HnwgyE<W%V@fh
z#Au_@NuwvYChmu4<285}K4z?M9Ad0A-euftJYiyKGTWrYq{ZaEDb18?nr6Duw9|CV
z%*ZU<tk|r{?2b9roNJz8zS+Fn{EdaBMV!S-i#ChLmfDtl%LSHAmiMffRz6mFR`pib
ztVz~f>n!VS)>mv$8&{hQn>w4zwy3R}t;BYlZQm5)6pty=DfLrs+A-|>><a9f>;~;Q
z_F?uV_HFjh9n2gO9o9Q^JA86<b<B2baJ=iJ;WWdk#HqvSS7#e%p>v({H5aB!kjoO6
zc9$1ZZKsN-Zl8L~mE{`ly3)1N^`o1+o7}D0ZPeY&J;i;i`%NyJ8_8Y6J?}yE@b_5a
zam?eLr<<q3^N{B+UUpttUi-ZsPqUmRp4KpJ$lJtQ;JwRxU^+fMW%|zP13tz+0-t)H
zhrXu1BHul}BYxI?nSKZSp8Grc%l(h|zu|fE7V%C6U;)7a<pI5c8iBI|YXctynFOT=
zH3f|Yy9O@|J{3X?2@P2va+7bs7xEkVV>8@mESk|3$_SkmS{wQ>%qC18))9_|&j{ZT
zes8AvOzF(F2#DZEY>2oYX&IRp`F#{ADl)1r>QS^)ba8a|EY_^#S^H<bj`5GFjJZ48
zYPNEAXRK;$Qfy=Fo4A0us<?r8hxkSDmlAXnBnj<_<iyy-J&EIU0_SX+Go0j_RF-sO
zuI1dKxfkZ?&dZ*6JXtkakbF3Wm=c$=KjniULQpRlPvxg>O&t^Rgqwv=MZThqqEWH8
zxJo>d=ABlR_Bh=;eM9<ahEGOy#xn^|QY(3p8Irjp^G#Mn*50ho*>Tw|Ih34~oTE|=
zX_mAr*D$vzw@+p(E0Yc6dFE}(8<U61_v9n_bMxC3Y=unGqqI`4P!1MMFQ_YcTNqn-
zxJbQ7TGTV&X8!8=BMX8Se7%scP`I$O*tmFE@!%rAMY|Rwi&GbOE-_tFx@351@X~$D
zXv?ye{ZQgqQdRP5dED}jQiIZ^r9&%%S2UHWl*!9(uJl^DV-;bQWL58Km(^QVe<~N1
zU#xJfsIK_1M!4qUS59BmeD!&4+S=Yqx61A7Nb98QZmjoNzpqNYYC+Y|hVTuo8}W_h
z8((co-gKdQYW0rIw9U%R12tha?OV*YtlRRTHly}>oqt`+R{gE3x4zjX+Sb3_cYE^=
zgB=w+-tUy`ytONMS8KgRef4hA?t<Nq8e$u|zvh13xJP$S#h#CQrF#eVMeplsbZ>0j
zufM;t32jm~jUGrkaOInTZ`zyfns>EuS}G30LFK_G-==(f<51|K&cocp&EJ`SxAh3?
zNO>#LI=^+SEu(FqJ)ynt=!~PC9bO$rzPJB=?=j<Jb;mW2SDv7qC_VA{<bspqr(~y|
zolZYJ)S29Q_e}hmYh6)Yy=Ozuo<A3K?o78|_sR3#=Z{_Rym0g)_hQ>6w@a-(u02P7
zaQ)#(uUl{HW%tYNS3ItC^iAtK(eKlL`f9+{bJzISE?u8_z3;~C8@FyI-5j_jy7l;W
z_U#vU3hqqYU3!mrul&B+{ptt$59)uk{;_4iZQ%G|z+lhASr6|H35TBkl>gI*;nGLU
zN7W-nBaM%pA0HbH8olyl&XeJ%vZoWz%6?Y=dFykl=imL}`%BMQ{Mhgd`HRoLu6e2R
za__6DuR6yg#~-}Tc|Gx_{H@O0eebyMy5GmWADJlpK>kqk(fVV@r_fLLKIeS?{4e)}
z^ZO;zpECde00d`2O+f$vv5tKEQIh}w03c&XQcVB=dL;k=fP(-4`Tqa_faw4Lbua(`
z>R<o>I+y?e7jKeZ#YO-C0KZ8@K~#9!%u_KAgD?<tB0kckBU^V%ys59?0euaUXV@4!
zv`<L~2!wDnNL_kTl*BnZPITu&A7F)~%>hYg<y8QHTS9CnB5Rt0yeC2f;6fi30ksM_
zap!E*Dlz~*y}3k=&Z0|Tb|7uZ@9Q*Qo?CK?YZOR2pWhIZ&aVBD)ux$73HQ1Ev%#8>
z6m|~cySol}J<51xspp^f4fpsl{!Bolc4cc}ra-LmJi+RNG-oa4q+OTJo3VT!F_P{x
Y06%qZ>VbeY+5i9m07*qoM6N<$f&iwZlmGw#

literal 0
HcmV?d00001

diff --git a/addons/im/static/src/img/wood.png b/addons/im_chat/static/src/img/wood.png
similarity index 100%
rename from addons/im/static/src/img/wood.png
rename to addons/im_chat/static/src/img/wood.png
diff --git a/addons/im_chat/static/src/img/yellow.png b/addons/im_chat/static/src/img/yellow.png
new file mode 100644
index 0000000000000000000000000000000000000000..4ee901175708f1c4b254e1194f9aad810a66725f
GIT binary patch
literal 855
zcmV-d1E~CoP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-UI^)7%-^DO{)L^0^~_V
zK~y-)Ws^&5oMjZpf9E{!WhRr!T+&HW6HIFh%}NZ7AR?lRnuXF2;m)PFX<cY^Vf_Gt
z3omPzE>uV%U`1<DAz(MLwTWYDGs!T?OlC4OdEfVW9v4Y!s0R**1LuGK=PEoQ*Oq1#
zC>bMV=O_ZG(zVvNfzHQEb$2>mPCM^?bUp;$s7*wR6I0QA7|I+#n)<b!MzY%6NtS_c
zK74m0{a=FXADpYH^47u&V{e|FdS)gcPiqv83qX>#{NV5(x7ApG_}iWRFP-Dl8}I+s
z1Td$V-+tvv<(;z=muvZW#ssDy;PE~~G?dVkv^ZKFo1AVh)HjCdt5+(wZ>_YQxwbT`
zB69V)%f;&xwTm@RrXnHM^~u};)(voWfb~PttSxa|4fBQGg~p>~<HeUt_Y^2q&jgE;
zQ{|Z?ZK|MH*TcF#&JA&Hh;@CeJ>aOFrcO?kXR2p{MWCd{NV!r8=L1tvA;7r==Q5nj
z@ZSDseTwskc<(Wq(@G_rH%7{Va}<M6=2RmA#gpO55cFh3$J16oF`7d)CqXE4&QT0h
zK^0VD)WoPpsKkf{2m!!RQkNkTV#Oe0IKc%#H%<MT_xAZ97!}pr5sSniM_cyZ;v_+i
z!I|y)<j}7HUA5M?cN)oRYCG-(Y;*);3IwKjtcBy!BUB@@Y~M9^l2vPcTY*lmYnT77
zZ*O{Uoe-cJVKny`tP&#<A`*i4u3q2X>~-xj&@n%L-|^4R7uWZ8({ic0yD(OKDl{4k
zqKE{5!}%1jq_*QXAO70E^Hb;Zdu#nKKKtZRY5;z@y)VF4doPQFs4+V_HXJ#=Lb3LM
zVY20W{XhKOyT7+?e%Jc?)=K-UA6DACKyva63KUCaGyU4@<5!<PmwV~_h5V)JcsLEv
zYNlHo4+eiexIg&$=C`fo!N6?-P2f<T_{^|e2}Ukn%1@TcK`n~3>>V-~*zVqL)>^+m
h*zWag7f1jL@Gs$eSmv7=Qvd(}002ovPDHLkV1jP=jx_)P

literal 0
HcmV?d00001

diff --git a/addons/im_chat/static/src/js/im_chat.js b/addons/im_chat/static/src/js/im_chat.js
new file mode 100644
index 00000000000..b08cd0d1e29
--- /dev/null
+++ b/addons/im_chat/static/src/js/im_chat.js
@@ -0,0 +1,596 @@
+(function(){
+
+    "use strict";
+    var _t = openerp._t;
+    var _lt = openerp._lt;
+    var QWeb = openerp.qweb;
+    var NBR_LIMIT_HISTORY = 20;
+    var USERS_LIMIT = 20;
+    var im_chat = openerp.im_chat = {};
+
+    im_chat.ConversationManager = openerp.Widget.extend({
+        init: function(parent, options) {
+            var self = this;
+            this._super(parent);
+            this.options = _.clone(options) || {};
+            _.defaults(this.options, {
+                inputPlaceholder: _t("Say something..."),
+                defaultMessage: null,
+                defaultUsername: _t("Visitor"),
+            });
+            // business
+            this.sessions = {};
+            this.bus = openerp.bus.bus;
+            this.bus.on("notification", this, this.on_notification);
+            this.bus.options["im_presence"] = true;
+
+            // ui
+            this.set("right_offset", 0);
+            this.set("bottom_offset", 0);
+            this.on("change:right_offset", this, this.calc_positions);
+            this.on("change:bottom_offset", this, this.calc_positions);
+
+            this.set("window_focus", true);
+            this.on("change:window_focus", self, function(e) {
+                self.bus.options["im_presence"] = self.get("window_focus");
+            });
+            this.set("waiting_messages", 0);
+            this.on("change:waiting_messages", this, this.window_title_change);
+            $(window).on("focus", _.bind(this.window_focus, this));
+            $(window).on("blur", _.bind(this.window_blur, this));
+            this.window_title_change();
+        },
+        on_notification: function(notification) {
+            var self = this;
+            var channel = notification[0];
+            var message = notification[1];
+            var regex_uuid = new RegExp(/(\w{8}(-\w{4}){3}-\w{12}?)/g);
+
+            // Concern im_chat : if the channel is the im_chat.session or im_chat.status, or a 'private' channel (aka the UUID of a session)
+            if((Array.isArray(channel) && (channel[1] === 'im_chat.session' || channel[1] === 'im_chat.presence')) || (regex_uuid.test(channel))){
+                // message to display in the chatview
+                if (message.type === "message" || message.type === "meta") {
+                    self.received_message(message);
+                }
+                // activate the received session
+                if(message.uuid){
+                    this.apply_session(message);
+                }
+                // user status notification
+                if(message.im_status){
+                    self.trigger("im_new_user_status", [message]);
+                }
+            }
+        },
+
+        // window focus unfocus beep and title
+        window_focus: function() {
+            this.set("window_focus", true);
+            this.set("waiting_messages", 0);
+        },
+        window_blur: function() {
+            this.set("window_focus", false);
+        },
+        window_beep: function() {
+            if (typeof(Audio) === "undefined") {
+                return;
+            }
+            var audio = new Audio();
+            var ext = audio.canPlayType("audio/ogg; codecs=vorbis") ? ".ogg" : ".mp3";
+            var kitten = jQuery.deparam !== undefined && jQuery.deparam(jQuery.param.querystring()).kitten !== undefined;
+            audio.src = openerp.session.url("/im_chat/static/src/audio/" + (kitten ? "purr" : "ting") + ext);
+            audio.play();
+        },
+        window_title_change: function() {
+            var title = undefined;
+            if (this.get("waiting_messages") !== 0) {
+                title = _.str.sprintf(_t("%d Messages"), this.get("waiting_messages"))
+                this.window_beep();
+            }
+            if (! openerp.webclient || !openerp.webclient.set_title_part)
+                return;
+            openerp.webclient.set_title_part("im_messages", title);
+        },
+
+        apply_session: function(session, focus){
+            var self = this;
+            var conv = this.sessions[session.uuid];
+            if (! conv) {
+                if(session.state !== 'closed'){
+                    conv = new im_chat.Conversation(this, this, session, this.options);
+                    conv.appendTo($("body"));
+                    conv.on("destroyed", this, function() {
+                        delete this.sessions[session.uuid];
+                        this.calc_positions();
+                    });
+                    this.sessions[session.uuid] = conv;
+                    this.calc_positions();
+                }
+            }else{
+                conv.set("session", session);
+            }
+            conv && this.trigger("im_session_activated", conv);
+            if (focus)
+                conv.focus();
+            return conv;
+        },
+        activate_session: function(session, focus) {
+            var self = this;
+            var active_session = _.clone(session);
+            active_session.state = 'open';
+            var conv = this.apply_session(active_session, focus);
+            if(session.state !== 'open'){
+                conv.update_fold_state('open');
+            }
+            return conv;
+        },
+        received_message: function(message) {
+            var self = this;
+            var session_id = message.to_id[0];
+            var uuid = message.to_id[1];
+            if (! this.get("window_focus")) {
+                this.set("waiting_messages", this.get("waiting_messages") + 1);
+            }
+            var conv = this.sessions[uuid];
+            if(!conv){
+                // fetch the session, and init it with the message
+                var def_session = new openerp.Model("im_chat.session").call("session_info", [], {"ids" : [session_id]}).then(function(session){
+                    conv = self.activate_session(session, false);
+                    conv.received_message(message);
+                });
+            }else{
+                conv.received_message(message);
+            }
+        },
+        calc_positions: function() {
+            var self = this;
+            var current = this.get("right_offset");
+            _.each(this.sessions, function(s) {
+                s.set("bottom_position", self.get("bottom_offset"));
+                s.set("right_position", current);
+                current += s.$().outerWidth(true);
+            });
+        },
+        destroy: function() {
+            $(window).off("unload", this.unload);
+            $(window).off("focus", this.window_focus);
+            $(window).off("blur", this.window_blur);
+            return this._super();
+        }
+    });
+
+    im_chat.Conversation = openerp.Widget.extend({
+        className: "openerp_style oe_im_chatview",
+        events: {
+            "keydown input": "keydown",
+            "click .oe_im_chatview_close": "click_close",
+            "click .oe_im_chatview_header": "click_header"
+        },
+        init: function(parent, c_manager, session, options) {
+            this._super(parent);
+            this.c_manager = c_manager;
+            this.options = options || {};
+            this.loading_history = true;
+            this.set("messages", []);
+            this.set("session", session);
+            this.set("right_position", 0);
+            this.set("bottom_position", 0);
+            this.set("pending", 0);
+            this.inputPlaceholder = this.options.defaultInputPlaceholder;
+        },
+        start: function() {
+            var self = this;
+            self.$().append(openerp.qweb.render("im_chat.Conversation", {widget: self}));
+            self.$().hide();
+            self.on("change:session", self, self.update_session);
+            self.on("change:right_position", self, self.calc_pos);
+            self.on("change:bottom_position", self, self.calc_pos);
+            self.full_height = self.$().height();
+            self.calc_pos();
+            self.on("change:pending", self, _.bind(function() {
+                if (self.get("pending") === 0) {
+                    self.$(".oe_im_chatview_nbr_messages").text("");
+                } else {
+                    self.$(".oe_im_chatview_nbr_messages").text("(" + self.get("pending") + ")");
+                }
+            }, self));
+            // messages business
+            self.on("change:messages", this, this.render_messages);
+            self.$('.oe_im_chatview_content').on('scroll',function(){
+                if($(this).scrollTop() === 0){
+                    self.load_history();
+                }
+            });
+            self.load_history();
+            self.$().show();
+            // prepare the header and the correct state
+            self.update_session();
+        },
+        show: function(){
+            this.$().animate({
+                height: this.full_height
+            });
+            this.set("pending", 0);
+        },
+        hide: function(){
+            this.$().animate({
+                height: this.$(".oe_im_chatview_header").outerHeight()
+            });
+        },
+        calc_pos: function() {
+            this.$().css("right", this.get("right_position"));
+            this.$().css("bottom", this.get("bottom_position"));
+        },
+        update_fold_state: function(state){
+            return new openerp.Model("im_chat.session").call("update_state", [], {"uuid" : this.get("session").uuid, "state" : state});
+        },
+        update_session: function(){
+            // built the name
+            var names = [];
+            _.each(this.get("session").users, function(user){
+                if( (openerp.session.uid !== user.id) && !(_.isUndefined(openerp.session.uid) && !user.id) ){
+                    names.push(user.name);
+                }
+            });
+            this.$(".oe_im_chatview_header_name").text(names.join(", "));
+            this.$(".oe_im_chatview_header_name").attr('title', names.join(", "));
+            // update the fold state
+            if(this.get("session").state){
+                if(this.get("session").state === 'closed'){
+                    this.destroy();
+                }else{
+                    if(this.get("session").state === 'open'){
+                        this.show();
+                    }else{
+                        this.hide();
+                    }
+                }
+            }
+        },
+        load_history: function(){
+            var self = this;
+            if(this.loading_history){
+                var domain = [["to_id.uuid", "=", this.get("session").uuid]];
+                _.first(this.get("messages")) && domain.push(['id','<', _.first(this.get("messages")).id]);
+                new openerp.Model("im_chat.message").call("search_read", [domain, ['id', 'create_date','to_id','from_id', 'type', 'message'], 0, NBR_LIMIT_HISTORY]).then(function(messages){
+                    self.insert_messages(messages);
+					if(messages.length != NBR_LIMIT_HISTORY){
+                        self.loading_history = false;
+                    }
+                });
+            }
+        },
+        received_message: function(message) {
+            if (this.get('session').state === 'open') {
+                this.set("pending", 0);
+            } else {
+                this.set("pending", this.get("pending") + 1);
+            }
+            this.insert_messages([message]);
+            this._go_bottom();
+        },
+        send_message: function(message, type) {
+            var self = this;
+            var send_it = function() {
+                return openerp.session.rpc("/im_chat/post", {uuid: self.get("session").uuid, message_type: type, message_content: message});
+            };
+            var tries = 0;
+            send_it().fail(function(error, e) {
+                e.preventDefault();
+                tries += 1;
+                if (tries < 3)
+                    return send_it();
+            });
+        },
+        insert_messages: function(messages){
+        	var self = this;
+            // avoid duplicated messages
+        	messages = _.filter(messages, function(m){ return !_.contains(_.pluck(self.get("messages"), 'id'), m.id) ; });
+            // escape the message content and set the timezone
+            _.map(messages, function(m){
+                if(!m.from_id){
+                    m.from_id = [false, self.options["defaultUsername"]];
+                }
+                m.message = self.escape_keep_url(m.message);
+                m.message = self.smiley(m.message);
+                m.create_date = Date.parse(m.create_date).setTimezone("UTC").toString("yyyy-dd-MM HH:mm:ss");
+                return m;
+            });
+           	this.set("messages", _.sortBy(this.get("messages").concat(messages), function(m){ return m.id; }));
+        },
+        render_messages: function(){
+            var self = this;
+            var res = {};
+            var last_date_day, last_user_id = -1;
+            _.each(this.get("messages"), function(current){
+                // add the url of the avatar for all users in the conversation
+                current.from_id[2] = openerp.session.url(_.str.sprintf("/im_chat/image/%s/%s", self.get('session').uuid, current.from_id[0]));
+                var date_day = current.create_date.split(" ")[0];
+                if(date_day !== last_date_day){
+                    res[date_day] = [];
+                    last_user_id = -1;
+                }
+                last_date_day = date_day;
+                if(current.type == "message"){ // traditionnal message
+                    if(last_user_id === current.from_id[0]){
+                        _.last(res[date_day]).push(current);
+                    }else{
+                        res[date_day].push([current]);
+                    }
+                    last_user_id = current.from_id[0];
+                }else{ // meta message
+                    res[date_day].push([current]);
+                    last_user_id = -1;
+                }
+            });
+            // render and set the content of the chatview
+            this.$('.oe_im_chatview_content_bubbles').html($(openerp.qweb.render("im_chat.Conversation_content", {"list": res})));
+        },
+        keydown: function(e) {
+            if(e && e.which !== 13) {
+                return;
+            }
+            var mes = this.$("input").val();
+            if (! mes.trim()) {
+                return;
+            }
+            this.$("input").val("");
+            this.send_message(mes, "message");
+        },
+        get_smiley_list: function(){
+            var kitten = jQuery.deparam !== undefined && jQuery.deparam(jQuery.param.querystring()).kitten !== undefined;
+            var smileys = {
+                ":'(": "&#128546;",
+                ":O" : "&#128561;",
+                "3:)": "&#128520;",
+                ":)" : "&#128522;",
+                ":D" : "&#128517;",
+                ";)" : "&#128521;",
+                ":p" : "&#128523;",
+                ":(" : "&#9785;",
+                ":|" : "&#128528;",
+                ":/" : "&#128527;",
+                "8)" : "&#128563;",
+                ":s" : "&#128534;",
+                ":pinky" : "<img src='/im_chat/static/src/img/pinky.png'/>",
+                ":musti" : "<img src='/im_chat/static/src/img/musti.png'/>",
+            };
+            if(kitten){
+                _.extend(smileys, {
+                    ":)" : "&#128570;",
+                    ":D" : "&#128569;",
+                    ";)" : "&#128572;",
+                    ":p" : "&#128573;",
+                    ":(" : "&#128576;",
+                    ":|" : "&#128575;",
+                });
+            }
+            return smileys;
+        },
+        smiley: function(str){
+            var re_escape = function(str){
+                return String(str).replace(/([.*+?=^!:${}()|[\]\/\\])/g, '\\$1');
+             };
+             var smileys = this.get_smiley_list();
+            _.each(_.keys(smileys), function(key){
+                str = str.replace( new RegExp("(?:^|\\s)(" + re_escape(key) + ")(?:\\s|$)"), ' <span class="smiley">'+smileys[key]+'</span> ');
+            });
+            return str;
+        },
+        escape_keep_url: function(str){
+            var url_regex = /(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/gi;
+            var last = 0;
+            var txt = "";
+            while (true) {
+                var result = url_regex.exec(str);
+                if (! result)
+                    break;
+                txt += _.escape(str.slice(last, result.index));
+                last = url_regex.lastIndex;
+                var url = _.escape(result[0]);
+                txt += '<a href="' + url + '" target="_blank">' + url + '</a>';
+            }
+            txt += _.escape(str.slice(last, str.length));
+            return txt;
+        },
+        _go_bottom: function() {
+            this.$(".oe_im_chatview_content").scrollTop(this.$(".oe_im_chatview_content").get(0).scrollHeight);
+        },
+        add_user: function(user){
+            return new openerp.Model("im_chat.session").call("add_user", [this.get("session").uuid , user.id]);
+        },
+        focus: function() {
+            this.$(".oe_im_chatview_input").focus();
+        },
+        click_header: function(){
+            this.update_fold_state();
+        },
+        click_close: function(event) {
+            event.stopPropagation();
+            this.update_fold_state('closed');
+        },
+        destroy: function() {
+            this.trigger("destroyed");
+            return this._super();
+        }
+    });
+
+    im_chat.UserWidget = openerp.Widget.extend({
+        "template": "im_chat.UserWidget",
+        events: {
+            "click": "activate_user",
+        },
+        init: function(parent, user) {
+            this._super(parent);
+            this.set("id", user.id);
+            this.set("name", user.name);
+            this.set("im_status", user.im_status);
+            this.set("image_url", user.image_url);
+        },
+        start: function() {
+            this.$el.data("user", {id:this.get("id"), name:this.get("name")});
+            this.$el.draggable({helper: "clone"});
+            this.on("change:im_status", this, this.update_status);
+            this.update_status();
+        },
+        update_status: function(){
+            this.$(".oe_im_user_online").toggle(this.get('im_status') !== 'offline');
+            var img_src = (this.get('im_status') == 'away' ? '/im_chat/static/src/img/yellow.png' : '/im_chat/static/src/img/green.png');
+            this.$(".oe_im_user_online").attr('src', openerp.session.server + img_src);
+        },
+        activate_user: function() {
+            this.trigger("activate_user", this.get("id"));
+        },
+    });
+
+    im_chat.InstantMessaging = openerp.Widget.extend({
+        template: "im_chat.InstantMessaging",
+        events: {
+            "keydown .oe_im_searchbox": "input_change",
+            "keyup .oe_im_searchbox": "input_change",
+            "change .oe_im_searchbox": "input_change",
+        },
+        init: function(parent) {
+            this._super(parent);
+            this.shown = false;
+            this.set("right_offset", 0);
+            this.set("current_search", "");
+            this.users = [];
+            this.widgets = {};
+
+            this.c_manager = new openerp.im_chat.ConversationManager(this);
+            this.on("change:right_offset", this.c_manager, _.bind(function() {
+                this.c_manager.set("right_offset", this.get("right_offset"));
+            }, this));
+            this.user_search_dm = new openerp.web.DropMisordered();
+        },
+        start: function() {
+            var self = this;
+            this.$el.css("right", -this.$el.outerWidth());
+            $(window).scroll(_.bind(this.calc_box, this));
+            $(window).resize(_.bind(this.calc_box, this));
+            this.calc_box();
+
+            this.on("change:current_search", this, this.search_changed);
+            this.search_changed();
+
+            // add a drag & drop listener
+            self.c_manager.on("im_session_activated", self, function(conv) {
+                conv.$el.droppable({
+                    drop: function(event, ui) {
+                        conv.add_user(ui.draggable.data("user"));
+                    }
+                });
+            });
+            // add a listener for the update of users status
+            this.c_manager.on("im_new_user_status", this, this.update_users_status);
+
+            // fetch the unread message and the recent activity (e.i. to re-init in case of refreshing page)
+            openerp.session.rpc("/im_chat/init",{}).then(function(notifications) {
+                _.each(notifications, function(notif){
+                    self.c_manager.on_notification(notif);
+                });
+                // start polling
+                openerp.bus.bus.start_polling();
+            });
+            return;
+        },
+        calc_box: function() {
+            var $topbar = window.$('#oe_main_menu_navbar'); // .oe_topbar is replaced with .navbar of bootstrap3
+            var top = $topbar.offset().top + $topbar.height();
+            top = Math.max(top - $(window).scrollTop(), 0);
+            this.$el.css("top", top);
+            this.$el.css("bottom", 0);
+        },
+        input_change: function() {
+            this.set("current_search", this.$(".oe_im_searchbox").val());
+        },
+        search_changed: function(e) {
+            var user_model = new openerp.web.Model("res.users");
+            var self = this;
+            return this.user_search_dm.add(user_model.call("im_search", [this.get("current_search"),
+                        USERS_LIMIT], {context:new openerp.web.CompoundContext()})).then(function(result) {
+                self.$(".oe_im_input").val("");
+                var old_widgets = self.widgets;
+                self.widgets = {};
+                self.users = [];
+                _.each(result, function(user) {
+                    user.image_url = openerp.session.url('/web/binary/image', {model:'res.users', field: 'image_small', id: user.id});
+                    var widget = new openerp.im_chat.UserWidget(self, user);
+                    widget.appendTo(self.$(".oe_im_users"));
+                    widget.on("activate_user", self, self.activate_user);
+                    self.widgets[user.id] = widget;
+                    self.users.push(user);
+                });
+                _.each(old_widgets, function(w) {
+                    w.destroy();
+                });
+            });
+        },
+        switch_display: function() {
+            var fct =  _.bind(function(place) {
+                this.set("right_offset", place + this.$el.outerWidth());
+            }, this);
+            var opt = {
+                step: fct,
+            };
+            if (this.shown) {
+                this.$el.animate({
+                    right: -this.$el.outerWidth(),
+                }, opt);
+            } else {
+                 if (! openerp.bus.bus.activated) {
+                    this.do_warn("Instant Messaging is not activated on this server. Try later.", "");
+                    return;
+                }
+                this.$el.animate({
+                    right: 0,
+                }, opt);
+            }
+            this.shown = ! this.shown;
+        },
+        activate_user: function(user_id) {
+            var self = this;
+            var sessions = new openerp.web.Model("im_chat.session");
+            return sessions.call("session_get", [user_id]).then(function(session) {
+               self.c_manager.activate_session(session, true);
+            });
+        },
+        update_users_status: function(users_list){
+            var self = this;
+            _.each(users_list, function(el) {
+                self.widgets[el.id] && self.widgets[el.id].set("im_status", el.im_status);
+            });
+        }
+    });
+
+    im_chat.ImTopButton = openerp.Widget.extend({
+        template:'im_chat.ImTopButton',
+        events: {
+            "click": "clicked",
+        },
+        clicked: function(ev) {
+            ev.preventDefault();
+            this.trigger("clicked");
+        },
+    });
+
+    if(openerp.web && openerp.web.UserMenu) {
+        openerp.web.UserMenu.include({
+            do_update: function(){
+                var self = this;
+                this.update_promise.then(function() {
+                    var im = new openerp.im_chat.InstantMessaging(self);
+                    openerp.im_chat.single = im;
+                    im.appendTo(openerp.client.$el);
+                    var button = new openerp.im_chat.ImTopButton(this);
+                    button.on("clicked", im, im.switch_display);
+                    button.appendTo(window.$('.oe_systray'));
+                });
+                return this._super.apply(this, arguments);
+            },
+        });
+    }
+
+    return im_chat;
+})();
diff --git a/addons/im_chat/static/src/xml/im_chat.xml b/addons/im_chat/static/src/xml/im_chat.xml
new file mode 100644
index 00000000000..01db7b8277d
--- /dev/null
+++ b/addons/im_chat/static/src/xml/im_chat.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vim:fdl=1:
+-->
+<templates xml:space="preserve">
+<t t-name="im_chat.Conversation">
+    <div class="oe_im_chatview_header">
+        <span class="oe_im_chatview_header_name"></span>
+        <span class="oe_im_chatview_nbr_messages"/>
+        <span class="oe_im_chatview_right">
+            <div class="oe_im_chatview_close">×</div>
+        </span>
+    </div>
+    <div class="oe_im_chatview_content">
+        <div class="oe_im_chatview_status"/>
+        <div class="oe_im_chatview_content_bubbles"></div>
+    </div>
+    <div class="oe_im_chatview_footer">
+        <input class="oe_im_chatview_input" t-att-placeholder="widget.inputPlaceholder" />
+    </div>
+</t>
+<t t-name="im_chat.Conversation_content">
+    <t t-foreach="_.keys(list)" t-as="date">
+        <div class="oe_im_chatview_date_separator">
+            <t t-esc="Date.parse(date).toString(Date.CultureInfo.formatPatterns.longDate)"/>
+        </div>
+        <t t-foreach="list[date]" t-as="bubble">
+            <t t-if="bubble[0].type === 'message'">
+                <t t-call="im_chat.Conversation_message_bubble">
+                    <t t-set="messages" t-value="bubble"/>
+                </t>
+            </t>
+            <t t-if="bubble[0].type === 'meta'">
+                <t t-call="im_chat.Conversation_technical_bubble">
+                    <t t-set="messages" t-value="bubble"/>
+                </t>
+            </t>
+        </t>
+    </t>
+</t>
+<t t-name="im_chat.Conversation_message_bubble">
+    <div class="oe_im_chatview_message_bubble">
+        <div class="oe_im_chatview_clip">
+            <img class="oe_im_chatview_avatar" t-att-src="_.last(messages).from_id[2]"/>
+        </div>
+        <div class="oe_im_chatview_from"><t t-esc="_.last(messages).from_id[1]"/></div>
+        <div class="oe_im_chatview_bubble_list">
+            <t t-foreach="messages" t-as="m">
+                <div class="oe_im_chatview_bubble_item"><t t-raw="m.message"/></div>
+            </t>
+        </div>
+        <div class="oe_im_chatview_time"><t t-esc="Date.parse((_.last(messages).create_date)).toString('HH:mm')"/></div>
+    </div>
+</t>
+<t t-name="im_chat.Conversation_technical_bubble">
+    <div class="oe_im_chatview_technical_bubble">
+        <div class="oe_im_chatview_from"><t t-esc="_.last(messages).from_id[1]"/></div>
+        <div>
+            <t t-foreach="messages" t-as="m">
+                <div><t t-raw="m.message"/></div>
+            </t>
+        </div>
+        <div class="oe_im_chatview_time"><t t-esc="Date.parse((_.last(messages).create_date)).toString('HH:mm')"/></div>
+    </div>
+</t>
+
+<t t-name="im_chat.UserWidget">
+    <div class="oe_im_user ui-draggable">
+        <span class="oe_im_user_clip">
+            <img t-att-src="widget.get('image_url')" class="oe_im_user_avatar"/>
+        </span>
+        <span class="oe_im_user_name"><t t-esc="widget.get('name')"/></span>
+        <img t-att-src="_s +'/im_chat/static/src/img/green.png'" t-att-data-im-user-id="widget.get('id')" class="oe_im_user_online"/>
+    </div>
+</t>
+<t t-name="im_chat.InstantMessaging">
+    <div class="oe_im">
+        <div class="oe_im_frame_header">
+            <span class="oe_e oe_im_search_icon">ô</span>
+            <input class="oe_im_searchbox" t-att-placeholder="_t('Search users...')"/>
+            <span class="oe_e oe_im_search_clear">[</span>
+        </div>
+        <div class="oe_im_users"></div>
+        <div class="oe_im_content"></div>
+    </div>
+</t>
+<t t-name="im_chat.ImTopButton">
+    <li t-att-title='_t("Display Instant Messaging")'>
+        <a href="#">
+              <i id="oe_topbar_imbutton_icon" class="fa fa-comments-o"/>
+        </a>
+    </li>
+</t>
+</templates>
diff --git a/addons/im_chat/views/im_chat.xml b/addons/im_chat/views/im_chat.xml
new file mode 100644
index 00000000000..99423d5939b
--- /dev/null
+++ b/addons/im_chat/views/im_chat.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- vim:fdn=3:
+-->
+<openerp>
+    <data>
+        <template id="assets_backend" name="im_chat assets" inherit_id="web.assets_backend">
+            <xpath expr="." position="inside">
+                <link rel="stylesheet" href="/im_chat/static/src/css/im_common.css"/>
+                <link rel="stylesheet" href="/im_chat/static/src/css/im_chat.css"/>
+                <script type="text/javascript" src="/im_chat/static/src/js/im_chat.js"></script>
+            </xpath>
+        </template>
+    </data>
+</openerp>
diff --git a/addons/im_livechat/__init__.py b/addons/im_livechat/__init__.py
index 2825a75179c..e0f1b9603f9 100644
--- a/addons/im_livechat/__init__.py
+++ b/addons/im_livechat/__init__.py
@@ -1,2 +1 @@
-
 import im_livechat
diff --git a/addons/im_livechat/__openerp__.py b/addons/im_livechat/__openerp__.py
index cf3462ed42a..25eb7f3463f 100644
--- a/addons/im_livechat/__openerp__.py
+++ b/addons/im_livechat/__openerp__.py
@@ -1,5 +1,6 @@
 {
     'name' : 'Live Support',
+    'author': 'OpenERP SA',
     'version': '1.0',
     'summary': 'Live Chat with Visitors/Customers',
     'category': 'Tools',
@@ -17,12 +18,13 @@ chat operators.
     'data': [
         "security/im_livechat_security.xml",
         "security/ir.model.access.csv",
-        "im_livechat_view.xml",
+        "views/im_livechat_view.xml",
+        "views/im_livechat.xml"
     ],
     'demo': [
         "im_livechat_demo.xml",
     ],
-    'depends' : ["im", "mail"],
+    'depends' : ["mail", "im_chat"],
     'installable': True,
     'auto_install': False,
     'application': True,
diff --git a/addons/im_livechat/im_livechat.py b/addons/im_livechat/im_livechat.py
index 4400670cc93..23880a18986 100644
--- a/addons/im_livechat/im_livechat.py
+++ b/addons/im_livechat/im_livechat.py
@@ -19,66 +19,16 @@
 #
 ##############################################################################
 
-import json
 import random
-import jinja2
-
 import openerp
-import openerp.addons.im.im as im
+import openerp.addons.im_chat.im_chat
+
 from openerp.osv import osv, fields
 from openerp import tools
 from openerp import http
 from openerp.http import request
 
-env = jinja2.Environment(
-    loader=jinja2.PackageLoader('openerp.addons.im_livechat', "."),
-    autoescape=False
-)
-env.filters["json"] = json.dumps
-
-class LiveChatController(http.Controller):
-
-    def _auth(self, db):
-        reg = openerp.modules.registry.RegistryManager.get(db)
-        uid = request.uid
-        return reg, uid
-
-    @http.route('/im_livechat/loader', auth="public")
-    def loader(self, **kwargs):
-        p = json.loads(kwargs["p"])
-        db = p["db"]
-        channel = p["channel"]
-        user_name = p.get("user_name", None)
-
-        reg, uid = self._auth(db)
-        with reg.cursor() as cr:
-            info = reg.get('im_livechat.channel').get_info_for_chat_src(cr, uid, channel)
-            info["db"] = db
-            info["channel"] = channel
-            info["userName"] = user_name
-            return request.make_response(env.get_template("loader.js").render(info),
-                 headers=[('Content-Type', "text/javascript")])
-
-    @http.route('/im_livechat/web_page', auth="public")
-    def web_page(self, **kwargs):
-        p = json.loads(kwargs["p"])
-        db = p["db"]
-        channel = p["channel"]
-        reg, uid = self._auth(db)
-        with reg.cursor() as cr:
-            script = reg.get('im_livechat.channel').read(cr, uid, channel, ["script"])["script"]
-            info = reg.get('im_livechat.channel').get_info_for_chat_src(cr, uid, channel)
-            info["script"] = script
-            return request.make_response(env.get_template("web_page.html").render(info),
-                 headers=[('Content-Type', "text/html")])
-
-    @http.route('/im_livechat/available', type='json', auth="public")
-    def available(self, db, channel):
-        reg, uid = self._auth(db)
-        with reg.cursor() as cr:
-            return len(reg.get('im_livechat.channel').get_available_users(cr, uid, channel)) > 0
-
-class im_livechat_channel(osv.osv):
+class im_livechat_channel(osv.Model):
     _name = 'im_livechat.channel'
 
     def _get_default_image(self, cr, uid, context=None):
@@ -92,7 +42,6 @@ class im_livechat_channel(osv.osv):
     def _set_image(self, cr, uid, id, name, value, args, context=None):
         return self.write(cr, uid, [id], {'image': tools.image_resize_image_big(value)}, context=context)
 
-
     def _are_you_inside(self, cr, uid, ids, name, arg, context=None):
         res = {}
         for record in self.browse(cr, uid, ids, context=context):
@@ -103,31 +52,45 @@ class im_livechat_channel(osv.osv):
                     break
         return res
 
-    def _script(self, cr, uid, ids, name, arg, context=None):
+    def _script_external(self, cr, uid, ids, name, arg, context=None):
+        values = {
+            "url": self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url'),
+            "dbname":cr.dbname
+        }
         res = {}
         for record in self.browse(cr, uid, ids, context=context):
-            res[record.id] = env.get_template("include.html").render({
-                "url": self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url'),
-                "parameters": {"db":cr.dbname, "channel":record.id},
-            })
+            values["channel"] = record.id
+            res[record.id] = self.pool['ir.ui.view'].render(cr, uid, 'im_livechat.external_loader', values, context=context)
+        return res
+
+    def _script_internal(self, cr, uid, ids, name, arg, context=None):
+        values = {
+            "url": self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url'),
+            "dbname":cr.dbname
+        }
+        res = {}
+        for record in self.browse(cr, uid, ids, context=context):
+            values["channel"] = record.id
+            res[record.id] = self.pool['ir.ui.view'].render(cr, uid, 'im_livechat.internal_loader', values, context=context)
         return res
 
     def _web_page(self, cr, uid, ids, name, arg, context=None):
         res = {}
         for record in self.browse(cr, uid, ids, context=context):
             res[record.id] = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url') + \
-                "/im_livechat/web_page?p=" + json.dumps({"db":cr.dbname, "channel":record.id})
+                "/im_livechat/support/%s/%i" % (cr.dbname, record.id)
         return res
 
     _columns = {
-        'name': fields.char(string="Channel Name", required=True),
+        'name': fields.char(string="Channel Name", size=200, required=True),
         'user_ids': fields.many2many('res.users', 'im_livechat_channel_im_user', 'channel_id', 'user_id', string="Users"),
         'are_you_inside': fields.function(_are_you_inside, type='boolean', string='Are you inside the matrix?', store=False),
-        'script': fields.function(_script, type='text', string='Script', store=False),
+        'script_internal': fields.function(_script_internal, type='text', string='Script (internal)', store=False),
+        'script_external': fields.function(_script_external, type='text', string='Script (external)', store=False),
         'web_page': fields.function(_web_page, type='url', string='Web Page', store=False, size="200"),
-        'button_text': fields.char(string="Text of the Button"),
-        'input_placeholder': fields.char(string="Chat Input Placeholder"),
-        'default_message': fields.char(string="Welcome Message", help="This is an automated 'welcome' message that your visitor will see when they initiate a new chat session."),
+        'button_text': fields.char(string="Text of the Button", size=200),
+        'input_placeholder': fields.char(string="Chat Input Placeholder", size=200),
+        'default_message': fields.char(string="Welcome Message", size=200, help="This is an automated 'welcome' message that your visitor will see when they initiate a new chat session."),
         # image: all image fields are base64 encoded and PIL-supported
         'image': fields.binary("Photo",
             help="This field holds the image used as photo for the group, limited to 1024x1024px."),
@@ -161,24 +124,25 @@ class im_livechat_channel(osv.osv):
     }
 
     def get_available_users(self, cr, uid, channel_id, context=None):
-        channel = self.browse(cr, openerp.SUPERUSER_ID, channel_id, context=context)
-        im_user_ids = self.pool.get("im.user").search(cr, uid, [["user_id", "in", [user.id for user in channel.user_ids]]], context=context)
+        """ get available user of a given channel """
+        channel = self.browse(cr, uid, channel_id, context=context)
         users = []
-        for iuid in im_user_ids:
-            imuser = self.pool.get("im.user").browse(cr, uid, iuid, context=context)
-            if imuser.im_status:
-                users.append(imuser)
+        for user_id in channel.user_ids:
+            if (user_id.im_status == 'online'):
+                users.append(user_id)
         return users
 
-    def get_session(self, cr, uid, channel_id, uuid, context=None):
-        self.pool.get("im.user").get_my_id(cr, uid, uuid, context=context)
-        users = self.get_available_users(cr, openerp.SUPERUSER_ID, channel_id, context=context)
+    def get_channel_session(self, cr, uid, channel_id, anonymous_name, context=None):
+        """ return a session given a channel : create on with a registered user, or return false otherwise """
+        # get the avalable user of the channel
+        users = self.get_available_users(cr, uid, channel_id, context=context)
         if len(users) == 0:
             return False
         user_id = random.choice(users).id
-        session = self.pool.get("im.session").session_get(cr, uid, [user_id], uuid, context=context)
-        self.pool.get("im.session").write(cr, openerp.SUPERUSER_ID, session.get("id"), {'channel_id': channel_id}, context=context)
-        return session.get("id")
+        # create the session, and add the link with the given channel
+        Session = self.pool["im_chat.session"]
+        newid = Session.create(cr, uid, {'user_ids': [(4, user_id)], 'channel_id': channel_id, 'anonymous_name' : anonymous_name}, context=context)
+        return Session.session_info(cr, uid, [newid], context=context)
 
     def test_channel(self, cr, uid, channel, context=None):
         if not channel:
@@ -189,7 +153,7 @@ class im_livechat_channel(osv.osv):
         }
 
     def get_info_for_chat_src(self, cr, uid, channel, context=None):
-        url = self.pool.get('ir.config_parameter').get_param(cr, openerp.SUPERUSER_ID, 'web.base.url')
+        url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
         chan = self.browse(cr, uid, channel, context=context)
         return {
             "url": url,
@@ -207,9 +171,69 @@ class im_livechat_channel(osv.osv):
         self.write(cr, uid, ids, {'user_ids': [(3, uid)]})
         return True
 
-class im_session(osv.osv):
-    _inherit = 'im.session'
+class im_chat_session(osv.Model):
+    _inherit = 'im_chat.session'
+
+    def _get_fullname(self, cr, uid, ids, fields, arg, context=None):
+        """ built the complete name of the session """
+        result = {}
+        sessions = self.browse(cr, uid, ids, context=context)
+        for session in sessions:
+            names = []
+            for user in session.user_ids:
+                names.append(user.name)
+            if session.anonymous_name:
+                names.append(session.anonymous_name)
+            result[session.id] = ', '.join(names)
+        return result
 
     _columns = {
+        'anonymous_name' : fields.char('Anonymous Name'),
         'channel_id': fields.many2one("im_livechat.channel", "Channel"),
+        'fullname' : fields.function(_get_fullname, type="char", string="Complete name"),
     }
+
+    def users_infos(self, cr, uid, ids, context=None):
+        """ add the anonymous user in the user of the session """
+        for session in self.browse(cr, uid, ids, context=context):
+            users_infos = super(im_chat_session, self).users_infos(cr, uid, ids, context=context)
+            if session.anonymous_name:
+                users_infos.append({'id' : False, 'name' : session.anonymous_name, 'im_status' : 'online'})
+            return users_infos
+
+
+class LiveChatController(http.Controller):
+
+    @http.route('/im_livechat/support/<string:dbname>/<int:channel_id>', type='http', auth='none')
+    def support_page(self, dbname, channel_id, **kwargs):
+        registry, cr, uid, context = openerp.modules.registry.RegistryManager.get(dbname), request.cr, openerp.SUPERUSER_ID, request.context
+        info = registry.get('im_livechat.channel').get_info_for_chat_src(cr, uid, channel_id)
+        info["dbname"] = dbname
+        info["channel"] = channel_id
+        info["channel_name"] = registry.get('im_livechat.channel').read(cr, uid, channel_id, ['name'], context=context)["name"]
+        return request.render('im_livechat.support_page', info)
+
+    @http.route('/im_livechat/loader/<string:dbname>/<int:channel_id>', type='http', auth='none')
+    def loader(self, dbname, channel_id, **kwargs):
+        registry, cr, uid, context = openerp.modules.registry.RegistryManager.get(dbname), request.cr, openerp.SUPERUSER_ID, request.context
+        info = registry.get('im_livechat.channel').get_info_for_chat_src(cr, uid, channel_id)
+        info["dbname"] = dbname
+        info["channel"] = channel_id
+        info["username"] = kwargs.get("username", "Visitor")
+        return request.render('im_livechat.loader', info)
+
+    @http.route('/im_livechat/get_session', type="json", auth="none")
+    def get_session(self, channel_id, anonymous_name):
+        cr, uid, context, db = request.cr, request.uid or openerp.SUPERUSER_ID, request.context, request.db
+        reg = openerp.modules.registry.RegistryManager.get(db)
+        # if geoip, add the country name to the anonymous name
+        if hasattr(request, 'geoip'):
+            anonymous_name = anonymous_name + " ("+request.geoip.get('country_name', "")+")"
+        return reg.get("im_livechat.channel").get_channel_session(cr, uid, channel_id, anonymous_name, context=context)
+
+    @http.route('/im_livechat/available', type='json', auth="none")
+    def available(self, db, channel):
+        cr, uid, context, db = request.cr, request.uid or openerp.SUPERUSER_ID, request.context, request.db
+        reg = openerp.modules.registry.RegistryManager.get(db)
+        with reg.cursor() as cr:
+            return len(reg.get('im_livechat.channel').get_available_users(cr, uid, channel)) > 0
diff --git a/addons/im_livechat/include.html b/addons/im_livechat/include.html
deleted file mode 100644
index 210bad6984c..00000000000
--- a/addons/im_livechat/include.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<script type="text/javascript" src="{{url}}/im_livechat/static/ext/static/lib/requirejs/require.js"></script>
-<script type="text/javascript" src='{{url}}/im_livechat/loader?p={{parameters | json | escape}}'></script>
\ No newline at end of file
diff --git a/addons/im_livechat/loader.js b/addons/im_livechat/loader.js
deleted file mode 100644
index 9257f996b96..00000000000
--- a/addons/im_livechat/loader.js
+++ /dev/null
@@ -1,47 +0,0 @@
-
-(function() {
-
-var tmpQWeb2 = window.QWeb2;
-
-require.config({
-    context: "oelivesupport",
-    baseUrl: {{url | json}},
-    paths: {
-        jquery: "im_livechat/static/ext/static/lib/jquery/jquery",
-        underscore: "im_livechat/static/ext/static/lib/underscore/underscore",
-        qweb2: "im_livechat/static/ext/static/lib/qweb/qweb2",
-        openerp: "web/static/src/js/openerpframework",
-        "jquery.achtung": "im_livechat/static/ext/static/lib/jquery-achtung/src/ui.achtung",
-        livesupport: "im_livechat/static/ext/static/js/livesupport",
-        im_common: "im/static/src/js/im_common"
-    },
-    shim: {
-        underscore: {
-            init: function() {
-                return _.noConflict();
-            },
-        },
-        qweb2: {
-            init: function() {
-                var QWeb2 = window.QWeb2;
-                window.QWeb2 = tmpQWeb2;
-                return QWeb2;
-            },
-        },
-        "jquery.achtung": {
-            deps: ['jquery'],
-        },
-    },
-})(["livesupport", "jquery"], function(livesupport, jQuery) {
-    jQuery.noConflict();
-    console.log("loaded live support");
-    livesupport.main({{url | json}}, {{db | json}}, "public", "public", {{channel | json}}, {
-        buttonText: {{buttonText | json}},
-        inputPlaceholder: {{inputPlaceholder | json}},
-        defaultMessage: {{(defaultMessage or None) | json}},
-        auto: window.oe_im_livechat_auto || false,
-        userName: {{userName | json}} || undefined,
-    });
-});
-
-})();
diff --git a/addons/im_livechat/security/im_livechat_security.xml b/addons/im_livechat/security/im_livechat_security.xml
index b93798f96a9..d4cd790e058 100644
--- a/addons/im_livechat/security/im_livechat_security.xml
+++ b/addons/im_livechat/security/im_livechat_security.xml
@@ -23,9 +23,9 @@
 
         <record id="message_rule_1" model="ir.rule">
             <field name="name">Live Support Managers can read messages from live support</field>
-            <field name="model_id" ref="im.model_im_message"/>
+            <field name="model_id" ref="im_chat.model_im_chat_message"/>
             <field name="groups" eval="[(6,0,[ref('im_livechat.group_im_livechat_manager')])]"/>
-            <field name="domain_force">[('session_id.channel_id', '!=', None)]</field>
+            <field name="domain_force">[('to_id.channel_id', '!=', None)]</field>
             <field name="perm_unlink" eval="0"/>
             <field name="perm_write" eval="0"/>
             <field name="perm_read" eval="1"/>
diff --git a/addons/im_livechat/security/ir.model.access.csv b/addons/im_livechat/security/ir.model.access.csv
index d73e0931647..0b8be98fd90 100644
--- a/addons/im_livechat/security/ir.model.access.csv
+++ b/addons/im_livechat/security/ir.model.access.csv
@@ -2,5 +2,3 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_ls_chann1,im_livechat.channel,model_im_livechat_channel,,1,0,0,0
 access_ls_chann2,im_livechat.channel,model_im_livechat_channel,group_im_livechat,1,1,1,0
 access_ls_chann3,im_livechat.channel,model_im_livechat_channel,group_im_livechat_manager,1,1,1,1
-access_im_user_portal,im_livechat.im.user.portal,im.model_im_user,base.group_portal,1,0,0,0
-access_im_user,im_livechat.im.user,im.model_im_user,base.group_public,1,0,0,0
\ No newline at end of file
diff --git a/addons/im_livechat/static/ext/.bowerrc b/addons/im_livechat/static/ext/.bowerrc
deleted file mode 100644
index 187c8f0abc4..00000000000
--- a/addons/im_livechat/static/ext/.bowerrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "directory": "static/lib/"
-}
diff --git a/addons/im_livechat/static/ext/Gruntfile.js b/addons/im_livechat/static/ext/Gruntfile.js
deleted file mode 100644
index 3d4a7f5aa50..00000000000
--- a/addons/im_livechat/static/ext/Gruntfile.js
+++ /dev/null
@@ -1,20 +0,0 @@
-module.exports = function(grunt) {
-
-    grunt.initConfig({
-        jshint: {
-            src: ['static/js/*.js'],
-            options: {
-                sub: true, //[] instead of .
-                evil: true, //eval
-                laxbreak: true, //unsafe line breaks
-            },
-        },
-    });
-
-    grunt.loadNpmTasks('grunt-contrib-jshint');
-
-    grunt.registerTask('test', []);
-
-    grunt.registerTask('default', ['jshint']);
-
-};
\ No newline at end of file
diff --git a/addons/im_livechat/static/ext/Makefile b/addons/im_livechat/static/ext/Makefile
deleted file mode 100644
index b73ca4f2b89..00000000000
--- a/addons/im_livechat/static/ext/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-
-static/js/livesupport_templates.js: static/js/livesupport_templates.html
-	python static/js/to_jsonp.py static/js/livesupport_templates.html oe_livesupport_templates_callback > static/js/livesupport_templates.js
\ No newline at end of file
diff --git a/addons/im_livechat/static/ext/bower.json b/addons/im_livechat/static/ext/bower.json
deleted file mode 100644
index f10d0de7b9c..00000000000
--- a/addons/im_livechat/static/ext/bower.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "name": "im_livechat",
-  "version": "0.0.0",
-  "ignore": [
-    "**/.*",
-    "node_modules",
-    "bower_components",
-    "test",
-    "tests"
-  ],
-  "dependencies": {
-    "jquery": "1.8.3",
-    "underscore": "1.3.1",
-    "qweb": "git@github.com:OpenERP/qweb.git#~1.0.0",
-    "jquery-achtung": "git://github.com/joshvarner/jquery-achtung.git",
-    "requirejs": "~2.1.8"
-  }
-}
diff --git a/addons/im_livechat/static/ext/package.json b/addons/im_livechat/static/ext/package.json
deleted file mode 100644
index 3ce6500a077..00000000000
--- a/addons/im_livechat/static/ext/package.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "devDependencies": {
-    "grunt": "*",
-    "grunt-contrib-jshint": "*"
-  }
-}
diff --git a/addons/im_livechat/static/ext/static/js/livesupport.js b/addons/im_livechat/static/ext/static/js/livesupport.js
deleted file mode 100644
index 844cddc8908..00000000000
--- a/addons/im_livechat/static/ext/static/js/livesupport.js
+++ /dev/null
@@ -1,125 +0,0 @@
-
-/*
-    This file must compile in EcmaScript 3 and work in IE7.
-*/
-
-define(["openerp", "im_common", "underscore", "require", "jquery",
-        "jquery.achtung"], function(openerp, im_common, _, require, $) {
-    /* jshint es3: true */
-    "use strict";
-
-    var _t = openerp._t;
-    
-    var livesupport = {};
-
-    livesupport.main = function(server_url, db, login, password, channel, options) {
-        options = options || {};
-        _.defaults(options, {
-            buttonText: _t("Chat with one of our collaborators"),
-            inputPlaceholder: _t("How may I help you?"),
-            defaultMessage: null,
-            auto: false,
-            userName: _t("Anonymous"),
-            anonymous_mode: true
-        });
-
-        im_common.notification = notification;
-
-        console.log("starting live support customer app");
-        im_common.connection = new openerp.Session(null, server_url, { override_session: true });
-        return im_common.connection.session_authenticate(db, login, password).then(function() {
-            var defs = [];
-            defs.push(add_css("/im/static/src/css/im_common.css"));
-            defs.push(add_css("/im_livechat/static/ext/static/lib/jquery-achtung/src/ui.achtung.css"));
-            defs.push(im_common.connection.rpc('/web/proxy/load', {path: '/im_livechat/static/ext/static/js/livechat.xml'}).then(function(xml) {
-                openerp.qweb.add_template(xml);
-            }));
-            defs.push(im_common.connection.rpc('/web/proxy/load', {path: '/im/static/src/xml/im_common.xml'}).then(function(xml) {
-                openerp.qweb.add_template(xml);
-            }));
-            return $.when.apply($, defs);
-        }).then(function() {
-            return im_common.connection.rpc("/im_livechat/available", {db: db, channel: channel}).then(function(activated) {
-                if (! activated & ! options.auto)
-                    return;
-                var button = new im_common.ChatButton(null, channel, options);
-                button.appendTo($("body"));
-                if (options.auto)
-                    button.click();
-            });
-        });
-    };
-
-    var add_css = function(relative_file_name) {
-        var css_def = $.Deferred();
-        $('<link rel="stylesheet" href="' + im_common.connection.url(relative_file_name) + '"></link>')
-                .appendTo($("head")).ready(function() {
-            css_def.resolve();
-        });
-        return css_def.promise();
-    };
-
-    var notification = function(message) {
-        $.achtung({message: message, timeout: 0, showEffects: false, hideEffects: false});
-    };
-
-    im_common.ChatButton = openerp.Widget.extend({
-        className: "openerp_style oe_chat_button",
-        events: {
-            "click": "click"
-        },
-        init: function(parent, channel, options) {
-            this._super(parent);
-            this.channel = channel;
-            this.options = options;
-            this.text = options.buttonText;
-        },
-        start: function() {
-            this.$().append(openerp.qweb.render("chatButton", {widget: this}));
-        },
-        click: function() {
-            if (! this.manager) {
-                this.manager = new im_common.ConversationManager(this, this.options);
-                this.manager.set("bottom_offset", 37);
-                this.activated_def = this.manager.start_polling();
-            }
-            var def = $.Deferred();
-            $.when(this.activated_def).then(function() {
-                def.resolve();
-            }, function() {
-                def.reject();
-            });
-            setTimeout(function() {
-                def.reject();
-            }, 5000);
-            return def.then(_.bind(this.chat, this), function() {
-                im_common.notification(_t("It seems the connection to the server is encountering problems, please try again later."));
-            });
-        },
-        chat: function() {
-            var self = this;
-            if (this.manager.conversations.length > 0)
-                return;
-            im_common.connection.model("im_livechat.channel").call("get_session", [this.channel, this.manager.me.get("uuid")]).then(function(session_id) {
-                if (! session_id) {
-                    im_common.notification(_t("None of our collaborators seems to be available, please try again later."));
-                    return;
-                }
-                self.manager.activate_session(session_id, true).then(function(conv) {
-                    if (self.options.defaultMessage) {
-                        setTimeout(function(){
-                                conv.received_message({
-                                    message: self.options.defaultMessage, 
-                                    date: openerp.datetime_to_str(new Date()),
-                                    from_id: [conv.get("users")[0].get("id"), "Unknown"]
-                                });
-                            },
-                        2500);
-                    }
-                });
-            });
-        }
-    });
-
-    return livesupport;
-});
diff --git a/addons/im_livechat/static/ext/static/lib/jquery-achtung/src/ui.achtung.css b/addons/im_livechat/static/ext/static/lib/jquery-achtung/src/ui.achtung.css
deleted file mode 100644
index 27284c0e2ab..00000000000
--- a/addons/im_livechat/static/ext/static/lib/jquery-achtung/src/ui.achtung.css
+++ /dev/null
@@ -1,346 +0,0 @@
-/**
- * achtung %%VERSION%%
- *
- * Growl-like notifications for jQuery
- *
- * Copyright (c) 2009 Josh Varner <josh@voxwerk.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * Portions of this file are from the jQuery UI CSS framework.
- *
- * @license http://www.opensource.org/licenses/mit-license.php
- * @author Josh Varner <josh@voxwerk.com>
- */
-
-#achtung-overlay {
-    overflow: hidden;
-    position: fixed;
-    top: 0;
-    right: 0;
-    z-index: 50;
-}
-
-/* IE 6 doesn't support position: fixed */
-* html #achtung-overlay {
-    position: absolute;
-}
-
-/* IE6 includes padding in width */
-* html .achtung {
-    width: 260px;
-}
-
-#achtung-wrapper {
-    overflow: hidden;
-    padding: 25px 30px 10px 10px;
-}
-
-.achtung {
-    display: none;
-    float: right;
-    clear: right;
-    margin-bottom: 8px;
-    padding: 15px;
-    background: #000;
-    background: rgba(0,0,0,.95);
-    color: white;
-    width: 230px;
-    font-weight: normal;
-    font-style: italic;
-    font-size: 1.05em;
-    position: relative;
-    overflow: hidden;
-    text-shadow: -1px -1px 0 rgba(0,0,0,.3);
-    box-shadow: rgba(0,0,0,.3) 0 1px 4px;
-    -moz-box-shadow: rgba(0,0,0,.3) 0 1px 4px;
-    -webkit-box-shadow: rgba(0,0,0,.3) 0 1px 4px;
-    border-radius: 4px;
-    -moz-border-radius: 4px;
-    -webkit-border-radius: 4px;
-    opacity: 1.0;
-    filter:Alpha(Opacity=100);
-}
-
-.achtung-default {
-    background: #000;
-    background: -moz-linear-gradient(top, rgba(150,150,150,.9), rgba(120,120,120,.9) 70%);
-    background: -webkit-gradient(linear, left top, left bottom,
-        from(rgba(150,150,150,.9)),
-        color-stop(70%, rgba(120,120,120,.9)),
-        to(rgba(120,120,120,.9))
-    ) no-repeat;
-    color: white;
-}
-
-.achtung .achtung-message-icon {
-    float: left;
-    margin: 0 .8em 0 -.5em;
-    zoom: 1;
-}
-
-.achtung .ui-icon.achtung-close-button {
-    overflow: hidden;
-    float: right;
-    position: relative;
-    top: -8px;
-    right: -8px;
-    cursor: pointer;
-    background-image: url('images/ui-icons_cccccc_256x240.png');
-}
-
-.achtung .ui-icon.achtung-close-button:hover {
-    background-image: url('images/ui-icons_ffffff_256x240.png');
-}
-
-/* Slightly darker for these colors (readability) */
-.achtungSuccess, .achtungFail, .achtungWait {
-    /* Note that if using show/hide animations, IE will lose
-       this setting */
-   opacity: 1.0;
-   filter:Alpha(Opacity=100);
-}
-
-.achtungSuccess {
-    background: #6a5;
-    background: #6a5 -moz-linear-gradient(top, #8c7, #6a5 70%);
-    background: #6a5 -webkit-gradient(linear, left top, left bottom,
-        from(#8c7),
-        color-stop(70%, #6a5),
-        to(#6a5)
-    ) no-repeat;
-}
-.achtungFail {
-    background: #a55;
-    background: #a55 -moz-linear-gradient(top, #c66, #a44 70%);
-    background: #789 -webkit-gradient(linear, left top, left bottom,
-        from(#c66),
-        color-stop(70%, #a44),
-        to(#a44)
-    ) no-repeat;
-}
-.achtungWait {
-    background: #789;
-    background: #789 -moz-linear-gradient(top, #89a, #678 70%);
-    background: #789 -webkit-gradient(linear, left top, left bottom,
-        from(#89a),
-        color-stop(70%, #678),
-        to(#678)
-    ) no-repeat;
-}
-
-.achtungSuccess .ui-icon.achtung-close-button,
-.achtungFail .ui-icon.achtung-close-button {
-    background-image: url('images/ui-icons_444444_256x240.png');
-}
-
-.achtungSuccess .ui-icon.achtung-close-button:hover,
-.achtungFail .ui-icon.achtung-close-button:hover {
-    background-image: url('images/ui-icons_ffffff_256x240.png');
-}
-
-.achtung .wait-icon {
-    background-image: url('images/wait.gif');
-}
-
-.achtung .achtung-message {
-    display: inline;
-}
-
-/**
- * This section from jQuery UI CSS framework
- * Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
- * Can (and should) be removed if you are already loading the jQuery UI CSS
- * to reduce payload size.
- */
-.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
-.ui-icon { width: 16px; height: 16px; background-image: url('images/ui-icons_222222_256x240.png'); }
-.ui-icon-carat-1-n { background-position: 0 0; }
-.ui-icon-carat-1-ne { background-position: -16px 0; }
-.ui-icon-carat-1-e { background-position: -32px 0; }
-.ui-icon-carat-1-se { background-position: -48px 0; }
-.ui-icon-carat-1-s { background-position: -64px 0; }
-.ui-icon-carat-1-sw { background-position: -80px 0; }
-.ui-icon-carat-1-w { background-position: -96px 0; }
-.ui-icon-carat-1-nw { background-position: -112px 0; }
-.ui-icon-carat-2-n-s { background-position: -128px 0; }
-.ui-icon-carat-2-e-w { background-position: -144px 0; }
-.ui-icon-triangle-1-n { background-position: 0 -16px; }
-.ui-icon-triangle-1-ne { background-position: -16px -16px; }
-.ui-icon-triangle-1-e { background-position: -32px -16px; }
-.ui-icon-triangle-1-se { background-position: -48px -16px; }
-.ui-icon-triangle-1-s { background-position: -64px -16px; }
-.ui-icon-triangle-1-sw { background-position: -80px -16px; }
-.ui-icon-triangle-1-w { background-position: -96px -16px; }
-.ui-icon-triangle-1-nw { background-position: -112px -16px; }
-.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
-.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
-.ui-icon-arrow-1-n { background-position: 0 -32px; }
-.ui-icon-arrow-1-ne { background-position: -16px -32px; }
-.ui-icon-arrow-1-e { background-position: -32px -32px; }
-.ui-icon-arrow-1-se { background-position: -48px -32px; }
-.ui-icon-arrow-1-s { background-position: -64px -32px; }
-.ui-icon-arrow-1-sw { background-position: -80px -32px; }
-.ui-icon-arrow-1-w { background-position: -96px -32px; }
-.ui-icon-arrow-1-nw { background-position: -112px -32px; }
-.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
-.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
-.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
-.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
-.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
-.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
-.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
-.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
-.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
-.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
-.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
-.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
-.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
-.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
-.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
-.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
-.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
-.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
-.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
-.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
-.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
-.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
-.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
-.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
-.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
-.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
-.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
-.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
-.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
-.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
-.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
-.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
-.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
-.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
-.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
-.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
-.ui-icon-arrow-4 { background-position: 0 -80px; }
-.ui-icon-arrow-4-diag { background-position: -16px -80px; }
-.ui-icon-extlink { background-position: -32px -80px; }
-.ui-icon-newwin { background-position: -48px -80px; }
-.ui-icon-refresh { background-position: -64px -80px; }
-.ui-icon-shuffle { background-position: -80px -80px; }
-.ui-icon-transfer-e-w { background-position: -96px -80px; }
-.ui-icon-transferthick-e-w { background-position: -112px -80px; }
-.ui-icon-folder-collapsed { background-position: 0 -96px; }
-.ui-icon-folder-open { background-position: -16px -96px; }
-.ui-icon-document { background-position: -32px -96px; }
-.ui-icon-document-b { background-position: -48px -96px; }
-.ui-icon-note { background-position: -64px -96px; }
-.ui-icon-mail-closed { background-position: -80px -96px; }
-.ui-icon-mail-open { background-position: -96px -96px; }
-.ui-icon-suitcase { background-position: -112px -96px; }
-.ui-icon-comment { background-position: -128px -96px; }
-.ui-icon-person { background-position: -144px -96px; }
-.ui-icon-print { background-position: -160px -96px; }
-.ui-icon-trash { background-position: -176px -96px; }
-.ui-icon-locked { background-position: -192px -96px; }
-.ui-icon-unlocked { background-position: -208px -96px; }
-.ui-icon-bookmark { background-position: -224px -96px; }
-.ui-icon-tag { background-position: -240px -96px; }
-.ui-icon-home { background-position: 0 -112px; }
-.ui-icon-flag { background-position: -16px -112px; }
-.ui-icon-calendar { background-position: -32px -112px; }
-.ui-icon-cart { background-position: -48px -112px; }
-.ui-icon-pencil { background-position: -64px -112px; }
-.ui-icon-clock { background-position: -80px -112px; }
-.ui-icon-disk { background-position: -96px -112px; }
-.ui-icon-calculator { background-position: -112px -112px; }
-.ui-icon-zoomin { background-position: -128px -112px; }
-.ui-icon-zoomout { background-position: -144px -112px; }
-.ui-icon-search { background-position: -160px -112px; }
-.ui-icon-wrench { background-position: -176px -112px; }
-.ui-icon-gear { background-position: -192px -112px; }
-.ui-icon-heart { background-position: -208px -112px; }
-.ui-icon-star { background-position: -224px -112px; }
-.ui-icon-link { background-position: -240px -112px; }
-.ui-icon-cancel { background-position: 0 -128px; }
-.ui-icon-plus { background-position: -16px -128px; }
-.ui-icon-plusthick { background-position: -32px -128px; }
-.ui-icon-minus { background-position: -48px -128px; }
-.ui-icon-minusthick { background-position: -64px -128px; }
-.ui-icon-close { background-position: -80px -128px; }
-.ui-icon-closethick { background-position: -96px -128px; }
-.ui-icon-key { background-position: -112px -128px; }
-.ui-icon-lightbulb { background-position: -128px -128px; }
-.ui-icon-scissors { background-position: -144px -128px; }
-.ui-icon-clipboard { background-position: -160px -128px; }
-.ui-icon-copy { background-position: -176px -128px; }
-.ui-icon-contact { background-position: -192px -128px; }
-.ui-icon-image { background-position: -208px -128px; }
-.ui-icon-video { background-position: -224px -128px; }
-.ui-icon-script { background-position: -240px -128px; }
-.ui-icon-alert { background-position: 0 -144px; }
-.ui-icon-info { background-position: -16px -144px; }
-.ui-icon-notice { background-position: -32px -144px; }
-.ui-icon-help { background-position: -48px -144px; }
-.ui-icon-check { background-position: -64px -144px; }
-.ui-icon-bullet { background-position: -80px -144px; }
-.ui-icon-radio-off { background-position: -96px -144px; }
-.ui-icon-radio-on { background-position: -112px -144px; }
-.ui-icon-pin-w { background-position: -128px -144px; }
-.ui-icon-pin-s { background-position: -144px -144px; }
-.ui-icon-play { background-position: 0 -160px; }
-.ui-icon-pause { background-position: -16px -160px; }
-.ui-icon-seek-next { background-position: -32px -160px; }
-.ui-icon-seek-prev { background-position: -48px -160px; }
-.ui-icon-seek-end { background-position: -64px -160px; }
-.ui-icon-seek-first { background-position: -80px -160px; }
-.ui-icon-stop { background-position: -96px -160px; }
-.ui-icon-eject { background-position: -112px -160px; }
-.ui-icon-volume-off { background-position: -128px -160px; }
-.ui-icon-volume-on { background-position: -144px -160px; }
-.ui-icon-power { background-position: 0 -176px; }
-.ui-icon-signal-diag { background-position: -16px -176px; }
-.ui-icon-signal { background-position: -32px -176px; }
-.ui-icon-battery-0 { background-position: -48px -176px; }
-.ui-icon-battery-1 { background-position: -64px -176px; }
-.ui-icon-battery-2 { background-position: -80px -176px; }
-.ui-icon-battery-3 { background-position: -96px -176px; }
-.ui-icon-circle-plus { background-position: 0 -192px; }
-.ui-icon-circle-minus { background-position: -16px -192px; }
-.ui-icon-circle-close { background-position: -32px -192px; }
-.ui-icon-circle-triangle-e { background-position: -48px -192px; }
-.ui-icon-circle-triangle-s { background-position: -64px -192px; }
-.ui-icon-circle-triangle-w { background-position: -80px -192px; }
-.ui-icon-circle-triangle-n { background-position: -96px -192px; }
-.ui-icon-circle-arrow-e { background-position: -112px -192px; }
-.ui-icon-circle-arrow-s { background-position: -128px -192px; }
-.ui-icon-circle-arrow-w { background-position: -144px -192px; }
-.ui-icon-circle-arrow-n { background-position: -160px -192px; }
-.ui-icon-circle-zoomin { background-position: -176px -192px; }
-.ui-icon-circle-zoomout { background-position: -192px -192px; }
-.ui-icon-circle-check { background-position: -208px -192px; }
-.ui-icon-circlesmall-plus { background-position: 0 -208px; }
-.ui-icon-circlesmall-minus { background-position: -16px -208px; }
-.ui-icon-circlesmall-close { background-position: -32px -208px; }
-.ui-icon-squaresmall-plus { background-position: -48px -208px; }
-.ui-icon-squaresmall-minus { background-position: -64px -208px; }
-.ui-icon-squaresmall-close { background-position: -80px -208px; }
-.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
-.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
-.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
-.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
-.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
-.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
diff --git a/addons/im_livechat/static/ext/static/lib/jquery-achtung/src/ui.achtung.js b/addons/im_livechat/static/ext/static/lib/jquery-achtung/src/ui.achtung.js
deleted file mode 100644
index e9d7cd0ef99..00000000000
--- a/addons/im_livechat/static/ext/static/lib/jquery-achtung/src/ui.achtung.js
+++ /dev/null
@@ -1,282 +0,0 @@
-/**
- * achtung %%VERSION%%
- *
- * Growl-like notifications for jQuery
- *
- * Copyright (c) 2009 Josh Varner <josh@voxwerk.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @license http://www.opensource.org/licenses/mit-license.php
- * @author Josh Varner <josh@voxwerk.com>
- */
-
-/*jslint browser:true, white:false, onevar:false, nomen:false, bitwise:false, plusplus:false, immed: false */
-/*globals window, jQuery */
-(function ($) {
-
-var widgetName = 'achtung';
-
-/**
- * This is based on the jQuery UI $.widget code. I would have just made this
- * a $.widget but I didn't want the jQuery UI dependency.
- */
-$.fn.achtung = function (options) {
-	var isMethodCall = (typeof options === 'string'),
-		args = Array.prototype.slice.call(arguments, isMethodCall ? 1 : 0);
-
-	// handle initialization and non-getter methods
-	return this.each(function () {
-		// prevent calls to internal methods
-		if (isMethodCall && options.substring(0, 1) === '_') {
-			return;
-		}
-
-		var instance = $.data(this, widgetName);
-
-		// constructor
-		if (!instance && !isMethodCall) {
-			$.data(this, widgetName, new $.achtung(this))._init(args);
-		}
-
-		if (!!instance && isMethodCall && $.isFunction(instance[options])) {
-			instance[options].apply(instance, args);
-		}
-	});
-};
-
-$.achtung = function (element) {
-    if (!element || !element.nodeType) {
-        var el = $('<div>');
-        return el.achtung.apply(el, arguments);
-    }
-
-    this.container = $(element);
-};
-
-
-/**
- * Static members
- **/
-$.extend($.achtung, {
-    version: '%%VERSION%%',
-    overlay: false,
-    wrapper: false,
-    defaults: {
-        timeout: 10,
-        disableClose: false,
-        icon: false,
-        className: 'achtung-default',
-        crossFadeMessage: 500, // 0 to disable
-        animateClassSwitch: 0, // 0 to disable (doesn't work with gradient backgrounds)
-        showEffects: {'opacity':'toggle'}, // ,'height':'toggle'},
-        hideEffects: {'opacity':'toggle'}, // ,'height':'toggle'},
-        showEffectDuration: 300,
-        hideEffectDuration: 500
-    }
-});
-
-/**
- * Non-static members
- **/
-$.extend($.achtung.prototype, {
-    container: false,
-    icon: false,
-    message: false,
-    closeTimer: false,
-    options: {},
-
-    _init: function (args) {
-        var o, self = this;
-
-        o = this.options = $.extend.apply($, [{}, $.achtung.defaults].concat(args));
-
-        if ((o.animateClassSwitch > 0) && !('switchClass' in $.fn)) {
-            o.animateClassSwitch = this.options.animateClassSwitch = 0;
-        }
-
-        if (!o.disableClose) {
-            $('<span class="achtung-close-button ui-icon ui-icon-close" />')
-                .prependTo(this.container)
-                .bind({
-                    click: function () { self.close(); }
-                });
-        }
-
-        this.changeIcon(o.icon, true);
-
-        if (o.message) {
-            this.message = $('<span>', {
-                'class': 'achtung-message',
-                html: o.message
-            }).appendTo(this.container);
-        }
-
-        if ('className' in o) {
-            this.container.addClass(o.className);
-        }
-
-        if ('css' in o) {
-            this.container.css(o.css);
-        }
-
-        if (!$.achtung.overlay) {
-            $.achtung.overlay = $('<div id="achtung-overlay"><div id="achtung-wrapper"></div></div>');
-            $.achtung.overlay.appendTo(document.body);
-            $.achtung.wrapper = $('#achtung-wrapper');
-        }
-
-        this.container.addClass('achtung').hide().appendTo($.achtung.wrapper);
-
-        if (o.showEffects) {
-            this.container.animate(o.showEffects, o.showEffectDuration);
-        } else {
-            this.container.show();
-        }
-
-        this.timeout(o.timeout);
-    },
-
-    timeout: function (timeout) {
-        var self = this;
-
-        if (this.closeTimer) {
-            clearTimeout(this.closeTimer);
-        }
-
-        if (timeout > 0) {
-            this.closeTimer = setTimeout(function () { self.close(); }, timeout * 1000);
-            this.options.timeout = timeout;
-        } else if (timeout < 0) {
-            this.close();
-        }
-    },
-
-    /**
-     * Change the CSS class associated with this message.
-     *
-     * @param newClass string Name of new class to associate
-     */
-    changeClass: function (newClass) {
-        var oldClass = '' + this.options.className,
-            self = this;
-
-        if (oldClass === newClass) {
-            return;
-        }
-
-        this.container.queue(function (next) {
-            if (self.options.animateClassSwitch > 0) {
-                $(this).switchClass(oldClass, newClass, self.options.animateClassSwitch);
-            } else {
-                $(this).removeClass(oldClass).addClass(newClass);
-            }
-            next();
-        });
-
-        this.options.className = newClass;
-    },
-
-    changeIcon: function (newIcon, force) {
-        if (!force && this.options.icon === newIcon) {
-            return;
-        }
-
-        if (!!this.icon) {
-            if (newIcon) {
-                this.icon.removeClass(this.options.icon).addClass(newIcon);
-            } else {
-                this.icon.remove();
-                this.icon = false;
-            }
-        } else if (newIcon) {
-            this.icon = $('<span class="achtung-message-icon ui-icon ' + newIcon + '" />');
-            this.container.prepend(this.icon);
-        }
-
-        this.options.icon = newIcon;
-    },
-
-    changeMessage: function (newMessage) {
-        if (this.options.crossFadeMessage > 0) {
-            this.message.clone()
-                .css('position', 'absolute')
-                .insertBefore(this.message)
-                .fadeOut(this.options.crossFadeMessage, function () { $(this).remove(); });
-
-            this.message.hide().html(newMessage).fadeIn(this.options.crossFadeMessage);
-        } else {
-            this.message.html(newMessage);
-        }
-
-        this.options.message = newMessage;
-    },
-
-    update: function () {
-        var options = $.extend.apply($, [{}].concat(Array.prototype.slice.call(arguments, 0))),
-            map = {
-                className: 'changeClass',
-                css: 'css',
-                icon: 'changeIcon',
-                message: 'changeMessage',
-                timeout: 'timeout'
-            };
-
-        for (var prop in map) {
-            if (prop in options) {
-                this[map[prop]](options[prop]);
-            }
-        }
-    },
-
-    isVisible: function () {
-        return (true === this.container.is(':visible'));
-    },
-
-    _trigger: function (type, data) {
-        this.container.trigger(widgetName + type, data);
-    },
-
-    close: function () {
-        var o = this.options, self = this;
-
-        this._trigger('close');
-
-        if (o.hideEffects) {
-            this.container.animate(o.hideEffects, o.hideEffectDuration, function () {
-                self.remove();
-            });
-        } else {
-            this.container.hide();
-            this.remove();
-        }
-    },
-
-    remove: function () {
-        this.container.remove();
-
-        if ($.achtung.wrapper && !($.achtung.wrapper.contents().length)) {
-            $.achtung.wrapper = false;
-            $.achtung.overlay.remove();
-            $.achtung.overlay = false;
-        }
-    }
-});
-
-})(jQuery);
\ No newline at end of file
diff --git a/addons/im_livechat/static/ext/static/lib/jquery/jquery.js b/addons/im_livechat/static/ext/static/lib/jquery/jquery.js
deleted file mode 100644
index b4318519e88..00000000000
--- a/addons/im_livechat/static/ext/static/lib/jquery/jquery.js
+++ /dev/null
@@ -1,9472 +0,0 @@
-/*!
- * jQuery JavaScript Library v1.8.3
- * http://jquery.com/
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- *
- * Copyright 2012 jQuery Foundation and other contributors
- * Released under the MIT license
- * http://jquery.org/license
- *
- * Date: Tue Nov 13 2012 08:20:33 GMT-0500 (Eastern Standard Time)
- */
-(function( window, undefined ) {
-var
-        // A central reference to the root jQuery(document)
-        rootjQuery,
-
-        // The deferred used on DOM ready
-        readyList,
-
-        // Use the correct document accordingly with window argument (sandbox)
-        document = window.document,
-        location = window.location,
-        navigator = window.navigator,
-
-        // Map over jQuery in case of overwrite
-        _jQuery = window.jQuery,
-
-        // Map over the $ in case of overwrite
-        _$ = window.$,
-
-        // Save a reference to some core methods
-        core_push = Array.prototype.push,
-        core_slice = Array.prototype.slice,
-        core_indexOf = Array.prototype.indexOf,
-        core_toString = Object.prototype.toString,
-        core_hasOwn = Object.prototype.hasOwnProperty,
-        core_trim = String.prototype.trim,
-
-        // Define a local copy of jQuery
-        jQuery = function( selector, context ) {
-                // The jQuery object is actually just the init constructor 'enhanced'
-                return new jQuery.fn.init( selector, context, rootjQuery );
-        },
-
-        // Used for matching numbers
-        core_pnum = /[\-+]?(?:\d*\.|)\d+(?:[eE][\-+]?\d+|)/.source,
-
-        // Used for detecting and trimming whitespace
-        core_rnotwhite = /\S/,
-        core_rspace = /\s+/,
-
-        // Make sure we trim BOM and NBSP (here's looking at you, Safari 5.0 and IE)
-        rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,
-
-        // A simple way to check for HTML strings
-        // Prioritize #id over <tag> to avoid XSS via location.hash (#9521)
-        rquickExpr = /^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,
-
-        // Match a standalone tag
-        rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>|)$/,
-
-        // JSON RegExp
-        rvalidchars = /^[\],:{}\s]*$/,
-        rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g,
-        rvalidescape = /\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,
-        rvalidtokens = /"[^"\\\r\n]*"|true|false|null|-?(?:\d\d*\.|)\d+(?:[eE][\-+]?\d+|)/g,
-
-        // Matches dashed string for camelizing
-        rmsPrefix = /^-ms-/,
-        rdashAlpha = /-([\da-z])/gi,
-
-        // Used by jQuery.camelCase as callback to replace()
-        fcamelCase = function( all, letter ) {
-                return ( letter + "" ).toUpperCase();
-        },
-
-        // The ready event handler and self cleanup method
-        DOMContentLoaded = function() {
-                if ( document.addEventListener ) {
-                        document.removeEventListener( "DOMContentLoaded", DOMContentLoaded, false );
-                        jQuery.ready();
-                } else if ( document.readyState === "complete" ) {
-                        // we're here because readyState === "complete" in oldIE
-                        // which is good enough for us to call the dom ready!
-                        document.detachEvent( "onreadystatechange", DOMContentLoaded );
-                        jQuery.ready();
-                }
-        },
-
-        // [[Class]] -> type pairs
-        class2type = {};
-
-jQuery.fn = jQuery.prototype = {
-        constructor: jQuery,
-        init: function( selector, context, rootjQuery ) {
-                var match, elem, ret, doc;
-
-                // Handle $(""), $(null), $(undefined), $(false)
-                if ( !selector ) {
-                        return this;
-                }
-
-                // Handle $(DOMElement)
-                if ( selector.nodeType ) {
-                        this.context = this[0] = selector;
-                        this.length = 1;
-                        return this;
-                }
-
-                // Handle HTML strings
-                if ( typeof selector === "string" ) {
-                        if ( selector.charAt(0) === "<" && selector.charAt( selector.length - 1 ) === ">" && selector.length >= 3 ) {
-                                // Assume that strings that start and end with <> are HTML and skip the regex check
-                                match = [ null, selector, null ];
-
-                        } else {
-                                match = rquickExpr.exec( selector );
-                        }
-
-                        // Match html or make sure no context is specified for #id
-                        if ( match && (match[1] || !context) ) {
-
-                                // HANDLE: $(html) -> $(array)
-                                if ( match[1] ) {
-                                        context = context instanceof jQuery ? context[0] : context;
-                                        doc = ( context && context.nodeType ? context.ownerDocument || context : document );
-
-                                        // scripts is true for back-compat
-                                        selector = jQuery.parseHTML( match[1], doc, true );
-                                        if ( rsingleTag.test( match[1] ) && jQuery.isPlainObject( context ) ) {
-                                                this.attr.call( selector, context, true );
-                                        }
-
-                                        return jQuery.merge( this, selector );
-
-                                // HANDLE: $(#id)
-                                } else {
-                                        elem = document.getElementById( match[2] );
-
-                                        // Check parentNode to catch when Blackberry 4.6 returns
-                                        // nodes that are no longer in the document #6963
-                                        if ( elem && elem.parentNode ) {
-                                                // Handle the case where IE and Opera return items
-                                                // by name instead of ID
-                                                if ( elem.id !== match[2] ) {
-                                                        return rootjQuery.find( selector );
-                                                }
-
-                                                // Otherwise, we inject the element directly into the jQuery object
-                                                this.length = 1;
-                                                this[0] = elem;
-                                        }
-
-                                        this.context = document;
-                                        this.selector = selector;
-                                        return this;
-                                }
-
-                        // HANDLE: $(expr, $(...))
-                        } else if ( !context || context.jquery ) {
-                                return ( context || rootjQuery ).find( selector );
-
-                        // HANDLE: $(expr, context)
-                        // (which is just equivalent to: $(context).find(expr)
-                        } else {
-                                return this.constructor( context ).find( selector );
-                        }
-
-                // HANDLE: $(function)
-                // Shortcut for document ready
-                } else if ( jQuery.isFunction( selector ) ) {
-                        return rootjQuery.ready( selector );
-                }
-
-                if ( selector.selector !== undefined ) {
-                        this.selector = selector.selector;
-                        this.context = selector.context;
-                }
-
-                return jQuery.makeArray( selector, this );
-        },
-
-        // Start with an empty selector
-        selector: "",
-
-        // The current version of jQuery being used
-        jquery: "1.8.3",
-
-        // The default length of a jQuery object is 0
-        length: 0,
-
-        // The number of elements contained in the matched element set
-        size: function() {
-                return this.length;
-        },
-
-        toArray: function() {
-                return core_slice.call( this );
-        },
-
-        // Get the Nth element in the matched element set OR
-        // Get the whole matched element set as a clean array
-        get: function( num ) {
-                return num == null ?
-
-                        // Return a 'clean' array
-                        this.toArray() :
-
-                        // Return just the object
-                        ( num < 0 ? this[ this.length + num ] : this[ num ] );
-        },
-
-        // Take an array of elements and push it onto the stack
-        // (returning the new matched element set)
-        pushStack: function( elems, name, selector ) {
-
-                // Build a new jQuery matched element set
-                var ret = jQuery.merge( this.constructor(), elems );
-
-                // Add the old object onto the stack (as a reference)
-                ret.prevObject = this;
-
-                ret.context = this.context;
-
-                if ( name === "find" ) {
-                        ret.selector = this.selector + ( this.selector ? " " : "" ) + selector;
-                } else if ( name ) {
-                        ret.selector = this.selector + "." + name + "(" + selector + ")";
-                }
-
-                // Return the newly-formed element set
-                return ret;
-        },
-
-        // Execute a callback for every element in the matched set.
-        // (You can seed the arguments with an array of args, but this is
-        // only used internally.)
-        each: function( callback, args ) {
-                return jQuery.each( this, callback, args );
-        },
-
-        ready: function( fn ) {
-                // Add the callback
-                jQuery.ready.promise().done( fn );
-
-                return this;
-        },
-
-        eq: function( i ) {
-                i = +i;
-                return i === -1 ?
-                        this.slice( i ) :
-                        this.slice( i, i + 1 );
-        },
-
-        first: function() {
-                return this.eq( 0 );
-        },
-
-        last: function() {
-                return this.eq( -1 );
-        },
-
-        slice: function() {
-                return this.pushStack( core_slice.apply( this, arguments ),
-                        "slice", core_slice.call(arguments).join(",") );
-        },
-
-        map: function( callback ) {
-                return this.pushStack( jQuery.map(this, function( elem, i ) {
-                        return callback.call( elem, i, elem );
-                }));
-        },
-
-        end: function() {
-                return this.prevObject || this.constructor(null);
-        },
-
-        // For internal use only.
-        // Behaves like an Array's method, not like a jQuery method.
-        push: core_push,
-        sort: [].sort,
-        splice: [].splice
-};
-
-// Give the init function the jQuery prototype for later instantiation
-jQuery.fn.init.prototype = jQuery.fn;
-
-jQuery.extend = jQuery.fn.extend = function() {
-        var options, name, src, copy, copyIsArray, clone,
-                target = arguments[0] || {},
-                i = 1,
-                length = arguments.length,
-                deep = false;
-
-        // Handle a deep copy situation
-        if ( typeof target === "boolean" ) {
-                deep = target;
-                target = arguments[1] || {};
-                // skip the boolean and the target
-                i = 2;
-        }
-
-        // Handle case when target is a string or something (possible in deep copy)
-        if ( typeof target !== "object" && !jQuery.isFunction(target) ) {
-                target = {};
-        }
-
-        // extend jQuery itself if only one argument is passed
-        if ( length === i ) {
-                target = this;
-                --i;
-        }
-
-        for ( ; i < length; i++ ) {
-                // Only deal with non-null/undefined values
-                if ( (options = arguments[ i ]) != null ) {
-                        // Extend the base object
-                        for ( name in options ) {
-                                src = target[ name ];
-                                copy = options[ name ];
-
-                                // Prevent never-ending loop
-                                if ( target === copy ) {
-                                        continue;
-                                }
-
-                                // Recurse if we're merging plain objects or arrays
-                                if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) {
-                                        if ( copyIsArray ) {
-                                                copyIsArray = false;
-                                                clone = src && jQuery.isArray(src) ? src : [];
-
-                                        } else {
-                                                clone = src && jQuery.isPlainObject(src) ? src : {};
-                                        }
-
-                                        // Never move original objects, clone them
-                                        target[ name ] = jQuery.extend( deep, clone, copy );
-
-                                // Don't bring in undefined values
-                                } else if ( copy !== undefined ) {
-                                        target[ name ] = copy;
-                                }
-                        }
-                }
-        }
-
-        // Return the modified object
-        return target;
-};
-
-jQuery.extend({
-        noConflict: function( deep ) {
-                if ( window.$ === jQuery ) {
-                        window.$ = _$;
-                }
-
-                if ( deep && window.jQuery === jQuery ) {
-                        window.jQuery = _jQuery;
-                }
-
-                return jQuery;
-        },
-
-        // Is the DOM ready to be used? Set to true once it occurs.
-        isReady: false,
-
-        // A counter to track how many items to wait for before
-        // the ready event fires. See #6781
-        readyWait: 1,
-
-        // Hold (or release) the ready event
-        holdReady: function( hold ) {
-                if ( hold ) {
-                        jQuery.readyWait++;
-                } else {
-                        jQuery.ready( true );
-                }
-        },
-
-        // Handle when the DOM is ready
-        ready: function( wait ) {
-
-                // Abort if there are pending holds or we're already ready
-                if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) {
-                        return;
-                }
-
-                // Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
-                if ( !document.body ) {
-                        return setTimeout( jQuery.ready, 1 );
-                }
-
-                // Remember that the DOM is ready
-                jQuery.isReady = true;
-
-                // If a normal DOM Ready event fired, decrement, and wait if need be
-                if ( wait !== true && --jQuery.readyWait > 0 ) {
-                        return;
-                }
-
-                // If there are functions bound, to execute
-                readyList.resolveWith( document, [ jQuery ] );
-
-                // Trigger any bound ready events
-                if ( jQuery.fn.trigger ) {
-                        jQuery( document ).trigger("ready").off("ready");
-                }
-        },
-
-        // See test/unit/core.js for details concerning isFunction.
-        // Since version 1.3, DOM methods and functions like alert
-        // aren't supported. They return false on IE (#2968).
-        isFunction: function( obj ) {
-                return jQuery.type(obj) === "function";
-        },
-
-        isArray: Array.isArray || function( obj ) {
-                return jQuery.type(obj) === "array";
-        },
-
-        isWindow: function( obj ) {
-                return obj != null && obj == obj.window;
-        },
-
-        isNumeric: function( obj ) {
-                return !isNaN( parseFloat(obj) ) && isFinite( obj );
-        },
-
-        type: function( obj ) {
-                return obj == null ?
-                        String( obj ) :
-                        class2type[ core_toString.call(obj) ] || "object";
-        },
-
-        isPlainObject: function( obj ) {
-                // Must be an Object.
-                // Because of IE, we also have to check the presence of the constructor property.
-                // Make sure that DOM nodes and window objects don't pass through, as well
-                if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
-                        return false;
-                }
-
-                try {
-                        // Not own constructor property must be Object
-                        if ( obj.constructor &&
-                                !core_hasOwn.call(obj, "constructor") &&
-                                !core_hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) {
-                                return false;
-                        }
-                } catch ( e ) {
-                        // IE8,9 Will throw exceptions on certain host objects #9897
-                        return false;
-                }
-
-                // Own properties are enumerated firstly, so to speed up,
-                // if last one is own, then all properties are own.
-
-                var key;
-                for ( key in obj ) {}
-
-                return key === undefined || core_hasOwn.call( obj, key );
-        },
-
-        isEmptyObject: function( obj ) {
-                var name;
-                for ( name in obj ) {
-                        return false;
-                }
-                return true;
-        },
-
-        error: function( msg ) {
-                throw new Error( msg );
-        },
-
-        // data: string of html
-        // context (optional): If specified, the fragment will be created in this context, defaults to document
-        // scripts (optional): If true, will include scripts passed in the html string
-        parseHTML: function( data, context, scripts ) {
-                var parsed;
-                if ( !data || typeof data !== "string" ) {
-                        return null;
-                }
-                if ( typeof context === "boolean" ) {
-                        scripts = context;
-                        context = 0;
-                }
-                context = context || document;
-
-                // Single tag
-                if ( (parsed = rsingleTag.exec( data )) ) {
-                        return [ context.createElement( parsed[1] ) ];
-                }
-
-                parsed = jQuery.buildFragment( [ data ], context, scripts ? null : [] );
-                return jQuery.merge( [],
-                        (parsed.cacheable ? jQuery.clone( parsed.fragment ) : parsed.fragment).childNodes );
-        },
-
-        parseJSON: function( data ) {
-                if ( !data || typeof data !== "string") {
-                        return null;
-                }
-
-                // Make sure leading/trailing whitespace is removed (IE can't handle it)
-                data = jQuery.trim( data );
-
-                // Attempt to parse using the native JSON parser first
-                if ( window.JSON && window.JSON.parse ) {
-                        return window.JSON.parse( data );
-                }
-
-                // Make sure the incoming data is actual JSON
-                // Logic borrowed from http://json.org/json2.js
-                if ( rvalidchars.test( data.replace( rvalidescape, "@" )
-                        .replace( rvalidtokens, "]" )
-                        .replace( rvalidbraces, "")) ) {
-
-                        return ( new Function( "return " + data ) )();
-
-                }
-                jQuery.error( "Invalid JSON: " + data );
-        },
-
-        // Cross-browser xml parsing
-        parseXML: function( data ) {
-                var xml, tmp;
-                if ( !data || typeof data !== "string" ) {
-                        return null;
-                }
-                try {
-                        if ( window.DOMParser ) { // Standard
-                                tmp = new DOMParser();
-                                xml = tmp.parseFromString( data , "text/xml" );
-                        } else { // IE
-                                xml = new ActiveXObject( "Microsoft.XMLDOM" );
-                                xml.async = "false";
-                                xml.loadXML( data );
-                        }
-                } catch( e ) {
-                        xml = undefined;
-                }
-                if ( !xml || !xml.documentElement || xml.getElementsByTagName( "parsererror" ).length ) {
-                        jQuery.error( "Invalid XML: " + data );
-                }
-                return xml;
-        },
-
-        noop: function() {},
-
-        // Evaluates a script in a global context
-        // Workarounds based on findings by Jim Driscoll
-        // http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context
-        globalEval: function( data ) {
-                if ( data && core_rnotwhite.test( data ) ) {
-                        // We use execScript on Internet Explorer
-                        // We use an anonymous function so that context is window
-                        // rather than jQuery in Firefox
-                        ( window.execScript || function( data ) {
-                                window[ "eval" ].call( window, data );
-                        } )( data );
-                }
-        },
-
-        // Convert dashed to camelCase; used by the css and data modules
-        // Microsoft forgot to hump their vendor prefix (#9572)
-        camelCase: function( string ) {
-                return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase );
-        },
-
-        nodeName: function( elem, name ) {
-                return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
-        },
-
-        // args is for internal usage only
-        each: function( obj, callback, args ) {
-                var name,
-                        i = 0,
-                        length = obj.length,
-                        isObj = length === undefined || jQuery.isFunction( obj );
-
-                if ( args ) {
-                        if ( isObj ) {
-                                for ( name in obj ) {
-                                        if ( callback.apply( obj[ name ], args ) === false ) {
-                                                break;
-                                        }
-                                }
-                        } else {
-                                for ( ; i < length; ) {
-                                        if ( callback.apply( obj[ i++ ], args ) === false ) {
-                                                break;
-                                        }
-                                }
-                        }
-
-                // A special, fast, case for the most common use of each
-                } else {
-                        if ( isObj ) {
-                                for ( name in obj ) {
-                                        if ( callback.call( obj[ name ], name, obj[ name ] ) === false ) {
-                                                break;
-                                        }
-                                }
-                        } else {
-                                for ( ; i < length; ) {
-                                        if ( callback.call( obj[ i ], i, obj[ i++ ] ) === false ) {
-                                                break;
-                                        }
-                                }
-                        }
-                }
-
-                return obj;
-        },
-
-        // Use native String.trim function wherever possible
-        trim: core_trim && !core_trim.call("\uFEFF\xA0") ?
-                function( text ) {
-                        return text == null ?
-                                "" :
-                                core_trim.call( text );
-                } :
-
-                // Otherwise use our own trimming functionality
-                function( text ) {
-                        return text == null ?
-                                "" :
-                                ( text + "" ).replace( rtrim, "" );
-                },
-
-        // results is for internal usage only
-        makeArray: function( arr, results ) {
-                var type,
-                        ret = results || [];
-
-                if ( arr != null ) {
-                        // The window, strings (and functions) also have 'length'
-                        // Tweaked logic slightly to handle Blackberry 4.7 RegExp issues #6930
-                        type = jQuery.type( arr );
-
-                        if ( arr.length == null || type === "string" || type === "function" || type === "regexp" || jQuery.isWindow( arr ) ) {
-                                core_push.call( ret, arr );
-                        } else {
-                                jQuery.merge( ret, arr );
-                        }
-                }
-
-                return ret;
-        },
-
-        inArray: function( elem, arr, i ) {
-                var len;
-
-                if ( arr ) {
-                        if ( core_indexOf ) {
-                                return core_indexOf.call( arr, elem, i );
-                        }
-
-                        len = arr.length;
-                        i = i ? i < 0 ? Math.max( 0, len + i ) : i : 0;
-
-                        for ( ; i < len; i++ ) {
-                                // Skip accessing in sparse arrays
-                                if ( i in arr && arr[ i ] === elem ) {
-                                        return i;
-                                }
-                        }
-                }
-
-                return -1;
-        },
-
-        merge: function( first, second ) {
-                var l = second.length,
-                        i = first.length,
-                        j = 0;
-
-                if ( typeof l === "number" ) {
-                        for ( ; j < l; j++ ) {
-                                first[ i++ ] = second[ j ];
-                        }
-
-                } else {
-                        while ( second[j] !== undefined ) {
-                                first[ i++ ] = second[ j++ ];
-                        }
-                }
-
-                first.length = i;
-
-                return first;
-        },
-
-        grep: function( elems, callback, inv ) {
-                var retVal,
-                        ret = [],
-                        i = 0,
-                        length = elems.length;
-                inv = !!inv;
-
-                // Go through the array, only saving the items
-                // that pass the validator function
-                for ( ; i < length; i++ ) {
-                        retVal = !!callback( elems[ i ], i );
-                        if ( inv !== retVal ) {
-                                ret.push( elems[ i ] );
-                        }
-                }
-
-                return ret;
-        },
-
-        // arg is for internal usage only
-        map: function( elems, callback, arg ) {
-                var value, key,
-                        ret = [],
-                        i = 0,
-                        length = elems.length,
-                        // jquery objects are treated as arrays
-                        isArray = elems instanceof jQuery || length !== undefined && typeof length === "number" && ( ( length > 0 && elems[ 0 ] && elems[ length -1 ] ) || length === 0 || jQuery.isArray( elems ) ) ;
-
-                // Go through the array, translating each of the items to their
-                if ( isArray ) {
-                        for ( ; i < length; i++ ) {
-                                value = callback( elems[ i ], i, arg );
-
-                                if ( value != null ) {
-                                        ret[ ret.length ] = value;
-                                }
-                        }
-
-                // Go through every key on the object,
-                } else {
-                        for ( key in elems ) {
-                                value = callback( elems[ key ], key, arg );
-
-                                if ( value != null ) {
-                                        ret[ ret.length ] = value;
-                                }
-                        }
-                }
-
-                // Flatten any nested arrays
-                return ret.concat.apply( [], ret );
-        },
-
-        // A global GUID counter for objects
-        guid: 1,
-
-        // Bind a function to a context, optionally partially applying any
-        // arguments.
-        proxy: function( fn, context ) {
-                var tmp, args, proxy;
-
-                if ( typeof context === "string" ) {
-                        tmp = fn[ context ];
-                        context = fn;
-                        fn = tmp;
-                }
-
-                // Quick check to determine if target is callable, in the spec
-                // this throws a TypeError, but we will just return undefined.
-                if ( !jQuery.isFunction( fn ) ) {
-                        return undefined;
-                }
-
-                // Simulated bind
-                args = core_slice.call( arguments, 2 );
-                proxy = function() {
-                        return fn.apply( context, args.concat( core_slice.call( arguments ) ) );
-                };
-
-                // Set the guid of unique handler to the same of original handler, so it can be removed
-                proxy.guid = fn.guid = fn.guid || jQuery.guid++;
-
-                return proxy;
-        },
-
-        // Multifunctional method to get and set values of a collection
-        // The value/s can optionally be executed if it's a function
-        access: function( elems, fn, key, value, chainable, emptyGet, pass ) {
-                var exec,
-                        bulk = key == null,
-                        i = 0,
-                        length = elems.length;
-
-                // Sets many values
-                if ( key && typeof key === "object" ) {
-                        for ( i in key ) {
-                                jQuery.access( elems, fn, i, key[i], 1, emptyGet, value );
-                        }
-                        chainable = 1;
-
-                // Sets one value
-                } else if ( value !== undefined ) {
-                        // Optionally, function values get executed if exec is true
-                        exec = pass === undefined && jQuery.isFunction( value );
-
-                        if ( bulk ) {
-                                // Bulk operations only iterate when executing function values
-                                if ( exec ) {
-                                        exec = fn;
-                                        fn = function( elem, key, value ) {
-                                                return exec.call( jQuery( elem ), value );
-                                        };
-
-                                // Otherwise they run against the entire set
-                                } else {
-                                        fn.call( elems, value );
-                                        fn = null;
-                                }
-                        }
-
-                        if ( fn ) {
-                                for (; i < length; i++ ) {
-                                        fn( elems[i], key, exec ? value.call( elems[i], i, fn( elems[i], key ) ) : value, pass );
-                                }
-                        }
-
-                        chainable = 1;
-                }
-
-                return chainable ?
-                        elems :
-
-                        // Gets
-                        bulk ?
-                                fn.call( elems ) :
-                                length ? fn( elems[0], key ) : emptyGet;
-        },
-
-        now: function() {
-                return ( new Date() ).getTime();
-        }
-});
-
-jQuery.ready.promise = function( obj ) {
-        if ( !readyList ) {
-
-                readyList = jQuery.Deferred();
-
-                // Catch cases where $(document).ready() is called after the browser event has already occurred.
-                // we once tried to use readyState "interactive" here, but it caused issues like the one
-                // discovered by ChrisS here: http://bugs.jquery.com/ticket/12282#comment:15
-                if ( document.readyState === "complete" ) {
-                        // Handle it asynchronously to allow scripts the opportunity to delay ready
-                        setTimeout( jQuery.ready, 1 );
-
-                // Standards-based browsers support DOMContentLoaded
-                } else if ( document.addEventListener ) {
-                        // Use the handy event callback
-                        document.addEventListener( "DOMContentLoaded", DOMContentLoaded, false );
-
-                        // A fallback to window.onload, that will always work
-                        window.addEventListener( "load", jQuery.ready, false );
-
-                // If IE event model is used
-                } else {
-                        // Ensure firing before onload, maybe late but safe also for iframes
-                        document.attachEvent( "onreadystatechange", DOMContentLoaded );
-
-                        // A fallback to window.onload, that will always work
-                        window.attachEvent( "onload", jQuery.ready );
-
-                        // If IE and not a frame
-                        // continually check to see if the document is ready
-                        var top = false;
-
-                        try {
-                                top = window.frameElement == null && document.documentElement;
-                        } catch(e) {}
-
-                        if ( top && top.doScroll ) {
-                                (function doScrollCheck() {
-                                        if ( !jQuery.isReady ) {
-
-                                                try {
-                                                        // Use the trick by Diego Perini
-                                                        // http://javascript.nwbox.com/IEContentLoaded/
-                                                        top.doScroll("left");
-                                                } catch(e) {
-                                                        return setTimeout( doScrollCheck, 50 );
-                                                }
-
-                                                // and execute any waiting functions
-                                                jQuery.ready();
-                                        }
-                                })();
-                        }
-                }
-        }
-        return readyList.promise( obj );
-};
-
-// Populate the class2type map
-jQuery.each("Boolean Number String Function Array Date RegExp Object".split(" "), function(i, name) {
-        class2type[ "[object " + name + "]" ] = name.toLowerCase();
-});
-
-// All jQuery objects should point back to these
-rootjQuery = jQuery(document);
-// String to Object options format cache
-var optionsCache = {};
-
-// Convert String-formatted options into Object-formatted ones and store in cache
-function createOptions( options ) {
-        var object = optionsCache[ options ] = {};
-        jQuery.each( options.split( core_rspace ), function( _, flag ) {
-                object[ flag ] = true;
-        });
-        return object;
-}
-
-/*
- * Create a callback list using the following parameters:
- *
- *      options: an optional list of space-separated options that will change how
- *                      the callback list behaves or a more traditional option object
- *
- * By default a callback list will act like an event callback list and can be
- * "fired" multiple times.
- *
- * Possible options:
- *
- *      once:                   will ensure the callback list can only be fired once (like a Deferred)
- *
- *      memory:                 will keep track of previous values and will call any callback added
- *                                      after the list has been fired right away with the latest "memorized"
- *                                      values (like a Deferred)
- *
- *      unique:                 will ensure a callback can only be added once (no duplicate in the list)
- *
- *      stopOnFalse:    interrupt callings when a callback returns false
- *
- */
-jQuery.Callbacks = function( options ) {
-
-        // Convert options from String-formatted to Object-formatted if needed
-        // (we check in cache first)
-        options = typeof options === "string" ?
-                ( optionsCache[ options ] || createOptions( options ) ) :
-                jQuery.extend( {}, options );
-
-        var // Last fire value (for non-forgettable lists)
-                memory,
-                // Flag to know if list was already fired
-                fired,
-                // Flag to know if list is currently firing
-                firing,
-                // First callback to fire (used internally by add and fireWith)
-                firingStart,
-                // End of the loop when firing
-                firingLength,
-                // Index of currently firing callback (modified by remove if needed)
-                firingIndex,
-                // Actual callback list
-                list = [],
-                // Stack of fire calls for repeatable lists
-                stack = !options.once && [],
-                // Fire callbacks
-                fire = function( data ) {
-                        memory = options.memory && data;
-                        fired = true;
-                        firingIndex = firingStart || 0;
-                        firingStart = 0;
-                        firingLength = list.length;
-                        firing = true;
-                        for ( ; list && firingIndex < firingLength; firingIndex++ ) {
-                                if ( list[ firingIndex ].apply( data[ 0 ], data[ 1 ] ) === false && options.stopOnFalse ) {
-                                        memory = false; // To prevent further calls using add
-                                        break;
-                                }
-                        }
-                        firing = false;
-                        if ( list ) {
-                                if ( stack ) {
-                                        if ( stack.length ) {
-                                                fire( stack.shift() );
-                                        }
-                                } else if ( memory ) {
-                                        list = [];
-                                } else {
-                                        self.disable();
-                                }
-                        }
-                },
-                // Actual Callbacks object
-                self = {
-                        // Add a callback or a collection of callbacks to the list
-                        add: function() {
-                                if ( list ) {
-                                        // First, we save the current length
-                                        var start = list.length;
-                                        (function add( args ) {
-                                                jQuery.each( args, function( _, arg ) {
-                                                        var type = jQuery.type( arg );
-                                                        if ( type === "function" ) {
-                                                                if ( !options.unique || !self.has( arg ) ) {
-                                                                        list.push( arg );
-                                                                }
-                                                        } else if ( arg && arg.length && type !== "string" ) {
-                                                                // Inspect recursively
-                                                                add( arg );
-                                                        }
-                                                });
-                                        })( arguments );
-                                        // Do we need to add the callbacks to the
-                                        // current firing batch?
-                                        if ( firing ) {
-                                                firingLength = list.length;
-                                        // With memory, if we're not firing then
-                                        // we should call right away
-                                        } else if ( memory ) {
-                                                firingStart = start;
-                                                fire( memory );
-                                        }
-                                }
-                                return this;
-                        },
-                        // Remove a callback from the list
-                        remove: function() {
-                                if ( list ) {
-                                        jQuery.each( arguments, function( _, arg ) {
-                                                var index;
-                                                while( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) {
-                                                        list.splice( index, 1 );
-                                                        // Handle firing indexes
-                                                        if ( firing ) {
-                                                                if ( index <= firingLength ) {
-                                                                        firingLength--;
-                                                                }
-                                                                if ( index <= firingIndex ) {
-                                                                        firingIndex--;
-                                                                }
-                                                        }
-                                                }
-                                        });
-                                }
-                                return this;
-                        },
-                        // Control if a given callback is in the list
-                        has: function( fn ) {
-                                return jQuery.inArray( fn, list ) > -1;
-                        },
-                        // Remove all callbacks from the list
-                        empty: function() {
-                                list = [];
-                                return this;
-                        },
-                        // Have the list do nothing anymore
-                        disable: function() {
-                                list = stack = memory = undefined;
-                                return this;
-                        },
-                        // Is it disabled?
-                        disabled: function() {
-                                return !list;
-                        },
-                        // Lock the list in its current state
-                        lock: function() {
-                                stack = undefined;
-                                if ( !memory ) {
-                                        self.disable();
-                                }
-                                return this;
-                        },
-                        // Is it locked?
-                        locked: function() {
-                                return !stack;
-                        },
-                        // Call all callbacks with the given context and arguments
-                        fireWith: function( context, args ) {
-                                args = args || [];
-                                args = [ context, args.slice ? args.slice() : args ];
-                                if ( list && ( !fired || stack ) ) {
-                                        if ( firing ) {
-                                                stack.push( args );
-                                        } else {
-                                                fire( args );
-                                        }
-                                }
-                                return this;
-                        },
-                        // Call all the callbacks with the given arguments
-                        fire: function() {
-                                self.fireWith( this, arguments );
-                                return this;
-                        },
-                        // To know if the callbacks have already been called at least once
-                        fired: function() {
-                                return !!fired;
-                        }
-                };
-
-        return self;
-};
-jQuery.extend({
-
-        Deferred: function( func ) {
-                var tuples = [
-                                // action, add listener, listener list, final state
-                                [ "resolve", "done", jQuery.Callbacks("once memory"), "resolved" ],
-                                [ "reject", "fail", jQuery.Callbacks("once memory"), "rejected" ],
-                                [ "notify", "progress", jQuery.Callbacks("memory") ]
-                        ],
-                        state = "pending",
-                        promise = {
-                                state: function() {
-                                        return state;
-                                },
-                                always: function() {
-                                        deferred.done( arguments ).fail( arguments );
-                                        return this;
-                                },
-                                then: function( /* fnDone, fnFail, fnProgress */ ) {
-                                        var fns = arguments;
-                                        return jQuery.Deferred(function( newDefer ) {
-                                                jQuery.each( tuples, function( i, tuple ) {
-                                                        var action = tuple[ 0 ],
-                                                                fn = fns[ i ];
-                                                        // deferred[ done | fail | progress ] for forwarding actions to newDefer
-                                                        deferred[ tuple[1] ]( jQuery.isFunction( fn ) ?
-                                                                function() {
-                                                                        var returned = fn.apply( this, arguments );
-                                                                        if ( returned && jQuery.isFunction( returned.promise ) ) {
-                                                                                returned.promise()
-                                                                                        .done( newDefer.resolve )
-                                                                                        .fail( newDefer.reject )
-                                                                                        .progress( newDefer.notify );
-                                                                        } else {
-                                                                                newDefer[ action + "With" ]( this === deferred ? newDefer : this, [ returned ] );
-                                                                        }
-                                                                } :
-                                                                newDefer[ action ]
-                                                        );
-                                                });
-                                                fns = null;
-                                        }).promise();
-                                },
-                                // Get a promise for this deferred
-                                // If obj is provided, the promise aspect is added to the object
-                                promise: function( obj ) {
-                                        return obj != null ? jQuery.extend( obj, promise ) : promise;
-                                }
-                        },
-                        deferred = {};
-
-                // Keep pipe for back-compat
-                promise.pipe = promise.then;
-
-                // Add list-specific methods
-                jQuery.each( tuples, function( i, tuple ) {
-                        var list = tuple[ 2 ],
-                                stateString = tuple[ 3 ];
-
-                        // promise[ done | fail | progress ] = list.add
-                        promise[ tuple[1] ] = list.add;
-
-                        // Handle state
-                        if ( stateString ) {
-                                list.add(function() {
-                                        // state = [ resolved | rejected ]
-                                        state = stateString;
-
-                                // [ reject_list | resolve_list ].disable; progress_list.lock
-                                }, tuples[ i ^ 1 ][ 2 ].disable, tuples[ 2 ][ 2 ].lock );
-                        }
-
-                        // deferred[ resolve | reject | notify ] = list.fire
-                        deferred[ tuple[0] ] = list.fire;
-                        deferred[ tuple[0] + "With" ] = list.fireWith;
-                });
-
-                // Make the deferred a promise
-                promise.promise( deferred );
-
-                // Call given func if any
-                if ( func ) {
-                        func.call( deferred, deferred );
-                }
-
-                // All done!
-                return deferred;
-        },
-
-        // Deferred helper
-        when: function( subordinate /* , ..., subordinateN */ ) {
-                var i = 0,
-                        resolveValues = core_slice.call( arguments ),
-                        length = resolveValues.length,
-
-                        // the count of uncompleted subordinates
-                        remaining = length !== 1 || ( subordinate && jQuery.isFunction( subordinate.promise ) ) ? length : 0,
-
-                        // the master Deferred. If resolveValues consist of only a single Deferred, just use that.
-                        deferred = remaining === 1 ? subordinate : jQuery.Deferred(),
-
-                        // Update function for both resolve and progress values
-                        updateFunc = function( i, contexts, values ) {
-                                return function( value ) {
-                                        contexts[ i ] = this;
-                                        values[ i ] = arguments.length > 1 ? core_slice.call( arguments ) : value;
-                                        if( values === progressValues ) {
-                                                deferred.notifyWith( contexts, values );
-                                        } else if ( !( --remaining ) ) {
-                                                deferred.resolveWith( contexts, values );
-                                        }
-                                };
-                        },
-
-                        progressValues, progressContexts, resolveContexts;
-
-                // add listeners to Deferred subordinates; treat others as resolved
-                if ( length > 1 ) {
-                        progressValues = new Array( length );
-                        progressContexts = new Array( length );
-                        resolveContexts = new Array( length );
-                        for ( ; i < length; i++ ) {
-                                if ( resolveValues[ i ] && jQuery.isFunction( resolveValues[ i ].promise ) ) {
-                                        resolveValues[ i ].promise()
-                                                .done( updateFunc( i, resolveContexts, resolveValues ) )
-                                                .fail( deferred.reject )
-                                                .progress( updateFunc( i, progressContexts, progressValues ) );
-                                } else {
-                                        --remaining;
-                                }
-                        }
-                }
-
-                // if we're not waiting on anything, resolve the master
-                if ( !remaining ) {
-                        deferred.resolveWith( resolveContexts, resolveValues );
-                }
-
-                return deferred.promise();
-        }
-});
-jQuery.support = (function() {
-
-        var support,
-                all,
-                a,
-                select,
-                opt,
-                input,
-                fragment,
-                eventName,
-                i,
-                isSupported,
-                clickFn,
-                div = document.createElement("div");
-
-        // Setup
-        div.setAttribute( "className", "t" );
-        div.innerHTML = "  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>";
-
-        // Support tests won't run in some limited or non-browser environments
-        all = div.getElementsByTagName("*");
-        a = div.getElementsByTagName("a")[ 0 ];
-        if ( !all || !a || !all.length ) {
-                return {};
-        }
-
-        // First batch of tests
-        select = document.createElement("select");
-        opt = select.appendChild( document.createElement("option") );
-        input = div.getElementsByTagName("input")[ 0 ];
-
-        a.style.cssText = "top:1px;float:left;opacity:.5";
-        support = {
-                // IE strips leading whitespace when .innerHTML is used
-                leadingWhitespace: ( div.firstChild.nodeType === 3 ),
-
-                // Make sure that tbody elements aren't automatically inserted
-                // IE will insert them into empty tables
-                tbody: !div.getElementsByTagName("tbody").length,
-
-                // Make sure that link elements get serialized correctly by innerHTML
-                // This requires a wrapper element in IE
-                htmlSerialize: !!div.getElementsByTagName("link").length,
-
-                // Get the style information from getAttribute
-                // (IE uses .cssText instead)
-                style: /top/.test( a.getAttribute("style") ),
-
-                // Make sure that URLs aren't manipulated
-                // (IE normalizes it by default)
-                hrefNormalized: ( a.getAttribute("href") === "/a" ),
-
-                // Make sure that element opacity exists
-                // (IE uses filter instead)
-                // Use a regex to work around a WebKit issue. See #5145
-                opacity: /^0.5/.test( a.style.opacity ),
-
-                // Verify style float existence
-                // (IE uses styleFloat instead of cssFloat)
-                cssFloat: !!a.style.cssFloat,
-
-                // Make sure that if no value is specified for a checkbox
-                // that it defaults to "on".
-                // (WebKit defaults to "" instead)
-                checkOn: ( input.value === "on" ),
-
-                // Make sure that a selected-by-default option has a working selected property.
-                // (WebKit defaults to false instead of true, IE too, if it's in an optgroup)
-                optSelected: opt.selected,
-
-                // Test setAttribute on camelCase class. If it works, we need attrFixes when doing get/setAttribute (ie6/7)
-                getSetAttribute: div.className !== "t",
-
-                // Tests for enctype support on a form (#6743)
-                enctype: !!document.createElement("form").enctype,
-
-                // Makes sure cloning an html5 element does not cause problems
-                // Where outerHTML is undefined, this still works
-                html5Clone: document.createElement("nav").cloneNode( true ).outerHTML !== "<:nav></:nav>",
-
-                // jQuery.support.boxModel DEPRECATED in 1.8 since we don't support Quirks Mode
-                boxModel: ( document.compatMode === "CSS1Compat" ),
-
-                // Will be defined later
-                submitBubbles: true,
-                changeBubbles: true,
-                focusinBubbles: false,
-                deleteExpando: true,
-                noCloneEvent: true,
-                inlineBlockNeedsLayout: false,
-                shrinkWrapBlocks: false,
-                reliableMarginRight: true,
-                boxSizingReliable: true,
-                pixelPosition: false
-        };
-
-        // Make sure checked status is properly cloned
-        input.checked = true;
-        support.noCloneChecked = input.cloneNode( true ).checked;
-
-        // Make sure that the options inside disabled selects aren't marked as disabled
-        // (WebKit marks them as disabled)
-        select.disabled = true;
-        support.optDisabled = !opt.disabled;
-
-        // Test to see if it's possible to delete an expando from an element
-        // Fails in Internet Explorer
-        try {
-                delete div.test;
-        } catch( e ) {
-                support.deleteExpando = false;
-        }
-
-        if ( !div.addEventListener && div.attachEvent && div.fireEvent ) {
-                div.attachEvent( "onclick", clickFn = function() {
-                        // Cloning a node shouldn't copy over any
-                        // bound event handlers (IE does this)
-                        support.noCloneEvent = false;
-                });
-                div.cloneNode( true ).fireEvent("onclick");
-                div.detachEvent( "onclick", clickFn );
-        }
-
-        // Check if a radio maintains its value
-        // after being appended to the DOM
-        input = document.createElement("input");
-        input.value = "t";
-        input.setAttribute( "type", "radio" );
-        support.radioValue = input.value === "t";
-
-        input.setAttribute( "checked", "checked" );
-
-        // #11217 - WebKit loses check when the name is after the checked attribute
-        input.setAttribute( "name", "t" );
-
-        div.appendChild( input );
-        fragment = document.createDocumentFragment();
-        fragment.appendChild( div.lastChild );
-
-        // WebKit doesn't clone checked state correctly in fragments
-        support.checkClone = fragment.cloneNode( true ).cloneNode( true ).lastChild.checked;
-
-        // Check if a disconnected checkbox will retain its checked
-        // value of true after appended to the DOM (IE6/7)
-        support.appendChecked = input.checked;
-
-        fragment.removeChild( input );
-        fragment.appendChild( div );
-
-        // Technique from Juriy Zaytsev
-        // http://perfectionkills.com/detecting-event-support-without-browser-sniffing/
-        // We only care about the case where non-standard event systems
-        // are used, namely in IE. Short-circuiting here helps us to
-        // avoid an eval call (in setAttribute) which can cause CSP
-        // to go haywire. See: https://developer.mozilla.org/en/Security/CSP
-        if ( div.attachEvent ) {
-                for ( i in {
-                        submit: true,
-                        change: true,
-                        focusin: true
-                }) {
-                        eventName = "on" + i;
-                        isSupported = ( eventName in div );
-                        if ( !isSupported ) {
-                                div.setAttribute( eventName, "return;" );
-                                isSupported = ( typeof div[ eventName ] === "function" );
-                        }
-                        support[ i + "Bubbles" ] = isSupported;
-                }
-        }
-
-        // Run tests that need a body at doc ready
-        jQuery(function() {
-                var container, div, tds, marginDiv,
-                        divReset = "padding:0;margin:0;border:0;display:block;overflow:hidden;",
-                        body = document.getElementsByTagName("body")[0];
-
-                if ( !body ) {
-                        // Return for frameset docs that don't have a body
-                        return;
-                }
-
-                container = document.createElement("div");
-                container.style.cssText = "visibility:hidden;border:0;width:0;height:0;position:static;top:0;margin-top:1px";
-                body.insertBefore( container, body.firstChild );
-
-                // Construct the test element
-                div = document.createElement("div");
-                container.appendChild( div );
-
-                // Check if table cells still have offsetWidth/Height when they are set
-                // to display:none and there are still other visible table cells in a
-                // table row; if so, offsetWidth/Height are not reliable for use when
-                // determining if an element has been hidden directly using
-                // display:none (it is still safe to use offsets if a parent element is
-                // hidden; don safety goggles and see bug #4512 for more information).
-                // (only IE 8 fails this test)
-                div.innerHTML = "<table><tr><td></td><td>t</td></tr></table>";
-                tds = div.getElementsByTagName("td");
-                tds[ 0 ].style.cssText = "padding:0;margin:0;border:0;display:none";
-                isSupported = ( tds[ 0 ].offsetHeight === 0 );
-
-                tds[ 0 ].style.display = "";
-                tds[ 1 ].style.display = "none";
-
-                // Check if empty table cells still have offsetWidth/Height
-                // (IE <= 8 fail this test)
-                support.reliableHiddenOffsets = isSupported && ( tds[ 0 ].offsetHeight === 0 );
-
-                // Check box-sizing and margin behavior
-                div.innerHTML = "";
-                div.style.cssText = "box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;";
-                support.boxSizing = ( div.offsetWidth === 4 );
-                support.doesNotIncludeMarginInBodyOffset = ( body.offsetTop !== 1 );
-
-                // NOTE: To any future maintainer, we've window.getComputedStyle
-                // because jsdom on node.js will break without it.
-                if ( window.getComputedStyle ) {
-                        support.pixelPosition = ( window.getComputedStyle( div, null ) || {} ).top !== "1%";
-                        support.boxSizingReliable = ( window.getComputedStyle( div, null ) || { width: "4px" } ).width === "4px";
-
-                        // Check if div with explicit width and no margin-right incorrectly
-                        // gets computed margin-right based on width of container. For more
-                        // info see bug #3333
-                        // Fails in WebKit before Feb 2011 nightlies
-                        // WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
-                        marginDiv = document.createElement("div");
-                        marginDiv.style.cssText = div.style.cssText = divReset;
-                        marginDiv.style.marginRight = marginDiv.style.width = "0";
-                        div.style.width = "1px";
-                        div.appendChild( marginDiv );
-                        support.reliableMarginRight =
-                                !parseFloat( ( window.getComputedStyle( marginDiv, null ) || {} ).marginRight );
-                }
-
-                if ( typeof div.style.zoom !== "undefined" ) {
-                        // Check if natively block-level elements act like inline-block
-                        // elements when setting their display to 'inline' and giving
-                        // them layout
-                        // (IE < 8 does this)
-                        div.innerHTML = "";
-                        div.style.cssText = divReset + "width:1px;padding:1px;display:inline;zoom:1";
-                        support.inlineBlockNeedsLayout = ( div.offsetWidth === 3 );
-
-                        // Check if elements with layout shrink-wrap their children
-                        // (IE 6 does this)
-                        div.style.display = "block";
-                        div.style.overflow = "visible";
-                        div.innerHTML = "<div></div>";
-                        div.firstChild.style.width = "5px";
-                        support.shrinkWrapBlocks = ( div.offsetWidth !== 3 );
-
-                        container.style.zoom = 1;
-                }
-
-                // Null elements to avoid leaks in IE
-                body.removeChild( container );
-                container = div = tds = marginDiv = null;
-        });
-
-        // Null elements to avoid leaks in IE
-        fragment.removeChild( div );
-        all = a = select = opt = input = fragment = div = null;
-
-        return support;
-})();
-var rbrace = /(?:\{[\s\S]*\}|\[[\s\S]*\])$/,
-        rmultiDash = /([A-Z])/g;
-
-jQuery.extend({
-        cache: {},
-
-        deletedIds: [],
-
-        // Remove at next major release (1.9/2.0)
-        uuid: 0,
-
-        // Unique for each copy of jQuery on the page
-        // Non-digits removed to match rinlinejQuery
-        expando: "jQuery" + ( jQuery.fn.jquery + Math.random() ).replace( /\D/g, "" ),
-
-        // The following elements throw uncatchable exceptions if you
-        // attempt to add expando properties to them.
-        noData: {
-                "embed": true,
-                // Ban all objects except for Flash (which handle expandos)
-                "object": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",
-                "applet": true
-        },
-
-        hasData: function( elem ) {
-                elem = elem.nodeType ? jQuery.cache[ elem[jQuery.expando] ] : elem[ jQuery.expando ];
-                return !!elem && !isEmptyDataObject( elem );
-        },
-
-        data: function( elem, name, data, pvt /* Internal Use Only */ ) {
-                if ( !jQuery.acceptData( elem ) ) {
-                        return;
-                }
-
-                var thisCache, ret,
-                        internalKey = jQuery.expando,
-                        getByName = typeof name === "string",
-
-                        // We have to handle DOM nodes and JS objects differently because IE6-7
-                        // can't GC object references properly across the DOM-JS boundary
-                        isNode = elem.nodeType,
-
-                        // Only DOM nodes need the global jQuery cache; JS object data is
-                        // attached directly to the object so GC can occur automatically
-                        cache = isNode ? jQuery.cache : elem,
-
-                        // Only defining an ID for JS objects if its cache already exists allows
-                        // the code to shortcut on the same path as a DOM node with no cache
-                        id = isNode ? elem[ internalKey ] : elem[ internalKey ] && internalKey;
-
-                // Avoid doing any more work than we need to when trying to get data on an
-                // object that has no data at all
-                if ( (!id || !cache[id] || (!pvt && !cache[id].data)) && getByName && data === undefined ) {
-                        return;
-                }
-
-                if ( !id ) {
-                        // Only DOM nodes need a new unique ID for each element since their data
-                        // ends up in the global cache
-                        if ( isNode ) {
-                                elem[ internalKey ] = id = jQuery.deletedIds.pop() || jQuery.guid++;
-                        } else {
-                                id = internalKey;
-                        }
-                }
-
-                if ( !cache[ id ] ) {
-                        cache[ id ] = {};
-
-                        // Avoids exposing jQuery metadata on plain JS objects when the object
-                        // is serialized using JSON.stringify
-                        if ( !isNode ) {
-                                cache[ id ].toJSON = jQuery.noop;
-                        }
-                }
-
-                // An object can be passed to jQuery.data instead of a key/value pair; this gets
-                // shallow copied over onto the existing cache
-                if ( typeof name === "object" || typeof name === "function" ) {
-                        if ( pvt ) {
-                                cache[ id ] = jQuery.extend( cache[ id ], name );
-                        } else {
-                                cache[ id ].data = jQuery.extend( cache[ id ].data, name );
-                        }
-                }
-
-                thisCache = cache[ id ];
-
-                // jQuery data() is stored in a separate object inside the object's internal data
-                // cache in order to avoid key collisions between internal data and user-defined
-                // data.
-                if ( !pvt ) {
-                        if ( !thisCache.data ) {
-                                thisCache.data = {};
-                        }
-
-                        thisCache = thisCache.data;
-                }
-
-                if ( data !== undefined ) {
-                        thisCache[ jQuery.camelCase( name ) ] = data;
-                }
-
-                // Check for both converted-to-camel and non-converted data property names
-                // If a data property was specified
-                if ( getByName ) {
-
-                        // First Try to find as-is property data
-                        ret = thisCache[ name ];
-
-                        // Test for null|undefined property data
-                        if ( ret == null ) {
-
-                                // Try to find the camelCased property
-                                ret = thisCache[ jQuery.camelCase( name ) ];
-                        }
-                } else {
-                        ret = thisCache;
-                }
-
-                return ret;
-        },
-
-        removeData: function( elem, name, pvt /* Internal Use Only */ ) {
-                if ( !jQuery.acceptData( elem ) ) {
-                        return;
-                }
-
-                var thisCache, i, l,
-
-                        isNode = elem.nodeType,
-
-                        // See jQuery.data for more information
-                        cache = isNode ? jQuery.cache : elem,
-                        id = isNode ? elem[ jQuery.expando ] : jQuery.expando;
-
-                // If there is already no cache entry for this object, there is no
-                // purpose in continuing
-                if ( !cache[ id ] ) {
-                        return;
-                }
-
-                if ( name ) {
-
-                        thisCache = pvt ? cache[ id ] : cache[ id ].data;
-
-                        if ( thisCache ) {
-
-                                // Support array or space separated string names for data keys
-                                if ( !jQuery.isArray( name ) ) {
-
-                                        // try the string as a key before any manipulation
-                                        if ( name in thisCache ) {
-                                                name = [ name ];
-                                        } else {
-
-                                                // split the camel cased version by spaces unless a key with the spaces exists
-                                                name = jQuery.camelCase( name );
-                                                if ( name in thisCache ) {
-                                                        name = [ name ];
-                                                } else {
-                                                        name = name.split(" ");
-                                                }
-                                        }
-                                }
-
-                                for ( i = 0, l = name.length; i < l; i++ ) {
-                                        delete thisCache[ name[i] ];
-                                }
-
-                                // If there is no data left in the cache, we want to continue
-                                // and let the cache object itself get destroyed
-                                if ( !( pvt ? isEmptyDataObject : jQuery.isEmptyObject )( thisCache ) ) {
-                                        return;
-                                }
-                        }
-                }
-
-                // See jQuery.data for more information
-                if ( !pvt ) {
-                        delete cache[ id ].data;
-
-                        // Don't destroy the parent cache unless the internal data object
-                        // had been the only thing left in it
-                        if ( !isEmptyDataObject( cache[ id ] ) ) {
-                                return;
-                        }
-                }
-
-                // Destroy the cache
-                if ( isNode ) {
-                        jQuery.cleanData( [ elem ], true );
-
-                // Use delete when supported for expandos or `cache` is not a window per isWindow (#10080)
-                } else if ( jQuery.support.deleteExpando || cache != cache.window ) {
-                        delete cache[ id ];
-
-                // When all else fails, null
-                } else {
-                        cache[ id ] = null;
-                }
-        },
-
-        // For internal use only.
-        _data: function( elem, name, data ) {
-                return jQuery.data( elem, name, data, true );
-        },
-
-        // A method for determining if a DOM node can handle the data expando
-        acceptData: function( elem ) {
-                var noData = elem.nodeName && jQuery.noData[ elem.nodeName.toLowerCase() ];
-
-                // nodes accept data unless otherwise specified; rejection can be conditional
-                return !noData || noData !== true && elem.getAttribute("classid") === noData;
-        }
-});
-
-jQuery.fn.extend({
-        data: function( key, value ) {
-                var parts, part, attr, name, l,
-                        elem = this[0],
-                        i = 0,
-                        data = null;
-
-                // Gets all values
-                if ( key === undefined ) {
-                        if ( this.length ) {
-                                data = jQuery.data( elem );
-
-                                if ( elem.nodeType === 1 && !jQuery._data( elem, "parsedAttrs" ) ) {
-                                        attr = elem.attributes;
-                                        for ( l = attr.length; i < l; i++ ) {
-                                                name = attr[i].name;
-
-                                                if ( !name.indexOf( "data-" ) ) {
-                                                        name = jQuery.camelCase( name.substring(5) );
-
-                                                        dataAttr( elem, name, data[ name ] );
-                                                }
-                                        }
-                                        jQuery._data( elem, "parsedAttrs", true );
-                                }
-                        }
-
-                        return data;
-                }
-
-                // Sets multiple values
-                if ( typeof key === "object" ) {
-                        return this.each(function() {
-                                jQuery.data( this, key );
-                        });
-                }
-
-                parts = key.split( ".", 2 );
-                parts[1] = parts[1] ? "." + parts[1] : "";
-                part = parts[1] + "!";
-
-                return jQuery.access( this, function( value ) {
-
-                        if ( value === undefined ) {
-                                data = this.triggerHandler( "getData" + part, [ parts[0] ] );
-
-                                // Try to fetch any internally stored data first
-                                if ( data === undefined && elem ) {
-                                        data = jQuery.data( elem, key );
-                                        data = dataAttr( elem, key, data );
-                                }
-
-                                return data === undefined && parts[1] ?
-                                        this.data( parts[0] ) :
-                                        data;
-                        }
-
-                        parts[1] = value;
-                        this.each(function() {
-                                var self = jQuery( this );
-
-                                self.triggerHandler( "setData" + part, parts );
-                                jQuery.data( this, key, value );
-                                self.triggerHandler( "changeData" + part, parts );
-                        });
-                }, null, value, arguments.length > 1, null, false );
-        },
-
-        removeData: function( key ) {
-                return this.each(function() {
-                        jQuery.removeData( this, key );
-                });
-        }
-});
-
-function dataAttr( elem, key, data ) {
-        // If nothing was found internally, try to fetch any
-        // data from the HTML5 data-* attribute
-        if ( data === undefined && elem.nodeType === 1 ) {
-
-                var name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase();
-
-                data = elem.getAttribute( name );
-
-                if ( typeof data === "string" ) {
-                        try {
-                                data = data === "true" ? true :
-                                data === "false" ? false :
-                                data === "null" ? null :
-                                // Only convert to a number if it doesn't change the string
-                                +data + "" === data ? +data :
-                                rbrace.test( data ) ? jQuery.parseJSON( data ) :
-                                        data;
-                        } catch( e ) {}
-
-                        // Make sure we set the data so it isn't changed later
-                        jQuery.data( elem, key, data );
-
-                } else {
-                        data = undefined;
-                }
-        }
-
-        return data;
-}
-
-// checks a cache object for emptiness
-function isEmptyDataObject( obj ) {
-        var name;
-        for ( name in obj ) {
-
-                // if the public data object is empty, the private is still empty
-                if ( name === "data" && jQuery.isEmptyObject( obj[name] ) ) {
-                        continue;
-                }
-                if ( name !== "toJSON" ) {
-                        return false;
-                }
-        }
-
-        return true;
-}
-jQuery.extend({
-        queue: function( elem, type, data ) {
-                var queue;
-
-                if ( elem ) {
-                        type = ( type || "fx" ) + "queue";
-                        queue = jQuery._data( elem, type );
-
-                        // Speed up dequeue by getting out quickly if this is just a lookup
-                        if ( data ) {
-                                if ( !queue || jQuery.isArray(data) ) {
-                                        queue = jQuery._data( elem, type, jQuery.makeArray(data) );
-                                } else {
-                                        queue.push( data );
-                                }
-                        }
-                        return queue || [];
-                }
-        },
-
-        dequeue: function( elem, type ) {
-                type = type || "fx";
-
-                var queue = jQuery.queue( elem, type ),
-                        startLength = queue.length,
-                        fn = queue.shift(),
-                        hooks = jQuery._queueHooks( elem, type ),
-                        next = function() {
-                                jQuery.dequeue( elem, type );
-                        };
-
-                // If the fx queue is dequeued, always remove the progress sentinel
-                if ( fn === "inprogress" ) {
-                        fn = queue.shift();
-                        startLength--;
-                }
-
-                if ( fn ) {
-
-                        // Add a progress sentinel to prevent the fx queue from being
-                        // automatically dequeued
-                        if ( type === "fx" ) {
-                                queue.unshift( "inprogress" );
-                        }
-
-                        // clear up the last queue stop function
-                        delete hooks.stop;
-                        fn.call( elem, next, hooks );
-                }
-
-                if ( !startLength && hooks ) {
-                        hooks.empty.fire();
-                }
-        },
-
-        // not intended for public consumption - generates a queueHooks object, or returns the current one
-        _queueHooks: function( elem, type ) {
-                var key = type + "queueHooks";
-                return jQuery._data( elem, key ) || jQuery._data( elem, key, {
-                        empty: jQuery.Callbacks("once memory").add(function() {
-                                jQuery.removeData( elem, type + "queue", true );
-                                jQuery.removeData( elem, key, true );
-                        })
-                });
-        }
-});
-
-jQuery.fn.extend({
-        queue: function( type, data ) {
-                var setter = 2;
-
-                if ( typeof type !== "string" ) {
-                        data = type;
-                        type = "fx";
-                        setter--;
-                }
-
-                if ( arguments.length < setter ) {
-                        return jQuery.queue( this[0], type );
-                }
-
-                return data === undefined ?
-                        this :
-                        this.each(function() {
-                                var queue = jQuery.queue( this, type, data );
-
-                                // ensure a hooks for this queue
-                                jQuery._queueHooks( this, type );
-
-                                if ( type === "fx" && queue[0] !== "inprogress" ) {
-                                        jQuery.dequeue( this, type );
-                                }
-                        });
-        },
-        dequeue: function( type ) {
-                return this.each(function() {
-                        jQuery.dequeue( this, type );
-                });
-        },
-        // Based off of the plugin by Clint Helfers, with permission.
-        // http://blindsignals.com/index.php/2009/07/jquery-delay/
-        delay: function( time, type ) {
-                time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time;
-                type = type || "fx";
-
-                return this.queue( type, function( next, hooks ) {
-                        var timeout = setTimeout( next, time );
-                        hooks.stop = function() {
-                                clearTimeout( timeout );
-                        };
-                });
-        },
-        clearQueue: function( type ) {
-                return this.queue( type || "fx", [] );
-        },
-        // Get a promise resolved when queues of a certain type
-        // are emptied (fx is the type by default)
-        promise: function( type, obj ) {
-                var tmp,
-                        count = 1,
-                        defer = jQuery.Deferred(),
-                        elements = this,
-                        i = this.length,
-                        resolve = function() {
-                                if ( !( --count ) ) {
-                                        defer.resolveWith( elements, [ elements ] );
-                                }
-                        };
-
-                if ( typeof type !== "string" ) {
-                        obj = type;
-                        type = undefined;
-                }
-                type = type || "fx";
-
-                while( i-- ) {
-                        tmp = jQuery._data( elements[ i ], type + "queueHooks" );
-                        if ( tmp && tmp.empty ) {
-                                count++;
-                                tmp.empty.add( resolve );
-                        }
-                }
-                resolve();
-                return defer.promise( obj );
-        }
-});
-var nodeHook, boolHook, fixSpecified,
-        rclass = /[\t\r\n]/g,
-        rreturn = /\r/g,
-        rtype = /^(?:button|input)$/i,
-        rfocusable = /^(?:button|input|object|select|textarea)$/i,
-        rclickable = /^a(?:rea|)$/i,
-        rboolean = /^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,
-        getSetAttribute = jQuery.support.getSetAttribute;
-
-jQuery.fn.extend({
-        attr: function( name, value ) {
-                return jQuery.access( this, jQuery.attr, name, value, arguments.length > 1 );
-        },
-
-        removeAttr: function( name ) {
-                return this.each(function() {
-                        jQuery.removeAttr( this, name );
-                });
-        },
-
-        prop: function( name, value ) {
-                return jQuery.access( this, jQuery.prop, name, value, arguments.length > 1 );
-        },
-
-        removeProp: function( name ) {
-                name = jQuery.propFix[ name ] || name;
-                return this.each(function() {
-                        // try/catch handles cases where IE balks (such as removing a property on window)
-                        try {
-                                this[ name ] = undefined;
-                                delete this[ name ];
-                        } catch( e ) {}
-                });
-        },
-
-        addClass: function( value ) {
-                var classNames, i, l, elem,
-                        setClass, c, cl;
-
-                if ( jQuery.isFunction( value ) ) {
-                        return this.each(function( j ) {
-                                jQuery( this ).addClass( value.call(this, j, this.className) );
-                        });
-                }
-
-                if ( value && typeof value === "string" ) {
-                        classNames = value.split( core_rspace );
-
-                        for ( i = 0, l = this.length; i < l; i++ ) {
-                                elem = this[ i ];
-
-                                if ( elem.nodeType === 1 ) {
-                                        if ( !elem.className && classNames.length === 1 ) {
-                                                elem.className = value;
-
-                                        } else {
-                                                setClass = " " + elem.className + " ";
-
-                                                for ( c = 0, cl = classNames.length; c < cl; c++ ) {
-                                                        if ( setClass.indexOf( " " + classNames[ c ] + " " ) < 0 ) {
-                                                                setClass += classNames[ c ] + " ";
-                                                        }
-                                                }
-                                                elem.className = jQuery.trim( setClass );
-                                        }
-                                }
-                        }
-                }
-
-                return this;
-        },
-
-        removeClass: function( value ) {
-                var removes, className, elem, c, cl, i, l;
-
-                if ( jQuery.isFunction( value ) ) {
-                        return this.each(function( j ) {
-                                jQuery( this ).removeClass( value.call(this, j, this.className) );
-                        });
-                }
-                if ( (value && typeof value === "string") || value === undefined ) {
-                        removes = ( value || "" ).split( core_rspace );
-
-                        for ( i = 0, l = this.length; i < l; i++ ) {
-                                elem = this[ i ];
-                                if ( elem.nodeType === 1 && elem.className ) {
-
-                                        className = (" " + elem.className + " ").replace( rclass, " " );
-
-                                        // loop over each item in the removal list
-                                        for ( c = 0, cl = removes.length; c < cl; c++ ) {
-                                                // Remove until there is nothing to remove,
-                                                while ( className.indexOf(" " + removes[ c ] + " ") >= 0 ) {
-                                                        className = className.replace( " " + removes[ c ] + " " , " " );
-                                                }
-                                        }
-                                        elem.className = value ? jQuery.trim( className ) : "";
-                                }
-                        }
-                }
-
-                return this;
-        },
-
-        toggleClass: function( value, stateVal ) {
-                var type = typeof value,
-                        isBool = typeof stateVal === "boolean";
-
-                if ( jQuery.isFunction( value ) ) {
-                        return this.each(function( i ) {
-                                jQuery( this ).toggleClass( value.call(this, i, this.className, stateVal), stateVal );
-                        });
-                }
-
-                return this.each(function() {
-                        if ( type === "string" ) {
-                                // toggle individual class names
-                                var className,
-                                        i = 0,
-                                        self = jQuery( this ),
-                                        state = stateVal,
-                                        classNames = value.split( core_rspace );
-
-                                while ( (className = classNames[ i++ ]) ) {
-                                        // check each className given, space separated list
-                                        state = isBool ? state : !self.hasClass( className );
-                                        self[ state ? "addClass" : "removeClass" ]( className );
-                                }
-
-                        } else if ( type === "undefined" || type === "boolean" ) {
-                                if ( this.className ) {
-                                        // store className if set
-                                        jQuery._data( this, "__className__", this.className );
-                                }
-
-                                // toggle whole className
-                                this.className = this.className || value === false ? "" : jQuery._data( this, "__className__" ) || "";
-                        }
-                });
-        },
-
-        hasClass: function( selector ) {
-                var className = " " + selector + " ",
-                        i = 0,
-                        l = this.length;
-                for ( ; i < l; i++ ) {
-                        if ( this[i].nodeType === 1 && (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) >= 0 ) {
-                                return true;
-                        }
-                }
-
-                return false;
-        },
-
-        val: function( value ) {
-                var hooks, ret, isFunction,
-                        elem = this[0];
-
-                if ( !arguments.length ) {
-                        if ( elem ) {
-                                hooks = jQuery.valHooks[ elem.type ] || jQuery.valHooks[ elem.nodeName.toLowerCase() ];
-
-                                if ( hooks && "get" in hooks && (ret = hooks.get( elem, "value" )) !== undefined ) {
-                                        return ret;
-                                }
-
-                                ret = elem.value;
-
-                                return typeof ret === "string" ?
-                                        // handle most common string cases
-                                        ret.replace(rreturn, "") :
-                                        // handle cases where value is null/undef or number
-                                        ret == null ? "" : ret;
-                        }
-
-                        return;
-                }
-
-                isFunction = jQuery.isFunction( value );
-
-                return this.each(function( i ) {
-                        var val,
-                                self = jQuery(this);
-
-                        if ( this.nodeType !== 1 ) {
-                                return;
-                        }
-
-                        if ( isFunction ) {
-                                val = value.call( this, i, self.val() );
-                        } else {
-                                val = value;
-                        }
-
-                        // Treat null/undefined as ""; convert numbers to string
-                        if ( val == null ) {
-                                val = "";
-                        } else if ( typeof val === "number" ) {
-                                val += "";
-                        } else if ( jQuery.isArray( val ) ) {
-                                val = jQuery.map(val, function ( value ) {
-                                        return value == null ? "" : value + "";
-                                });
-                        }
-
-                        hooks = jQuery.valHooks[ this.type ] || jQuery.valHooks[ this.nodeName.toLowerCase() ];
-
-                        // If set returns undefined, fall back to normal setting
-                        if ( !hooks || !("set" in hooks) || hooks.set( this, val, "value" ) === undefined ) {
-                                this.value = val;
-                        }
-                });
-        }
-});
-
-jQuery.extend({
-        valHooks: {
-                option: {
-                        get: function( elem ) {
-                                // attributes.value is undefined in Blackberry 4.7 but
-                                // uses .value. See #6932
-                                var val = elem.attributes.value;
-                                return !val || val.specified ? elem.value : elem.text;
-                        }
-                },
-                select: {
-                        get: function( elem ) {
-                                var value, option,
-                                        options = elem.options,
-                                        index = elem.selectedIndex,
-                                        one = elem.type === "select-one" || index < 0,
-                                        values = one ? null : [],
-                                        max = one ? index + 1 : options.length,
-                                        i = index < 0 ?
-                                                max :
-                                                one ? index : 0;
-
-                                // Loop through all the selected options
-                                for ( ; i < max; i++ ) {
-                                        option = options[ i ];
-
-                                        // oldIE doesn't update selected after form reset (#2551)
-                                        if ( ( option.selected || i === index ) &&
-                                                        // Don't return options that are disabled or in a disabled optgroup
-                                                        ( jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null ) &&
-                                                        ( !option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" ) ) ) {
-
-                                                // Get the specific value for the option
-                                                value = jQuery( option ).val();
-
-                                                // We don't need an array for one selects
-                                                if ( one ) {
-                                                        return value;
-                                                }
-
-                                                // Multi-Selects return an array
-                                                values.push( value );
-                                        }
-                                }
-
-                                return values;
-                        },
-
-                        set: function( elem, value ) {
-                                var values = jQuery.makeArray( value );
-
-                                jQuery(elem).find("option").each(function() {
-                                        this.selected = jQuery.inArray( jQuery(this).val(), values ) >= 0;
-                                });
-
-                                if ( !values.length ) {
-                                        elem.selectedIndex = -1;
-                                }
-                                return values;
-                        }
-                }
-        },
-
-        // Unused in 1.8, left in so attrFn-stabbers won't die; remove in 1.9
-        attrFn: {},
-
-        attr: function( elem, name, value, pass ) {
-                var ret, hooks, notxml,
-                        nType = elem.nodeType;
-
-                // don't get/set attributes on text, comment and attribute nodes
-                if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
-                        return;
-                }
-
-                if ( pass && jQuery.isFunction( jQuery.fn[ name ] ) ) {
-                        return jQuery( elem )[ name ]( value );
-                }
-
-                // Fallback to prop when attributes are not supported
-                if ( typeof elem.getAttribute === "undefined" ) {
-                        return jQuery.prop( elem, name, value );
-                }
-
-                notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
-
-                // All attributes are lowercase
-                // Grab necessary hook if one is defined
-                if ( notxml ) {
-                        name = name.toLowerCase();
-                        hooks = jQuery.attrHooks[ name ] || ( rboolean.test( name ) ? boolHook : nodeHook );
-                }
-
-                if ( value !== undefined ) {
-
-                        if ( value === null ) {
-                                jQuery.removeAttr( elem, name );
-                                return;
-
-                        } else if ( hooks && "set" in hooks && notxml && (ret = hooks.set( elem, value, name )) !== undefined ) {
-                                return ret;
-
-                        } else {
-                                elem.setAttribute( name, value + "" );
-                                return value;
-                        }
-
-                } else if ( hooks && "get" in hooks && notxml && (ret = hooks.get( elem, name )) !== null ) {
-                        return ret;
-
-                } else {
-
-                        ret = elem.getAttribute( name );
-
-                        // Non-existent attributes return null, we normalize to undefined
-                        return ret === null ?
-                                undefined :
-                                ret;
-                }
-        },
-
-        removeAttr: function( elem, value ) {
-                var propName, attrNames, name, isBool,
-                        i = 0;
-
-                if ( value && elem.nodeType === 1 ) {
-
-                        attrNames = value.split( core_rspace );
-
-                        for ( ; i < attrNames.length; i++ ) {
-                                name = attrNames[ i ];
-
-                                if ( name ) {
-                                        propName = jQuery.propFix[ name ] || name;
-                                        isBool = rboolean.test( name );
-
-                                        // See #9699 for explanation of this approach (setting first, then removal)
-                                        // Do not do this for boolean attributes (see #10870)
-                                        if ( !isBool ) {
-                                                jQuery.attr( elem, name, "" );
-                                        }
-                                        elem.removeAttribute( getSetAttribute ? name : propName );
-
-                                        // Set corresponding property to false for boolean attributes
-                                        if ( isBool && propName in elem ) {
-                                                elem[ propName ] = false;
-                                        }
-                                }
-                        }
-                }
-        },
-
-        attrHooks: {
-                type: {
-                        set: function( elem, value ) {
-                                // We can't allow the type property to be changed (since it causes problems in IE)
-                                if ( rtype.test( elem.nodeName ) && elem.parentNode ) {
-                                        jQuery.error( "type property can't be changed" );
-                                } else if ( !jQuery.support.radioValue && value === "radio" && jQuery.nodeName(elem, "input") ) {
-                                        // Setting the type on a radio button after the value resets the value in IE6-9
-                                        // Reset value to it's default in case type is set after value
-                                        // This is for element creation
-                                        var val = elem.value;
-                                        elem.setAttribute( "type", value );
-                                        if ( val ) {
-                                                elem.value = val;
-                                        }
-                                        return value;
-                                }
-                        }
-                },
-                // Use the value property for back compat
-                // Use the nodeHook for button elements in IE6/7 (#1954)
-                value: {
-                        get: function( elem, name ) {
-                                if ( nodeHook && jQuery.nodeName( elem, "button" ) ) {
-                                        return nodeHook.get( elem, name );
-                                }
-                                return name in elem ?
-                                        elem.value :
-                                        null;
-                        },
-                        set: function( elem, value, name ) {
-                                if ( nodeHook && jQuery.nodeName( elem, "button" ) ) {
-                                        return nodeHook.set( elem, value, name );
-                                }
-                                // Does not return so that setAttribute is also used
-                                elem.value = value;
-                        }
-                }
-        },
-
-        propFix: {
-                tabindex: "tabIndex",
-                readonly: "readOnly",
-                "for": "htmlFor",
-                "class": "className",
-                maxlength: "maxLength",
-                cellspacing: "cellSpacing",
-                cellpadding: "cellPadding",
-                rowspan: "rowSpan",
-                colspan: "colSpan",
-                usemap: "useMap",
-                frameborder: "frameBorder",
-                contenteditable: "contentEditable"
-        },
-
-        prop: function( elem, name, value ) {
-                var ret, hooks, notxml,
-                        nType = elem.nodeType;
-
-                // don't get/set properties on text, comment and attribute nodes
-                if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
-                        return;
-                }
-
-                notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
-
-                if ( notxml ) {
-                        // Fix name and attach hooks
-                        name = jQuery.propFix[ name ] || name;
-                        hooks = jQuery.propHooks[ name ];
-                }
-
-                if ( value !== undefined ) {
-                        if ( hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) {
-                                return ret;
-
-                        } else {
-                                return ( elem[ name ] = value );
-                        }
-
-                } else {
-                        if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ) {
-                                return ret;
-
-                        } else {
-                                return elem[ name ];
-                        }
-                }
-        },
-
-        propHooks: {
-                tabIndex: {
-                        get: function( elem ) {
-                                // elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
-                                // http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
-                                var attributeNode = elem.getAttributeNode("tabindex");
-
-                                return attributeNode && attributeNode.specified ?
-                                        parseInt( attributeNode.value, 10 ) :
-                                        rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
-                                                0 :
-                                                undefined;
-                        }
-                }
-        }
-});
-
-// Hook for boolean attributes
-boolHook = {
-        get: function( elem, name ) {
-                // Align boolean attributes with corresponding properties
-                // Fall back to attribute presence where some booleans are not supported
-                var attrNode,
-                        property = jQuery.prop( elem, name );
-                return property === true || typeof property !== "boolean" && ( attrNode = elem.getAttributeNode(name) ) && attrNode.nodeValue !== false ?
-                        name.toLowerCase() :
-                        undefined;
-        },
-        set: function( elem, value, name ) {
-                var propName;
-                if ( value === false ) {
-                        // Remove boolean attributes when set to false
-                        jQuery.removeAttr( elem, name );
-                } else {
-                        // value is true since we know at this point it's type boolean and not false
-                        // Set boolean attributes to the same name and set the DOM property
-                        propName = jQuery.propFix[ name ] || name;
-                        if ( propName in elem ) {
-                                // Only set the IDL specifically if it already exists on the element
-                                elem[ propName ] = true;
-                        }
-
-                        elem.setAttribute( name, name.toLowerCase() );
-                }
-                return name;
-        }
-};
-
-// IE6/7 do not support getting/setting some attributes with get/setAttribute
-if ( !getSetAttribute ) {
-
-        fixSpecified = {
-                name: true,
-                id: true,
-                coords: true
-        };
-
-        // Use this for any attribute in IE6/7
-        // This fixes almost every IE6/7 issue
-        nodeHook = jQuery.valHooks.button = {
-                get: function( elem, name ) {
-                        var ret;
-                        ret = elem.getAttributeNode( name );
-                        return ret && ( fixSpecified[ name ] ? ret.value !== "" : ret.specified ) ?
-                                ret.value :
-                                undefined;
-                },
-                set: function( elem, value, name ) {
-                        // Set the existing or create a new attribute node
-                        var ret = elem.getAttributeNode( name );
-                        if ( !ret ) {
-                                ret = document.createAttribute( name );
-                                elem.setAttributeNode( ret );
-                        }
-                        return ( ret.value = value + "" );
-                }
-        };
-
-        // Set width and height to auto instead of 0 on empty string( Bug #8150 )
-        // This is for removals
-        jQuery.each([ "width", "height" ], function( i, name ) {
-                jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], {
-                        set: function( elem, value ) {
-                                if ( value === "" ) {
-                                        elem.setAttribute( name, "auto" );
-                                        return value;
-                                }
-                        }
-                });
-        });
-
-        // Set contenteditable to false on removals(#10429)
-        // Setting to empty string throws an error as an invalid value
-        jQuery.attrHooks.contenteditable = {
-                get: nodeHook.get,
-                set: function( elem, value, name ) {
-                        if ( value === "" ) {
-                                value = "false";
-                        }
-                        nodeHook.set( elem, value, name );
-                }
-        };
-}
-
-
-// Some attributes require a special call on IE
-if ( !jQuery.support.hrefNormalized ) {
-        jQuery.each([ "href", "src", "width", "height" ], function( i, name ) {
-                jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], {
-                        get: function( elem ) {
-                                var ret = elem.getAttribute( name, 2 );
-                                return ret === null ? undefined : ret;
-                        }
-                });
-        });
-}
-
-if ( !jQuery.support.style ) {
-        jQuery.attrHooks.style = {
-                get: function( elem ) {
-                        // Return undefined in the case of empty string
-                        // Normalize to lowercase since IE uppercases css property names
-                        return elem.style.cssText.toLowerCase() || undefined;
-                },
-                set: function( elem, value ) {
-                        return ( elem.style.cssText = value + "" );
-                }
-        };
-}
-
-// Safari mis-reports the default selected property of an option
-// Accessing the parent's selectedIndex property fixes it
-if ( !jQuery.support.optSelected ) {
-        jQuery.propHooks.selected = jQuery.extend( jQuery.propHooks.selected, {
-                get: function( elem ) {
-                        var parent = elem.parentNode;
-
-                        if ( parent ) {
-                                parent.selectedIndex;
-
-                                // Make sure that it also works with optgroups, see #5701
-                                if ( parent.parentNode ) {
-                                        parent.parentNode.selectedIndex;
-                                }
-                        }
-                        return null;
-                }
-        });
-}
-
-// IE6/7 call enctype encoding
-if ( !jQuery.support.enctype ) {
-        jQuery.propFix.enctype = "encoding";
-}
-
-// Radios and checkboxes getter/setter
-if ( !jQuery.support.checkOn ) {
-        jQuery.each([ "radio", "checkbox" ], function() {
-                jQuery.valHooks[ this ] = {
-                        get: function( elem ) {
-                                // Handle the case where in Webkit "" is returned instead of "on" if a value isn't specified
-                                return elem.getAttribute("value") === null ? "on" : elem.value;
-                        }
-                };
-        });
-}
-jQuery.each([ "radio", "checkbox" ], function() {
-        jQuery.valHooks[ this ] = jQuery.extend( jQuery.valHooks[ this ], {
-                set: function( elem, value ) {
-                        if ( jQuery.isArray( value ) ) {
-                                return ( elem.checked = jQuery.inArray( jQuery(elem).val(), value ) >= 0 );
-                        }
-                }
-        });
-});
-var rformElems = /^(?:textarea|input|select)$/i,
-        rtypenamespace = /^([^\.]*|)(?:\.(.+)|)$/,
-        rhoverHack = /(?:^|\s)hover(\.\S+|)\b/,
-        rkeyEvent = /^key/,
-        rmouseEvent = /^(?:mouse|contextmenu)|click/,
-        rfocusMorph = /^(?:focusinfocus|focusoutblur)$/,
-        hoverHack = function( events ) {
-                return jQuery.event.special.hover ? events : events.replace( rhoverHack, "mouseenter$1 mouseleave$1" );
-        };
-
-/*
- * Helper functions for managing events -- not part of the public interface.
- * Props to Dean Edwards' addEvent library for many of the ideas.
- */
-jQuery.event = {
-
-        add: function( elem, types, handler, data, selector ) {
-
-                var elemData, eventHandle, events,
-                        t, tns, type, namespaces, handleObj,
-                        handleObjIn, handlers, special;
-
-                // Don't attach events to noData or text/comment nodes (allow plain objects tho)
-                if ( elem.nodeType === 3 || elem.nodeType === 8 || !types || !handler || !(elemData = jQuery._data( elem )) ) {
-                        return;
-                }
-
-                // Caller can pass in an object of custom data in lieu of the handler
-                if ( handler.handler ) {
-                        handleObjIn = handler;
-                        handler = handleObjIn.handler;
-                        selector = handleObjIn.selector;
-                }
-
-                // Make sure that the handler has a unique ID, used to find/remove it later
-                if ( !handler.guid ) {
-                        handler.guid = jQuery.guid++;
-                }
-
-                // Init the element's event structure and main handler, if this is the first
-                events = elemData.events;
-                if ( !events ) {
-                        elemData.events = events = {};
-                }
-                eventHandle = elemData.handle;
-                if ( !eventHandle ) {
-                        elemData.handle = eventHandle = function( e ) {
-                                // Discard the second event of a jQuery.event.trigger() and
-                                // when an event is called after a page has unloaded
-                                return typeof jQuery !== "undefined" && (!e || jQuery.event.triggered !== e.type) ?
-                                        jQuery.event.dispatch.apply( eventHandle.elem, arguments ) :
-                                        undefined;
-                        };
-                        // Add elem as a property of the handle fn to prevent a memory leak with IE non-native events
-                        eventHandle.elem = elem;
-                }
-
-                // Handle multiple events separated by a space
-                // jQuery(...).bind("mouseover mouseout", fn);
-                types = jQuery.trim( hoverHack(types) ).split( " " );
-                for ( t = 0; t < types.length; t++ ) {
-
-                        tns = rtypenamespace.exec( types[t] ) || [];
-                        type = tns[1];
-                        namespaces = ( tns[2] || "" ).split( "." ).sort();
-
-                        // If event changes its type, use the special event handlers for the changed type
-                        special = jQuery.event.special[ type ] || {};
-
-                        // If selector defined, determine special event api type, otherwise given type
-                        type = ( selector ? special.delegateType : special.bindType ) || type;
-
-                        // Update special based on newly reset type
-                        special = jQuery.event.special[ type ] || {};
-
-                        // handleObj is passed to all event handlers
-                        handleObj = jQuery.extend({
-                                type: type,
-                                origType: tns[1],
-                                data: data,
-                                handler: handler,
-                                guid: handler.guid,
-                                selector: selector,
-                                needsContext: selector && jQuery.expr.match.needsContext.test( selector ),
-                                namespace: namespaces.join(".")
-                        }, handleObjIn );
-
-                        // Init the event handler queue if we're the first
-                        handlers = events[ type ];
-                        if ( !handlers ) {
-                                handlers = events[ type ] = [];
-                                handlers.delegateCount = 0;
-
-                                // Only use addEventListener/attachEvent if the special events handler returns false
-                                if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
-                                        // Bind the global event handler to the element
-                                        if ( elem.addEventListener ) {
-                                                elem.addEventListener( type, eventHandle, false );
-
-                                        } else if ( elem.attachEvent ) {
-                                                elem.attachEvent( "on" + type, eventHandle );
-                                        }
-                                }
-                        }
-
-                        if ( special.add ) {
-                                special.add.call( elem, handleObj );
-
-                                if ( !handleObj.handler.guid ) {
-                                        handleObj.handler.guid = handler.guid;
-                                }
-                        }
-
-                        // Add to the element's handler list, delegates in front
-                        if ( selector ) {
-                                handlers.splice( handlers.delegateCount++, 0, handleObj );
-                        } else {
-                                handlers.push( handleObj );
-                        }
-
-                        // Keep track of which events have ever been used, for event optimization
-                        jQuery.event.global[ type ] = true;
-                }
-
-                // Nullify elem to prevent memory leaks in IE
-                elem = null;
-        },
-
-        global: {},
-
-        // Detach an event or set of events from an element
-        remove: function( elem, types, handler, selector, mappedTypes ) {
-
-                var t, tns, type, origType, namespaces, origCount,
-                        j, events, special, eventType, handleObj,
-                        elemData = jQuery.hasData( elem ) && jQuery._data( elem );
-
-                if ( !elemData || !(events = elemData.events) ) {
-                        return;
-                }
-
-                // Once for each type.namespace in types; type may be omitted
-                types = jQuery.trim( hoverHack( types || "" ) ).split(" ");
-                for ( t = 0; t < types.length; t++ ) {
-                        tns = rtypenamespace.exec( types[t] ) || [];
-                        type = origType = tns[1];
-                        namespaces = tns[2];
-
-                        // Unbind all events (on this namespace, if provided) for the element
-                        if ( !type ) {
-                                for ( type in events ) {
-                                        jQuery.event.remove( elem, type + types[ t ], handler, selector, true );
-                                }
-                                continue;
-                        }
-
-                        special = jQuery.event.special[ type ] || {};
-                        type = ( selector? special.delegateType : special.bindType ) || type;
-                        eventType = events[ type ] || [];
-                        origCount = eventType.length;
-                        namespaces = namespaces ? new RegExp("(^|\\.)" + namespaces.split(".").sort().join("\\.(?:.*\\.|)") + "(\\.|$)") : null;
-
-                        // Remove matching events
-                        for ( j = 0; j < eventType.length; j++ ) {
-                                handleObj = eventType[ j ];
-
-                                if ( ( mappedTypes || origType === handleObj.origType ) &&
-                                         ( !handler || handler.guid === handleObj.guid ) &&
-                                         ( !namespaces || namespaces.test( handleObj.namespace ) ) &&
-                                         ( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) {
-                                        eventType.splice( j--, 1 );
-
-                                        if ( handleObj.selector ) {
-                                                eventType.delegateCount--;
-                                        }
-                                        if ( special.remove ) {
-                                                special.remove.call( elem, handleObj );
-                                        }
-                                }
-                        }
-
-                        // Remove generic event handler if we removed something and no more handlers exist
-                        // (avoids potential for endless recursion during removal of special event handlers)
-                        if ( eventType.length === 0 && origCount !== eventType.length ) {
-                                if ( !special.teardown || special.teardown.call( elem, namespaces, elemData.handle ) === false ) {
-                                        jQuery.removeEvent( elem, type, elemData.handle );
-                                }
-
-                                delete events[ type ];
-                        }
-                }
-
-                // Remove the expando if it's no longer used
-                if ( jQuery.isEmptyObject( events ) ) {
-                        delete elemData.handle;
-
-                        // removeData also checks for emptiness and clears the expando if empty
-                        // so use it instead of delete
-                        jQuery.removeData( elem, "events", true );
-                }
-        },
-
-        // Events that are safe to short-circuit if no handlers are attached.
-        // Native DOM events should not be added, they may have inline handlers.
-        customEvent: {
-                "getData": true,
-                "setData": true,
-                "changeData": true
-        },
-
-        trigger: function( event, data, elem, onlyHandlers ) {
-                // Don't do events on text and comment nodes
-                if ( elem && (elem.nodeType === 3 || elem.nodeType === 8) ) {
-                        return;
-                }
-
-                // Event object or event type
-                var cache, exclusive, i, cur, old, ontype, special, handle, eventPath, bubbleType,
-                        type = event.type || event,
-                        namespaces = [];
-
-                // focus/blur morphs to focusin/out; ensure we're not firing them right now
-                if ( rfocusMorph.test( type + jQuery.event.triggered ) ) {
-                        return;
-                }
-
-                if ( type.indexOf( "!" ) >= 0 ) {
-                        // Exclusive events trigger only for the exact event (no namespaces)
-                        type = type.slice(0, -1);
-                        exclusive = true;
-                }
-
-                if ( type.indexOf( "." ) >= 0 ) {
-                        // Namespaced trigger; create a regexp to match event type in handle()
-                        namespaces = type.split(".");
-                        type = namespaces.shift();
-                        namespaces.sort();
-                }
-
-                if ( (!elem || jQuery.event.customEvent[ type ]) && !jQuery.event.global[ type ] ) {
-                        // No jQuery handlers for this event type, and it can't have inline handlers
-                        return;
-                }
-
-                // Caller can pass in an Event, Object, or just an event type string
-                event = typeof event === "object" ?
-                        // jQuery.Event object
-                        event[ jQuery.expando ] ? event :
-                        // Object literal
-                        new jQuery.Event( type, event ) :
-                        // Just the event type (string)
-                        new jQuery.Event( type );
-
-                event.type = type;
-                event.isTrigger = true;
-                event.exclusive = exclusive;
-                event.namespace = namespaces.join( "." );
-                event.namespace_re = event.namespace? new RegExp("(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)") : null;
-                ontype = type.indexOf( ":" ) < 0 ? "on" + type : "";
-
-                // Handle a global trigger
-                if ( !elem ) {
-
-                        // TODO: Stop taunting the data cache; remove global events and always attach to document
-                        cache = jQuery.cache;
-                        for ( i in cache ) {
-                                if ( cache[ i ].events && cache[ i ].events[ type ] ) {
-                                        jQuery.event.trigger( event, data, cache[ i ].handle.elem, true );
-                                }
-                        }
-                        return;
-                }
-
-                // Clean up the event in case it is being reused
-                event.result = undefined;
-                if ( !event.target ) {
-                        event.target = elem;
-                }
-
-                // Clone any incoming data and prepend the event, creating the handler arg list
-                data = data != null ? jQuery.makeArray( data ) : [];
-                data.unshift( event );
-
-                // Allow special events to draw outside the lines
-                special = jQuery.event.special[ type ] || {};
-                if ( special.trigger && special.trigger.apply( elem, data ) === false ) {
-                        return;
-                }
-
-                // Determine event propagation path in advance, per W3C events spec (#9951)
-                // Bubble up to document, then to window; watch for a global ownerDocument var (#9724)
-                eventPath = [[ elem, special.bindType || type ]];
-                if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) {
-
-                        bubbleType = special.delegateType || type;
-                        cur = rfocusMorph.test( bubbleType + type ) ? elem : elem.parentNode;
-                        for ( old = elem; cur; cur = cur.parentNode ) {
-                                eventPath.push([ cur, bubbleType ]);
-                                old = cur;
-                        }
-
-                        // Only add window if we got to document (e.g., not plain obj or detached DOM)
-                        if ( old === (elem.ownerDocument || document) ) {
-                                eventPath.push([ old.defaultView || old.parentWindow || window, bubbleType ]);
-                        }
-                }
-
-                // Fire handlers on the event path
-                for ( i = 0; i < eventPath.length && !event.isPropagationStopped(); i++ ) {
-
-                        cur = eventPath[i][0];
-                        event.type = eventPath[i][1];
-
-                        handle = ( jQuery._data( cur, "events" ) || {} )[ event.type ] && jQuery._data( cur, "handle" );
-                        if ( handle ) {
-                                handle.apply( cur, data );
-                        }
-                        // Note that this is a bare JS function and not a jQuery handler
-                        handle = ontype && cur[ ontype ];
-                        if ( handle && jQuery.acceptData( cur ) && handle.apply && handle.apply( cur, data ) === false ) {
-                                event.preventDefault();
-                        }
-                }
-                event.type = type;
-
-                // If nobody prevented the default action, do it now
-                if ( !onlyHandlers && !event.isDefaultPrevented() ) {
-
-                        if ( (!special._default || special._default.apply( elem.ownerDocument, data ) === false) &&
-                                !(type === "click" && jQuery.nodeName( elem, "a" )) && jQuery.acceptData( elem ) ) {
-
-                                // Call a native DOM method on the target with the same name name as the event.
-                                // Can't use an .isFunction() check here because IE6/7 fails that test.
-                                // Don't do default actions on window, that's where global variables be (#6170)
-                                // IE<9 dies on focus/blur to hidden element (#1486)
-                                if ( ontype && elem[ type ] && ((type !== "focus" && type !== "blur") || event.target.offsetWidth !== 0) && !jQuery.isWindow( elem ) ) {
-
-                                        // Don't re-trigger an onFOO event when we call its FOO() method
-                                        old = elem[ ontype ];
-
-                                        if ( old ) {
-                                                elem[ ontype ] = null;
-                                        }
-
-                                        // Prevent re-triggering of the same event, since we already bubbled it above
-                                        jQuery.event.triggered = type;
-                                        elem[ type ]();
-                                        jQuery.event.triggered = undefined;
-
-                                        if ( old ) {
-                                                elem[ ontype ] = old;
-                                        }
-                                }
-                        }
-                }
-
-                return event.result;
-        },
-
-        dispatch: function( event ) {
-
-                // Make a writable jQuery.Event from the native event object
-                event = jQuery.event.fix( event || window.event );
-
-                var i, j, cur, ret, selMatch, matched, matches, handleObj, sel, related,
-                        handlers = ( (jQuery._data( this, "events" ) || {} )[ event.type ] || []),
-                        delegateCount = handlers.delegateCount,
-                        args = core_slice.call( arguments ),
-                        run_all = !event.exclusive && !event.namespace,
-                        special = jQuery.event.special[ event.type ] || {},
-                        handlerQueue = [];
-
-                // Use the fix-ed jQuery.Event rather than the (read-only) native event
-                args[0] = event;
-                event.delegateTarget = this;
-
-                // Call the preDispatch hook for the mapped type, and let it bail if desired
-                if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) {
-                        return;
-                }
-
-                // Determine handlers that should run if there are delegated events
-                // Avoid non-left-click bubbling in Firefox (#3861)
-                if ( delegateCount && !(event.button && event.type === "click") ) {
-
-                        for ( cur = event.target; cur != this; cur = cur.parentNode || this ) {
-
-                                // Don't process clicks (ONLY) on disabled elements (#6911, #8165, #11382, #11764)
-                                if ( cur.disabled !== true || event.type !== "click" ) {
-                                        selMatch = {};
-                                        matches = [];
-                                        for ( i = 0; i < delegateCount; i++ ) {
-                                                handleObj = handlers[ i ];
-                                                sel = handleObj.selector;
-
-                                                if ( selMatch[ sel ] === undefined ) {
-                                                        selMatch[ sel ] = handleObj.needsContext ?
-                                                                jQuery( sel, this ).index( cur ) >= 0 :
-                                                                jQuery.find( sel, this, null, [ cur ] ).length;
-                                                }
-                                                if ( selMatch[ sel ] ) {
-                                                        matches.push( handleObj );
-                                                }
-                                        }
-                                        if ( matches.length ) {
-                                                handlerQueue.push({ elem: cur, matches: matches });
-                                        }
-                                }
-                        }
-                }
-
-                // Add the remaining (directly-bound) handlers
-                if ( handlers.length > delegateCount ) {
-                        handlerQueue.push({ elem: this, matches: handlers.slice( delegateCount ) });
-                }
-
-                // Run delegates first; they may want to stop propagation beneath us
-                for ( i = 0; i < handlerQueue.length && !event.isPropagationStopped(); i++ ) {
-                        matched = handlerQueue[ i ];
-                        event.currentTarget = matched.elem;
-
-                        for ( j = 0; j < matched.matches.length && !event.isImmediatePropagationStopped(); j++ ) {
-                                handleObj = matched.matches[ j ];
-
-                                // Triggered event must either 1) be non-exclusive and have no namespace, or
-                                // 2) have namespace(s) a subset or equal to those in the bound event (both can have no namespace).
-                                if ( run_all || (!event.namespace && !handleObj.namespace) || event.namespace_re && event.namespace_re.test( handleObj.namespace ) ) {
-
-                                        event.data = handleObj.data;
-                                        event.handleObj = handleObj;
-
-                                        ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || handleObj.handler )
-                                                        .apply( matched.elem, args );
-
-                                        if ( ret !== undefined ) {
-                                                event.result = ret;
-                                                if ( ret === false ) {
-                                                        event.preventDefault();
-                                                        event.stopPropagation();
-                                                }
-                                        }
-                                }
-                        }
-                }
-
-                // Call the postDispatch hook for the mapped type
-                if ( special.postDispatch ) {
-                        special.postDispatch.call( this, event );
-                }
-
-                return event.result;
-        },
-
-        // Includes some event props shared by KeyEvent and MouseEvent
-        // *** attrChange attrName relatedNode srcElement  are not normalized, non-W3C, deprecated, will be removed in 1.8 ***
-        props: "attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),
-
-        fixHooks: {},
-
-        keyHooks: {
-                props: "char charCode key keyCode".split(" "),
-                filter: function( event, original ) {
-
-                        // Add which for key events
-                        if ( event.which == null ) {
-                                event.which = original.charCode != null ? original.charCode : original.keyCode;
-                        }
-
-                        return event;
-                }
-        },
-
-        mouseHooks: {
-                props: "button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),
-                filter: function( event, original ) {
-                        var eventDoc, doc, body,
-                                button = original.button,
-                                fromElement = original.fromElement;
-
-                        // Calculate pageX/Y if missing and clientX/Y available
-                        if ( event.pageX == null && original.clientX != null ) {
-                                eventDoc = event.target.ownerDocument || document;
-                                doc = eventDoc.documentElement;
-                                body = eventDoc.body;
-
-                                event.pageX = original.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && body.clientLeft || 0 );
-                                event.pageY = original.clientY + ( doc && doc.scrollTop  || body && body.scrollTop  || 0 ) - ( doc && doc.clientTop  || body && body.clientTop  || 0 );
-                        }
-
-                        // Add relatedTarget, if necessary
-                        if ( !event.relatedTarget && fromElement ) {
-                                event.relatedTarget = fromElement === event.target ? original.toElement : fromElement;
-                        }
-
-                        // Add which for click: 1 === left; 2 === middle; 3 === right
-                        // Note: button is not normalized, so don't use it
-                        if ( !event.which && button !== undefined ) {
-                                event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) );
-                        }
-
-                        return event;
-                }
-        },
-
-        fix: function( event ) {
-                if ( event[ jQuery.expando ] ) {
-                        return event;
-                }
-
-                // Create a writable copy of the event object and normalize some properties
-                var i, prop,
-                        originalEvent = event,
-                        fixHook = jQuery.event.fixHooks[ event.type ] || {},
-                        copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props;
-
-                event = jQuery.Event( originalEvent );
-
-                for ( i = copy.length; i; ) {
-                        prop = copy[ --i ];
-                        event[ prop ] = originalEvent[ prop ];
-                }
-
-                // Fix target property, if necessary (#1925, IE 6/7/8 & Safari2)
-                if ( !event.target ) {
-                        event.target = originalEvent.srcElement || document;
-                }
-
-                // Target should not be a text node (#504, Safari)
-                if ( event.target.nodeType === 3 ) {
-                        event.target = event.target.parentNode;
-                }
-
-                // For mouse/key events, metaKey==false if it's undefined (#3368, #11328; IE6/7/8)
-                event.metaKey = !!event.metaKey;
-
-                return fixHook.filter? fixHook.filter( event, originalEvent ) : event;
-        },
-
-        special: {
-                load: {
-                        // Prevent triggered image.load events from bubbling to window.load
-                        noBubble: true
-                },
-
-                focus: {
-                        delegateType: "focusin"
-                },
-                blur: {
-                        delegateType: "focusout"
-                },
-
-                beforeunload: {
-                        setup: function( data, namespaces, eventHandle ) {
-                                // We only want to do this special case on windows
-                                if ( jQuery.isWindow( this ) ) {
-                                        this.onbeforeunload = eventHandle;
-                                }
-                        },
-
-                        teardown: function( namespaces, eventHandle ) {
-                                if ( this.onbeforeunload === eventHandle ) {
-                                        this.onbeforeunload = null;
-                                }
-                        }
-                }
-        },
-
-        simulate: function( type, elem, event, bubble ) {
-                // Piggyback on a donor event to simulate a different one.
-                // Fake originalEvent to avoid donor's stopPropagation, but if the
-                // simulated event prevents default then we do the same on the donor.
-                var e = jQuery.extend(
-                        new jQuery.Event(),
-                        event,
-                        { type: type,
-                                isSimulated: true,
-                                originalEvent: {}
-                        }
-                );
-                if ( bubble ) {
-                        jQuery.event.trigger( e, null, elem );
-                } else {
-                        jQuery.event.dispatch.call( elem, e );
-                }
-                if ( e.isDefaultPrevented() ) {
-                        event.preventDefault();
-                }
-        }
-};
-
-// Some plugins are using, but it's undocumented/deprecated and will be removed.
-// The 1.7 special event interface should provide all the hooks needed now.
-jQuery.event.handle = jQuery.event.dispatch;
-
-jQuery.removeEvent = document.removeEventListener ?
-        function( elem, type, handle ) {
-                if ( elem.removeEventListener ) {
-                        elem.removeEventListener( type, handle, false );
-                }
-        } :
-        function( elem, type, handle ) {
-                var name = "on" + type;
-
-                if ( elem.detachEvent ) {
-
-                        // #8545, #7054, preventing memory leaks for custom events in IE6-8
-                        // detachEvent needed property on element, by name of that event, to properly expose it to GC
-                        if ( typeof elem[ name ] === "undefined" ) {
-                                elem[ name ] = null;
-                        }
-
-                        elem.detachEvent( name, handle );
-                }
-        };
-
-jQuery.Event = function( src, props ) {
-        // Allow instantiation without the 'new' keyword
-        if ( !(this instanceof jQuery.Event) ) {
-                return new jQuery.Event( src, props );
-        }
-
-        // Event object
-        if ( src && src.type ) {
-                this.originalEvent = src;
-                this.type = src.type;
-
-                // Events bubbling up the document may have been marked as prevented
-                // by a handler lower down the tree; reflect the correct value.
-                this.isDefaultPrevented = ( src.defaultPrevented || src.returnValue === false ||
-                        src.getPreventDefault && src.getPreventDefault() ) ? returnTrue : returnFalse;
-
-        // Event type
-        } else {
-                this.type = src;
-        }
-
-        // Put explicitly provided properties onto the event object
-        if ( props ) {
-                jQuery.extend( this, props );
-        }
-
-        // Create a timestamp if incoming event doesn't have one
-        this.timeStamp = src && src.timeStamp || jQuery.now();
-
-        // Mark it as fixed
-        this[ jQuery.expando ] = true;
-};
-
-function returnFalse() {
-        return false;
-}
-function returnTrue() {
-        return true;
-}
-
-// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
-// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
-jQuery.Event.prototype = {
-        preventDefault: function() {
-                this.isDefaultPrevented = returnTrue;
-
-                var e = this.originalEvent;
-                if ( !e ) {
-                        return;
-                }
-
-                // if preventDefault exists run it on the original event
-                if ( e.preventDefault ) {
-                        e.preventDefault();
-
-                // otherwise set the returnValue property of the original event to false (IE)
-                } else {
-                        e.returnValue = false;
-                }
-        },
-        stopPropagation: function() {
-                this.isPropagationStopped = returnTrue;
-
-                var e = this.originalEvent;
-                if ( !e ) {
-                        return;
-                }
-                // if stopPropagation exists run it on the original event
-                if ( e.stopPropagation ) {
-                        e.stopPropagation();
-                }
-                // otherwise set the cancelBubble property of the original event to true (IE)
-                e.cancelBubble = true;
-        },
-        stopImmediatePropagation: function() {
-                this.isImmediatePropagationStopped = returnTrue;
-                this.stopPropagation();
-        },
-        isDefaultPrevented: returnFalse,
-        isPropagationStopped: returnFalse,
-        isImmediatePropagationStopped: returnFalse
-};
-
-// Create mouseenter/leave events using mouseover/out and event-time checks
-jQuery.each({
-        mouseenter: "mouseover",
-        mouseleave: "mouseout"
-}, function( orig, fix ) {
-        jQuery.event.special[ orig ] = {
-                delegateType: fix,
-                bindType: fix,
-
-                handle: function( event ) {
-                        var ret,
-                                target = this,
-                                related = event.relatedTarget,
-                                handleObj = event.handleObj,
-                                selector = handleObj.selector;
-
-                        // For mousenter/leave call the handler if related is outside the target.
-                        // NB: No relatedTarget if the mouse left/entered the browser window
-                        if ( !related || (related !== target && !jQuery.contains( target, related )) ) {
-                                event.type = handleObj.origType;
-                                ret = handleObj.handler.apply( this, arguments );
-                                event.type = fix;
-                        }
-                        return ret;
-                }
-        };
-});
-
-// IE submit delegation
-if ( !jQuery.support.submitBubbles ) {
-
-        jQuery.event.special.submit = {
-                setup: function() {
-                        // Only need this for delegated form submit events
-                        if ( jQuery.nodeName( this, "form" ) ) {
-                                return false;
-                        }
-
-                        // Lazy-add a submit handler when a descendant form may potentially be submitted
-                        jQuery.event.add( this, "click._submit keypress._submit", function( e ) {
-                                // Node name check avoids a VML-related crash in IE (#9807)
-                                var elem = e.target,
-                                        form = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ? elem.form : undefined;
-                                if ( form && !jQuery._data( form, "_submit_attached" ) ) {
-                                        jQuery.event.add( form, "submit._submit", function( event ) {
-                                                event._submit_bubble = true;
-                                        });
-                                        jQuery._data( form, "_submit_attached", true );
-                                }
-                        });
-                        // return undefined since we don't need an event listener
-                },
-
-                postDispatch: function( event ) {
-                        // If form was submitted by the user, bubble the event up the tree
-                        if ( event._submit_bubble ) {
-                                delete event._submit_bubble;
-                                if ( this.parentNode && !event.isTrigger ) {
-                                        jQuery.event.simulate( "submit", this.parentNode, event, true );
-                                }
-                        }
-                },
-
-                teardown: function() {
-                        // Only need this for delegated form submit events
-                        if ( jQuery.nodeName( this, "form" ) ) {
-                                return false;
-                        }
-
-                        // Remove delegated handlers; cleanData eventually reaps submit handlers attached above
-                        jQuery.event.remove( this, "._submit" );
-                }
-        };
-}
-
-// IE change delegation and checkbox/radio fix
-if ( !jQuery.support.changeBubbles ) {
-
-        jQuery.event.special.change = {
-
-                setup: function() {
-
-                        if ( rformElems.test( this.nodeName ) ) {
-                                // IE doesn't fire change on a check/radio until blur; trigger it on click
-                                // after a propertychange. Eat the blur-change in special.change.handle.
-                                // This still fires onchange a second time for check/radio after blur.
-                                if ( this.type === "checkbox" || this.type === "radio" ) {
-                                        jQuery.event.add( this, "propertychange._change", function( event ) {
-                                                if ( event.originalEvent.propertyName === "checked" ) {
-                                                        this._just_changed = true;
-                                                }
-                                        });
-                                        jQuery.event.add( this, "click._change", function( event ) {
-                                                if ( this._just_changed && !event.isTrigger ) {
-                                                        this._just_changed = false;
-                                                }
-                                                // Allow triggered, simulated change events (#11500)
-                                                jQuery.event.simulate( "change", this, event, true );
-                                        });
-                                }
-                                return false;
-                        }
-                        // Delegated event; lazy-add a change handler on descendant inputs
-                        jQuery.event.add( this, "beforeactivate._change", function( e ) {
-                                var elem = e.target;
-
-                                if ( rformElems.test( elem.nodeName ) && !jQuery._data( elem, "_change_attached" ) ) {
-                                        jQuery.event.add( elem, "change._change", function( event ) {
-                                                if ( this.parentNode && !event.isSimulated && !event.isTrigger ) {
-                                                        jQuery.event.simulate( "change", this.parentNode, event, true );
-                                                }
-                                        });
-                                        jQuery._data( elem, "_change_attached", true );
-                                }
-                        });
-                },
-
-                handle: function( event ) {
-                        var elem = event.target;
-
-                        // Swallow native change events from checkbox/radio, we already triggered them above
-                        if ( this !== elem || event.isSimulated || event.isTrigger || (elem.type !== "radio" && elem.type !== "checkbox") ) {
-                                return event.handleObj.handler.apply( this, arguments );
-                        }
-                },
-
-                teardown: function() {
-                        jQuery.event.remove( this, "._change" );
-
-                        return !rformElems.test( this.nodeName );
-                }
-        };
-}
-
-// Create "bubbling" focus and blur events
-if ( !jQuery.support.focusinBubbles ) {
-        jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
-
-                // Attach a single capturing handler while someone wants focusin/focusout
-                var attaches = 0,
-                        handler = function( event ) {
-                                jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ), true );
-                        };
-
-                jQuery.event.special[ fix ] = {
-                        setup: function() {
-                                if ( attaches++ === 0 ) {
-                                        document.addEventListener( orig, handler, true );
-                                }
-                        },
-                        teardown: function() {
-                                if ( --attaches === 0 ) {
-                                        document.removeEventListener( orig, handler, true );
-                                }
-                        }
-                };
-        });
-}
-
-jQuery.fn.extend({
-
-        on: function( types, selector, data, fn, /*INTERNAL*/ one ) {
-                var origFn, type;
-
-                // Types can be a map of types/handlers
-                if ( typeof types === "object" ) {
-                        // ( types-Object, selector, data )
-                        if ( typeof selector !== "string" ) { // && selector != null
-                                // ( types-Object, data )
-                                data = data || selector;
-                                selector = undefined;
-                        }
-                        for ( type in types ) {
-                                this.on( type, selector, data, types[ type ], one );
-                        }
-                        return this;
-                }
-
-                if ( data == null && fn == null ) {
-                        // ( types, fn )
-                        fn = selector;
-                        data = selector = undefined;
-                } else if ( fn == null ) {
-                        if ( typeof selector === "string" ) {
-                                // ( types, selector, fn )
-                                fn = data;
-                                data = undefined;
-                        } else {
-                                // ( types, data, fn )
-                                fn = data;
-                                data = selector;
-                                selector = undefined;
-                        }
-                }
-                if ( fn === false ) {
-                        fn = returnFalse;
-                } else if ( !fn ) {
-                        return this;
-                }
-
-                if ( one === 1 ) {
-                        origFn = fn;
-                        fn = function( event ) {
-                                // Can use an empty set, since event contains the info
-                                jQuery().off( event );
-                                return origFn.apply( this, arguments );
-                        };
-                        // Use same guid so caller can remove using origFn
-                        fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ );
-                }
-                return this.each( function() {
-                        jQuery.event.add( this, types, fn, data, selector );
-                });
-        },
-        one: function( types, selector, data, fn ) {
-                return this.on( types, selector, data, fn, 1 );
-        },
-        off: function( types, selector, fn ) {
-                var handleObj, type;
-                if ( types && types.preventDefault && types.handleObj ) {
-                        // ( event )  dispatched jQuery.Event
-                        handleObj = types.handleObj;
-                        jQuery( types.delegateTarget ).off(
-                                handleObj.namespace ? handleObj.origType + "." + handleObj.namespace : handleObj.origType,
-                                handleObj.selector,
-                                handleObj.handler
-                        );
-                        return this;
-                }
-                if ( typeof types === "object" ) {
-                        // ( types-object [, selector] )
-                        for ( type in types ) {
-                                this.off( type, selector, types[ type ] );
-                        }
-                        return this;
-                }
-                if ( selector === false || typeof selector === "function" ) {
-                        // ( types [, fn] )
-                        fn = selector;
-                        selector = undefined;
-                }
-                if ( fn === false ) {
-                        fn = returnFalse;
-                }
-                return this.each(function() {
-                        jQuery.event.remove( this, types, fn, selector );
-                });
-        },
-
-        bind: function( types, data, fn ) {
-                return this.on( types, null, data, fn );
-        },
-        unbind: function( types, fn ) {
-                return this.off( types, null, fn );
-        },
-
-        live: function( types, data, fn ) {
-                jQuery( this.context ).on( types, this.selector, data, fn );
-                return this;
-        },
-        die: function( types, fn ) {
-                jQuery( this.context ).off( types, this.selector || "**", fn );
-                return this;
-        },
-
-        delegate: function( selector, types, data, fn ) {
-                return this.on( types, selector, data, fn );
-        },
-        undelegate: function( selector, types, fn ) {
-                // ( namespace ) or ( selector, types [, fn] )
-                return arguments.length === 1 ? this.off( selector, "**" ) : this.off( types, selector || "**", fn );
-        },
-
-        trigger: function( type, data ) {
-                return this.each(function() {
-                        jQuery.event.trigger( type, data, this );
-                });
-        },
-        triggerHandler: function( type, data ) {
-                if ( this[0] ) {
-                        return jQuery.event.trigger( type, data, this[0], true );
-                }
-        },
-
-        toggle: function( fn ) {
-                // Save reference to arguments for access in closure
-                var args = arguments,
-                        guid = fn.guid || jQuery.guid++,
-                        i = 0,
-                        toggler = function( event ) {
-                                // Figure out which function to execute
-                                var lastToggle = ( jQuery._data( this, "lastToggle" + fn.guid ) || 0 ) % i;
-                                jQuery._data( this, "lastToggle" + fn.guid, lastToggle + 1 );
-
-                                // Make sure that clicks stop
-                                event.preventDefault();
-
-                                // and execute the function
-                                return args[ lastToggle ].apply( this, arguments ) || false;
-                        };
-
-                // link all the functions, so any of them can unbind this click handler
-                toggler.guid = guid;
-                while ( i < args.length ) {
-                        args[ i++ ].guid = guid;
-                }
-
-                return this.click( toggler );
-        },
-
-        hover: function( fnOver, fnOut ) {
-                return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
-        }
-});
-
-jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " +
-        "mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
-        "change select submit keydown keypress keyup error contextmenu").split(" "), function( i, name ) {
-
-        // Handle event binding
-        jQuery.fn[ name ] = function( data, fn ) {
-                if ( fn == null ) {
-                        fn = data;
-                        data = null;
-                }
-
-                return arguments.length > 0 ?
-                        this.on( name, null, data, fn ) :
-                        this.trigger( name );
-        };
-
-        if ( rkeyEvent.test( name ) ) {
-                jQuery.event.fixHooks[ name ] = jQuery.event.keyHooks;
-        }
-
-        if ( rmouseEvent.test( name ) ) {
-                jQuery.event.fixHooks[ name ] = jQuery.event.mouseHooks;
-        }
-});
-/*!
- * Sizzle CSS Selector Engine
- * Copyright 2012 jQuery Foundation and other contributors
- * Released under the MIT license
- * http://sizzlejs.com/
- */
-(function( window, undefined ) {
-
-var cachedruns,
-        assertGetIdNotName,
-        Expr,
-        getText,
-        isXML,
-        contains,
-        compile,
-        sortOrder,
-        hasDuplicate,
-        outermostContext,
-
-        baseHasDuplicate = true,
-        strundefined = "undefined",
-
-        expando = ( "sizcache" + Math.random() ).replace( ".", "" ),
-
-        Token = String,
-        document = window.document,
-        docElem = document.documentElement,
-        dirruns = 0,
-        done = 0,
-        pop = [].pop,
-        push = [].push,
-        slice = [].slice,
-        // Use a stripped-down indexOf if a native one is unavailable
-        indexOf = [].indexOf || function( elem ) {
-                var i = 0,
-                        len = this.length;
-                for ( ; i < len; i++ ) {
-                        if ( this[i] === elem ) {
-                                return i;
-                        }
-                }
-                return -1;
-        },
-
-        // Augment a function for special use by Sizzle
-        markFunction = function( fn, value ) {
-                fn[ expando ] = value == null || value;
-                return fn;
-        },
-
-        createCache = function() {
-                var cache = {},
-                        keys = [];
-
-                return markFunction(function( key, value ) {
-                        // Only keep the most recent entries
-                        if ( keys.push( key ) > Expr.cacheLength ) {
-                                delete cache[ keys.shift() ];
-                        }
-
-                        // Retrieve with (key + " ") to avoid collision with native Object.prototype properties (see Issue #157)
-                        return (cache[ key + " " ] = value);
-                }, cache );
-        },
-
-        classCache = createCache(),
-        tokenCache = createCache(),
-        compilerCache = createCache(),
-
-        // Regex
-
-        // Whitespace characters http://www.w3.org/TR/css3-selectors/#whitespace
-        whitespace = "[\\x20\\t\\r\\n\\f]",
-        // http://www.w3.org/TR/css3-syntax/#characters
-        characterEncoding = "(?:\\\\.|[-\\w]|[^\\x00-\\xa0])+",
-
-        // Loosely modeled on CSS identifier characters
-        // An unquoted value should be a CSS identifier (http://www.w3.org/TR/css3-selectors/#attribute-selectors)
-        // Proper syntax: http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier
-        identifier = characterEncoding.replace( "w", "w#" ),
-
-        // Acceptable operators http://www.w3.org/TR/selectors/#attribute-selectors
-        operators = "([*^$|!~]?=)",
-        attributes = "\\[" + whitespace + "*(" + characterEncoding + ")" + whitespace +
-                "*(?:" + operators + whitespace + "*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|(" + identifier + ")|)|)" + whitespace + "*\\]",
-
-        // Prefer arguments not in parens/brackets,
-        //   then attribute selectors and non-pseudos (denoted by :),
-        //   then anything else
-        // These preferences are here to reduce the number of selectors
-        //   needing tokenize in the PSEUDO preFilter
-        pseudos = ":(" + characterEncoding + ")(?:\\((?:(['\"])((?:\\\\.|[^\\\\])*?)\\2|([^()[\\]]*|(?:(?:" + attributes + ")|[^:]|\\\\.)*|.*))\\)|)",
-
-        // For matchExpr.POS and matchExpr.needsContext
-        pos = ":(even|odd|eq|gt|lt|nth|first|last)(?:\\(" + whitespace +
-                "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)",
-
-        // Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter
-        rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ),
-
-        rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ),
-        rcombinators = new RegExp( "^" + whitespace + "*([\\x20\\t\\r\\n\\f>+~])" + whitespace + "*" ),
-        rpseudo = new RegExp( pseudos ),
-
-        // Easily-parseable/retrievable ID or TAG or CLASS selectors
-        rquickExpr = /^(?:#([\w\-]+)|(\w+)|\.([\w\-]+))$/,
-
-        rnot = /^:not/,
-        rsibling = /[\x20\t\r\n\f]*[+~]/,
-        rendsWithNot = /:not\($/,
-
-        rheader = /h\d/i,
-        rinputs = /input|select|textarea|button/i,
-
-        rbackslash = /\\(?!\\)/g,
-
-        matchExpr = {
-                "ID": new RegExp( "^#(" + characterEncoding + ")" ),
-                "CLASS": new RegExp( "^\\.(" + characterEncoding + ")" ),
-                "NAME": new RegExp( "^\\[name=['\"]?(" + characterEncoding + ")['\"]?\\]" ),
-                "TAG": new RegExp( "^(" + characterEncoding.replace( "w", "w*" ) + ")" ),
-                "ATTR": new RegExp( "^" + attributes ),
-                "PSEUDO": new RegExp( "^" + pseudos ),
-                "POS": new RegExp( pos, "i" ),
-                "CHILD": new RegExp( "^:(only|nth|first|last)-child(?:\\(" + whitespace +
-                        "*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace +
-                        "*(\\d+)|))" + whitespace + "*\\)|)", "i" ),
-                // For use in libraries implementing .is()
-                "needsContext": new RegExp( "^" + whitespace + "*[>+~]|" + pos, "i" )
-        },
-
-        // Support
-
-        // Used for testing something on an element
-        assert = function( fn ) {
-                var div = document.createElement("div");
-
-                try {
-                        return fn( div );
-                } catch (e) {
-                        return false;
-                } finally {
-                        // release memory in IE
-                        div = null;
-                }
-        },
-
-        // Check if getElementsByTagName("*") returns only elements
-        assertTagNameNoComments = assert(function( div ) {
-                div.appendChild( document.createComment("") );
-                return !div.getElementsByTagName("*").length;
-        }),
-
-        // Check if getAttribute returns normalized href attributes
-        assertHrefNotNormalized = assert(function( div ) {
-                div.innerHTML = "<a href='#'></a>";
-                return div.firstChild && typeof div.firstChild.getAttribute !== strundefined &&
-                        div.firstChild.getAttribute("href") === "#";
-        }),
-
-        // Check if attributes should be retrieved by attribute nodes
-        assertAttributes = assert(function( div ) {
-                div.innerHTML = "<select></select>";
-                var type = typeof div.lastChild.getAttribute("multiple");
-                // IE8 returns a string for some attributes even when not present
-                return type !== "boolean" && type !== "string";
-        }),
-
-        // Check if getElementsByClassName can be trusted
-        assertUsableClassName = assert(function( div ) {
-                // Opera can't find a second classname (in 9.6)
-                div.innerHTML = "<div class='hidden e'></div><div class='hidden'></div>";
-                if ( !div.getElementsByClassName || !div.getElementsByClassName("e").length ) {
-                        return false;
-                }
-
-                // Safari 3.2 caches class attributes and doesn't catch changes
-                div.lastChild.className = "e";
-                return div.getElementsByClassName("e").length === 2;
-        }),
-
-        // Check if getElementById returns elements by name
-        // Check if getElementsByName privileges form controls or returns elements by ID
-        assertUsableName = assert(function( div ) {
-                // Inject content
-                div.id = expando + 0;
-                div.innerHTML = "<a name='" + expando + "'></a><div name='" + expando + "'></div>";
-                docElem.insertBefore( div, docElem.firstChild );
-
-                // Test
-                var pass = document.getElementsByName &&
-                        // buggy browsers will return fewer than the correct 2
-                        document.getElementsByName( expando ).length === 2 +
-                        // buggy browsers will return more than the correct 0
-                        document.getElementsByName( expando + 0 ).length;
-                assertGetIdNotName = !document.getElementById( expando );
-
-                // Cleanup
-                docElem.removeChild( div );
-
-                return pass;
-        });
-
-// If slice is not available, provide a backup
-try {
-        slice.call( docElem.childNodes, 0 )[0].nodeType;
-} catch ( e ) {
-        slice = function( i ) {
-                var elem,
-                        results = [];
-                for ( ; (elem = this[i]); i++ ) {
-                        results.push( elem );
-                }
-                return results;
-        };
-}
-
-function Sizzle( selector, context, results, seed ) {
-        results = results || [];
-        context = context || document;
-        var match, elem, xml, m,
-                nodeType = context.nodeType;
-
-        if ( !selector || typeof selector !== "string" ) {
-                return results;
-        }
-
-        if ( nodeType !== 1 && nodeType !== 9 ) {
-                return [];
-        }
-
-        xml = isXML( context );
-
-        if ( !xml && !seed ) {
-                if ( (match = rquickExpr.exec( selector )) ) {
-                        // Speed-up: Sizzle("#ID")
-                        if ( (m = match[1]) ) {
-                                if ( nodeType === 9 ) {
-                                        elem = context.getElementById( m );
-                                        // Check parentNode to catch when Blackberry 4.6 returns
-                                        // nodes that are no longer in the document #6963
-                                        if ( elem && elem.parentNode ) {
-                                                // Handle the case where IE, Opera, and Webkit return items
-                                                // by name instead of ID
-                                                if ( elem.id === m ) {
-                                                        results.push( elem );
-                                                        return results;
-                                                }
-                                        } else {
-                                                return results;
-                                        }
-                                } else {
-                                        // Context is not a document
-                                        if ( context.ownerDocument && (elem = context.ownerDocument.getElementById( m )) &&
-                                                contains( context, elem ) && elem.id === m ) {
-                                                results.push( elem );
-                                                return results;
-                                        }
-                                }
-
-                        // Speed-up: Sizzle("TAG")
-                        } else if ( match[2] ) {
-                                push.apply( results, slice.call(context.getElementsByTagName( selector ), 0) );
-                                return results;
-
-                        // Speed-up: Sizzle(".CLASS")
-                        } else if ( (m = match[3]) && assertUsableClassName && context.getElementsByClassName ) {
-                                push.apply( results, slice.call(context.getElementsByClassName( m ), 0) );
-                                return results;
-                        }
-                }
-        }
-
-        // All others
-        return select( selector.replace( rtrim, "$1" ), context, results, seed, xml );
-}
-
-Sizzle.matches = function( expr, elements ) {
-        return Sizzle( expr, null, null, elements );
-};
-
-Sizzle.matchesSelector = function( elem, expr ) {
-        return Sizzle( expr, null, null, [ elem ] ).length > 0;
-};
-
-// Returns a function to use in pseudos for input types
-function createInputPseudo( type ) {
-        return function( elem ) {
-                var name = elem.nodeName.toLowerCase();
-                return name === "input" && elem.type === type;
-        };
-}
-
-// Returns a function to use in pseudos for buttons
-function createButtonPseudo( type ) {
-        return function( elem ) {
-                var name = elem.nodeName.toLowerCase();
-                return (name === "input" || name === "button") && elem.type === type;
-        };
-}
-
-// Returns a function to use in pseudos for positionals
-function createPositionalPseudo( fn ) {
-        return markFunction(function( argument ) {
-                argument = +argument;
-                return markFunction(function( seed, matches ) {
-                        var j,
-                                matchIndexes = fn( [], seed.length, argument ),
-                                i = matchIndexes.length;
-
-                        // Match elements found at the specified indexes
-                        while ( i-- ) {
-                                if ( seed[ (j = matchIndexes[i]) ] ) {
-                                        seed[j] = !(matches[j] = seed[j]);
-                                }
-                        }
-                });
-        });
-}
-
-/**
- * Utility function for retrieving the text value of an array of DOM nodes
- * @param {Array|Element} elem
- */
-getText = Sizzle.getText = function( elem ) {
-        var node,
-                ret = "",
-                i = 0,
-                nodeType = elem.nodeType;
-
-        if ( nodeType ) {
-                if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
-                        // Use textContent for elements
-                        // innerText usage removed for consistency of new lines (see #11153)
-                        if ( typeof elem.textContent === "string" ) {
-                                return elem.textContent;
-                        } else {
-                                // Traverse its children
-                                for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
-                                        ret += getText( elem );
-                                }
-                        }
-                } else if ( nodeType === 3 || nodeType === 4 ) {
-                        return elem.nodeValue;
-                }
-                // Do not include comment or processing instruction nodes
-        } else {
-
-                // If no nodeType, this is expected to be an array
-                for ( ; (node = elem[i]); i++ ) {
-                        // Do not traverse comment nodes
-                        ret += getText( node );
-                }
-        }
-        return ret;
-};
-
-isXML = Sizzle.isXML = function( elem ) {
-        // documentElement is verified for cases where it doesn't yet exist
-        // (such as loading iframes in IE - #4833)
-        var documentElement = elem && (elem.ownerDocument || elem).documentElement;
-        return documentElement ? documentElement.nodeName !== "HTML" : false;
-};
-
-// Element contains another
-contains = Sizzle.contains = docElem.contains ?
-        function( a, b ) {
-                var adown = a.nodeType === 9 ? a.documentElement : a,
-                        bup = b && b.parentNode;
-                return a === bup || !!( bup && bup.nodeType === 1 && adown.contains && adown.contains(bup) );
-        } :
-        docElem.compareDocumentPosition ?
-        function( a, b ) {
-                return b && !!( a.compareDocumentPosition( b ) & 16 );
-        } :
-        function( a, b ) {
-                while ( (b = b.parentNode) ) {
-                        if ( b === a ) {
-                                return true;
-                        }
-                }
-                return false;
-        };
-
-Sizzle.attr = function( elem, name ) {
-        var val,
-                xml = isXML( elem );
-
-        if ( !xml ) {
-                name = name.toLowerCase();
-        }
-        if ( (val = Expr.attrHandle[ name ]) ) {
-                return val( elem );
-        }
-        if ( xml || assertAttributes ) {
-                return elem.getAttribute( name );
-        }
-        val = elem.getAttributeNode( name );
-        return val ?
-                typeof elem[ name ] === "boolean" ?
-                        elem[ name ] ? name : null :
-                        val.specified ? val.value : null :
-                null;
-};
-
-Expr = Sizzle.selectors = {
-
-        // Can be adjusted by the user
-        cacheLength: 50,
-
-        createPseudo: markFunction,
-
-        match: matchExpr,
-
-        // IE6/7 return a modified href
-        attrHandle: assertHrefNotNormalized ?
-                {} :
-                {
-                        "href": function( elem ) {
-                                return elem.getAttribute( "href", 2 );
-                        },
-                        "type": function( elem ) {
-                                return elem.getAttribute("type");
-                        }
-                },
-
-        find: {
-                "ID": assertGetIdNotName ?
-                        function( id, context, xml ) {
-                                if ( typeof context.getElementById !== strundefined && !xml ) {
-                                        var m = context.getElementById( id );
-                                        // Check parentNode to catch when Blackberry 4.6 returns
-                                        // nodes that are no longer in the document #6963
-                                        return m && m.parentNode ? [m] : [];
-                                }
-                        } :
-                        function( id, context, xml ) {
-                                if ( typeof context.getElementById !== strundefined && !xml ) {
-                                        var m = context.getElementById( id );
-
-                                        return m ?
-                                                m.id === id || typeof m.getAttributeNode !== strundefined && m.getAttributeNode("id").value === id ?
-                                                        [m] :
-                                                        undefined :
-                                                [];
-                                }
-                        },
-
-                "TAG": assertTagNameNoComments ?
-                        function( tag, context ) {
-                                if ( typeof context.getElementsByTagName !== strundefined ) {
-                                        return context.getElementsByTagName( tag );
-                                }
-                        } :
-                        function( tag, context ) {
-                                var results = context.getElementsByTagName( tag );
-
-                                // Filter out possible comments
-                                if ( tag === "*" ) {
-                                        var elem,
-                                                tmp = [],
-                                                i = 0;
-
-                                        for ( ; (elem = results[i]); i++ ) {
-                                                if ( elem.nodeType === 1 ) {
-                                                        tmp.push( elem );
-                                                }
-                                        }
-
-                                        return tmp;
-                                }
-                                return results;
-                        },
-
-                "NAME": assertUsableName && function( tag, context ) {
-                        if ( typeof context.getElementsByName !== strundefined ) {
-                                return context.getElementsByName( name );
-                        }
-                },
-
-                "CLASS": assertUsableClassName && function( className, context, xml ) {
-                        if ( typeof context.getElementsByClassName !== strundefined && !xml ) {
-                                return context.getElementsByClassName( className );
-                        }
-                }
-        },
-
-        relative: {
-                ">": { dir: "parentNode", first: true },
-                " ": { dir: "parentNode" },
-                "+": { dir: "previousSibling", first: true },
-                "~": { dir: "previousSibling" }
-        },
-
-        preFilter: {
-                "ATTR": function( match ) {
-                        match[1] = match[1].replace( rbackslash, "" );
-
-                        // Move the given value to match[3] whether quoted or unquoted
-                        match[3] = ( match[4] || match[5] || "" ).replace( rbackslash, "" );
-
-                        if ( match[2] === "~=" ) {
-                                match[3] = " " + match[3] + " ";
-                        }
-
-                        return match.slice( 0, 4 );
-                },
-
-                "CHILD": function( match ) {
-                        /* matches from matchExpr["CHILD"]
-                                1 type (only|nth|...)
-                                2 argument (even|odd|\d*|\d*n([+-]\d+)?|...)
-                                3 xn-component of xn+y argument ([+-]?\d*n|)
-                                4 sign of xn-component
-                                5 x of xn-component
-                                6 sign of y-component
-                                7 y of y-component
-                        */
-                        match[1] = match[1].toLowerCase();
-
-                        if ( match[1] === "nth" ) {
-                                // nth-child requires argument
-                                if ( !match[2] ) {
-                                        Sizzle.error( match[0] );
-                                }
-
-                                // numeric x and y parameters for Expr.filter.CHILD
-                                // remember that false/true cast respectively to 0/1
-                                match[3] = +( match[3] ? match[4] + (match[5] || 1) : 2 * ( match[2] === "even" || match[2] === "odd" ) );
-                                match[4] = +( ( match[6] + match[7] ) || match[2] === "odd" );
-
-                        // other types prohibit arguments
-                        } else if ( match[2] ) {
-                                Sizzle.error( match[0] );
-                        }
-
-                        return match;
-                },
-
-                "PSEUDO": function( match ) {
-                        var unquoted, excess;
-                        if ( matchExpr["CHILD"].test( match[0] ) ) {
-                                return null;
-                        }
-
-                        if ( match[3] ) {
-                                match[2] = match[3];
-                        } else if ( (unquoted = match[4]) ) {
-                                // Only check arguments that contain a pseudo
-                                if ( rpseudo.test(unquoted) &&
-                                        // Get excess from tokenize (recursively)
-                                        (excess = tokenize( unquoted, true )) &&
-                                        // advance to the next closing parenthesis
-                                        (excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) {
-
-                                        // excess is a negative index
-                                        unquoted = unquoted.slice( 0, excess );
-                                        match[0] = match[0].slice( 0, excess );
-                                }
-                                match[2] = unquoted;
-                        }
-
-                        // Return only captures needed by the pseudo filter method (type and argument)
-                        return match.slice( 0, 3 );
-                }
-        },
-
-        filter: {
-                "ID": assertGetIdNotName ?
-                        function( id ) {
-                                id = id.replace( rbackslash, "" );
-                                return function( elem ) {
-                                        return elem.getAttribute("id") === id;
-                                };
-                        } :
-                        function( id ) {
-                                id = id.replace( rbackslash, "" );
-                                return function( elem ) {
-                                        var node = typeof elem.getAttributeNode !== strundefined && elem.getAttributeNode("id");
-                                        return node && node.value === id;
-                                };
-                        },
-
-                "TAG": function( nodeName ) {
-                        if ( nodeName === "*" ) {
-                                return function() { return true; };
-                        }
-                        nodeName = nodeName.replace( rbackslash, "" ).toLowerCase();
-
-                        return function( elem ) {
-                                return elem.nodeName && elem.nodeName.toLowerCase() === nodeName;
-                        };
-                },
-
-                "CLASS": function( className ) {
-                        var pattern = classCache[ expando ][ className + " " ];
-
-                        return pattern ||
-                                (pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) &&
-                                classCache( className, function( elem ) {
-                                        return pattern.test( elem.className || (typeof elem.getAttribute !== strundefined && elem.getAttribute("class")) || "" );
-                                });
-                },
-
-                "ATTR": function( name, operator, check ) {
-                        return function( elem, context ) {
-                                var result = Sizzle.attr( elem, name );
-
-                                if ( result == null ) {
-                                        return operator === "!=";
-                                }
-                                if ( !operator ) {
-                                        return true;
-                                }
-
-                                result += "";
-
-                                return operator === "=" ? result === check :
-                                        operator === "!=" ? result !== check :
-                                        operator === "^=" ? check && result.indexOf( check ) === 0 :
-                                        operator === "*=" ? check && result.indexOf( check ) > -1 :
-                                        operator === "$=" ? check && result.substr( result.length - check.length ) === check :
-                                        operator === "~=" ? ( " " + result + " " ).indexOf( check ) > -1 :
-                                        operator === "|=" ? result === check || result.substr( 0, check.length + 1 ) === check + "-" :
-                                        false;
-                        };
-                },
-
-                "CHILD": function( type, argument, first, last ) {
-
-                        if ( type === "nth" ) {
-                                return function( elem ) {
-                                        var node, diff,
-                                                parent = elem.parentNode;
-
-                                        if ( first === 1 && last === 0 ) {
-                                                return true;
-                                        }
-
-                                        if ( parent ) {
-                                                diff = 0;
-                                                for ( node = parent.firstChild; node; node = node.nextSibling ) {
-                                                        if ( node.nodeType === 1 ) {
-                                                                diff++;
-                                                                if ( elem === node ) {
-                                                                        break;
-                                                                }
-                                                        }
-                                                }
-                                        }
-
-                                        // Incorporate the offset (or cast to NaN), then check against cycle size
-                                        diff -= last;
-                                        return diff === first || ( diff % first === 0 && diff / first >= 0 );
-                                };
-                        }
-
-                        return function( elem ) {
-                                var node = elem;
-
-                                switch ( type ) {
-                                        case "only":
-                                        case "first":
-                                                while ( (node = node.previousSibling) ) {
-                                                        if ( node.nodeType === 1 ) {
-                                                                return false;
-                                                        }
-                                                }
-
-                                                if ( type === "first" ) {
-                                                        return true;
-                                                }
-
-                                                node = elem;
-
-                                                /* falls through */
-                                        case "last":
-                                                while ( (node = node.nextSibling) ) {
-                                                        if ( node.nodeType === 1 ) {
-                                                                return false;
-                                                        }
-                                                }
-
-                                                return true;
-                                }
-                        };
-                },
-
-                "PSEUDO": function( pseudo, argument ) {
-                        // pseudo-class names are case-insensitive
-                        // http://www.w3.org/TR/selectors/#pseudo-classes
-                        // Prioritize by case sensitivity in case custom pseudos are added with uppercase letters
-                        // Remember that setFilters inherits from pseudos
-                        var args,
-                                fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] ||
-                                        Sizzle.error( "unsupported pseudo: " + pseudo );
-
-                        // The user may use createPseudo to indicate that
-                        // arguments are needed to create the filter function
-                        // just as Sizzle does
-                        if ( fn[ expando ] ) {
-                                return fn( argument );
-                        }
-
-                        // But maintain support for old signatures
-                        if ( fn.length > 1 ) {
-                                args = [ pseudo, pseudo, "", argument ];
-                                return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ?
-                                        markFunction(function( seed, matches ) {
-                                                var idx,
-                                                        matched = fn( seed, argument ),
-                                                        i = matched.length;
-                                                while ( i-- ) {
-                                                        idx = indexOf.call( seed, matched[i] );
-                                                        seed[ idx ] = !( matches[ idx ] = matched[i] );
-                                                }
-                                        }) :
-                                        function( elem ) {
-                                                return fn( elem, 0, args );
-                                        };
-                        }
-
-                        return fn;
-                }
-        },
-
-        pseudos: {
-                "not": markFunction(function( selector ) {
-                        // Trim the selector passed to compile
-                        // to avoid treating leading and trailing
-                        // spaces as combinators
-                        var input = [],
-                                results = [],
-                                matcher = compile( selector.replace( rtrim, "$1" ) );
-
-                        return matcher[ expando ] ?
-                                markFunction(function( seed, matches, context, xml ) {
-                                        var elem,
-                                                unmatched = matcher( seed, null, xml, [] ),
-                                                i = seed.length;
-
-                                        // Match elements unmatched by `matcher`
-                                        while ( i-- ) {
-                                                if ( (elem = unmatched[i]) ) {
-                                                        seed[i] = !(matches[i] = elem);
-                                                }
-                                        }
-                                }) :
-                                function( elem, context, xml ) {
-                                        input[0] = elem;
-                                        matcher( input, null, xml, results );
-                                        return !results.pop();
-                                };
-                }),
-
-                "has": markFunction(function( selector ) {
-                        return function( elem ) {
-                                return Sizzle( selector, elem ).length > 0;
-                        };
-                }),
-
-                "contains": markFunction(function( text ) {
-                        return function( elem ) {
-                                return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1;
-                        };
-                }),
-
-                "enabled": function( elem ) {
-                        return elem.disabled === false;
-                },
-
-                "disabled": function( elem ) {
-                        return elem.disabled === true;
-                },
-
-                "checked": function( elem ) {
-                        // In CSS3, :checked should return both checked and selected elements
-                        // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
-                        var nodeName = elem.nodeName.toLowerCase();
-                        return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected);
-                },
-
-                "selected": function( elem ) {
-                        // Accessing this property makes selected-by-default
-                        // options in Safari work properly
-                        if ( elem.parentNode ) {
-                                elem.parentNode.selectedIndex;
-                        }
-
-                        return elem.selected === true;
-                },
-
-                "parent": function( elem ) {
-                        return !Expr.pseudos["empty"]( elem );
-                },
-
-                "empty": function( elem ) {
-                        // http://www.w3.org/TR/selectors/#empty-pseudo
-                        // :empty is only affected by element nodes and content nodes(including text(3), cdata(4)),
-                        //   not comment, processing instructions, or others
-                        // Thanks to Diego Perini for the nodeName shortcut
-                        //   Greater than "@" means alpha characters (specifically not starting with "#" or "?")
-                        var nodeType;
-                        elem = elem.firstChild;
-                        while ( elem ) {
-                                if ( elem.nodeName > "@" || (nodeType = elem.nodeType) === 3 || nodeType === 4 ) {
-                                        return false;
-                                }
-                                elem = elem.nextSibling;
-                        }
-                        return true;
-                },
-
-                "header": function( elem ) {
-                        return rheader.test( elem.nodeName );
-                },
-
-                "text": function( elem ) {
-                        var type, attr;
-                        // IE6 and 7 will map elem.type to 'text' for new HTML5 types (search, etc)
-                        // use getAttribute instead to test this case
-                        return elem.nodeName.toLowerCase() === "input" &&
-                                (type = elem.type) === "text" &&
-                                ( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === type );
-                },
-
-                // Input types
-                "radio": createInputPseudo("radio"),
-                "checkbox": createInputPseudo("checkbox"),
-                "file": createInputPseudo("file"),
-                "password": createInputPseudo("password"),
-                "image": createInputPseudo("image"),
-
-                "submit": createButtonPseudo("submit"),
-                "reset": createButtonPseudo("reset"),
-
-                "button": function( elem ) {
-                        var name = elem.nodeName.toLowerCase();
-                        return name === "input" && elem.type === "button" || name === "button";
-                },
-
-                "input": function( elem ) {
-                        return rinputs.test( elem.nodeName );
-                },
-
-                "focus": function( elem ) {
-                        var doc = elem.ownerDocument;
-                        return elem === doc.activeElement && (!doc.hasFocus || doc.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex);
-                },
-
-                "active": function( elem ) {
-                        return elem === elem.ownerDocument.activeElement;
-                },
-
-                // Positional types
-                "first": createPositionalPseudo(function() {
-                        return [ 0 ];
-                }),
-
-                "last": createPositionalPseudo(function( matchIndexes, length ) {
-                        return [ length - 1 ];
-                }),
-
-                "eq": createPositionalPseudo(function( matchIndexes, length, argument ) {
-                        return [ argument < 0 ? argument + length : argument ];
-                }),
-
-                "even": createPositionalPseudo(function( matchIndexes, length ) {
-                        for ( var i = 0; i < length; i += 2 ) {
-                                matchIndexes.push( i );
-                        }
-                        return matchIndexes;
-                }),
-
-                "odd": createPositionalPseudo(function( matchIndexes, length ) {
-                        for ( var i = 1; i < length; i += 2 ) {
-                                matchIndexes.push( i );
-                        }
-                        return matchIndexes;
-                }),
-
-                "lt": createPositionalPseudo(function( matchIndexes, length, argument ) {
-                        for ( var i = argument < 0 ? argument + length : argument; --i >= 0; ) {
-                                matchIndexes.push( i );
-                        }
-                        return matchIndexes;
-                }),
-
-                "gt": createPositionalPseudo(function( matchIndexes, length, argument ) {
-                        for ( var i = argument < 0 ? argument + length : argument; ++i < length; ) {
-                                matchIndexes.push( i );
-                        }
-                        return matchIndexes;
-                })
-        }
-};
-
-function siblingCheck( a, b, ret ) {
-        if ( a === b ) {
-                return ret;
-        }
-
-        var cur = a.nextSibling;
-
-        while ( cur ) {
-                if ( cur === b ) {
-                        return -1;
-                }
-
-                cur = cur.nextSibling;
-        }
-
-        return 1;
-}
-
-sortOrder = docElem.compareDocumentPosition ?
-        function( a, b ) {
-                if ( a === b ) {
-                        hasDuplicate = true;
-                        return 0;
-                }
-
-                return ( !a.compareDocumentPosition || !b.compareDocumentPosition ?
-                        a.compareDocumentPosition :
-                        a.compareDocumentPosition(b) & 4
-                ) ? -1 : 1;
-        } :
-        function( a, b ) {
-                // The nodes are identical, we can exit early
-                if ( a === b ) {
-                        hasDuplicate = true;
-                        return 0;
-
-                // Fallback to using sourceIndex (in IE) if it's available on both nodes
-                } else if ( a.sourceIndex && b.sourceIndex ) {
-                        return a.sourceIndex - b.sourceIndex;
-                }
-
-                var al, bl,
-                        ap = [],
-                        bp = [],
-                        aup = a.parentNode,
-                        bup = b.parentNode,
-                        cur = aup;
-
-                // If the nodes are siblings (or identical) we can do a quick check
-                if ( aup === bup ) {
-                        return siblingCheck( a, b );
-
-                // If no parents were found then the nodes are disconnected
-                } else if ( !aup ) {
-                        return -1;
-
-                } else if ( !bup ) {
-                        return 1;
-                }
-
-                // Otherwise they're somewhere else in the tree so we need
-                // to build up a full list of the parentNodes for comparison
-                while ( cur ) {
-                        ap.unshift( cur );
-                        cur = cur.parentNode;
-                }
-
-                cur = bup;
-
-                while ( cur ) {
-                        bp.unshift( cur );
-                        cur = cur.parentNode;
-                }
-
-                al = ap.length;
-                bl = bp.length;
-
-                // Start walking down the tree looking for a discrepancy
-                for ( var i = 0; i < al && i < bl; i++ ) {
-                        if ( ap[i] !== bp[i] ) {
-                                return siblingCheck( ap[i], bp[i] );
-                        }
-                }
-
-                // We ended someplace up the tree so do a sibling check
-                return i === al ?
-                        siblingCheck( a, bp[i], -1 ) :
-                        siblingCheck( ap[i], b, 1 );
-        };
-
-// Always assume the presence of duplicates if sort doesn't
-// pass them to our comparison function (as in Google Chrome).
-[0, 0].sort( sortOrder );
-baseHasDuplicate = !hasDuplicate;
-
-// Document sorting and removing duplicates
-Sizzle.uniqueSort = function( results ) {
-        var elem,
-                duplicates = [],
-                i = 1,
-                j = 0;
-
-        hasDuplicate = baseHasDuplicate;
-        results.sort( sortOrder );
-
-        if ( hasDuplicate ) {
-                for ( ; (elem = results[i]); i++ ) {
-                        if ( elem === results[ i - 1 ] ) {
-                                j = duplicates.push( i );
-                        }
-                }
-                while ( j-- ) {
-                        results.splice( duplicates[ j ], 1 );
-                }
-        }
-
-        return results;
-};
-
-Sizzle.error = function( msg ) {
-        throw new Error( "Syntax error, unrecognized expression: " + msg );
-};
-
-function tokenize( selector, parseOnly ) {
-        var matched, match, tokens, type,
-                soFar, groups, preFilters,
-                cached = tokenCache[ expando ][ selector + " " ];
-
-        if ( cached ) {
-                return parseOnly ? 0 : cached.slice( 0 );
-        }
-
-        soFar = selector;
-        groups = [];
-        preFilters = Expr.preFilter;
-
-        while ( soFar ) {
-
-                // Comma and first run
-                if ( !matched || (match = rcomma.exec( soFar )) ) {
-                        if ( match ) {
-                                // Don't consume trailing commas as valid
-                                soFar = soFar.slice( match[0].length ) || soFar;
-                        }
-                        groups.push( tokens = [] );
-                }
-
-                matched = false;
-
-                // Combinators
-                if ( (match = rcombinators.exec( soFar )) ) {
-                        tokens.push( matched = new Token( match.shift() ) );
-                        soFar = soFar.slice( matched.length );
-
-                        // Cast descendant combinators to space
-                        matched.type = match[0].replace( rtrim, " " );
-                }
-
-                // Filters
-                for ( type in Expr.filter ) {
-                        if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] ||
-                                (match = preFilters[ type ]( match ))) ) {
-
-                                tokens.push( matched = new Token( match.shift() ) );
-                                soFar = soFar.slice( matched.length );
-                                matched.type = type;
-                                matched.matches = match;
-                        }
-                }
-
-                if ( !matched ) {
-                        break;
-                }
-        }
-
-        // Return the length of the invalid excess
-        // if we're just parsing
-        // Otherwise, throw an error or return tokens
-        return parseOnly ?
-                soFar.length :
-                soFar ?
-                        Sizzle.error( selector ) :
-                        // Cache the tokens
-                        tokenCache( selector, groups ).slice( 0 );
-}
-
-function addCombinator( matcher, combinator, base ) {
-        var dir = combinator.dir,
-                checkNonElements = base && combinator.dir === "parentNode",
-                doneName = done++;
-
-        return combinator.first ?
-                // Check against closest ancestor/preceding element
-                function( elem, context, xml ) {
-                        while ( (elem = elem[ dir ]) ) {
-                                if ( checkNonElements || elem.nodeType === 1  ) {
-                                        return matcher( elem, context, xml );
-                                }
-                        }
-                } :
-
-                // Check against all ancestor/preceding elements
-                function( elem, context, xml ) {
-                        // We can't set arbitrary data on XML nodes, so they don't benefit from dir caching
-                        if ( !xml ) {
-                                var cache,
-                                        dirkey = dirruns + " " + doneName + " ",
-                                        cachedkey = dirkey + cachedruns;
-                                while ( (elem = elem[ dir ]) ) {
-                                        if ( checkNonElements || elem.nodeType === 1 ) {
-                                                if ( (cache = elem[ expando ]) === cachedkey ) {
-                                                        return elem.sizset;
-                                                } else if ( typeof cache === "string" && cache.indexOf(dirkey) === 0 ) {
-                                                        if ( elem.sizset ) {
-                                                                return elem;
-                                                        }
-                                                } else {
-                                                        elem[ expando ] = cachedkey;
-                                                        if ( matcher( elem, context, xml ) ) {
-                                                                elem.sizset = true;
-                                                                return elem;
-                                                        }
-                                                        elem.sizset = false;
-                                                }
-                                        }
-                                }
-                        } else {
-                                while ( (elem = elem[ dir ]) ) {
-                                        if ( checkNonElements || elem.nodeType === 1 ) {
-                                                if ( matcher( elem, context, xml ) ) {
-                                                        return elem;
-                                                }
-                                        }
-                                }
-                        }
-                };
-}
-
-function elementMatcher( matchers ) {
-        return matchers.length > 1 ?
-                function( elem, context, xml ) {
-                        var i = matchers.length;
-                        while ( i-- ) {
-                                if ( !matchers[i]( elem, context, xml ) ) {
-                                        return false;
-                                }
-                        }
-                        return true;
-                } :
-                matchers[0];
-}
-
-function condense( unmatched, map, filter, context, xml ) {
-        var elem,
-                newUnmatched = [],
-                i = 0,
-                len = unmatched.length,
-                mapped = map != null;
-
-        for ( ; i < len; i++ ) {
-                if ( (elem = unmatched[i]) ) {
-                        if ( !filter || filter( elem, context, xml ) ) {
-                                newUnmatched.push( elem );
-                                if ( mapped ) {
-                                        map.push( i );
-                                }
-                        }
-                }
-        }
-
-        return newUnmatched;
-}
-
-function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) {
-        if ( postFilter && !postFilter[ expando ] ) {
-                postFilter = setMatcher( postFilter );
-        }
-        if ( postFinder && !postFinder[ expando ] ) {
-                postFinder = setMatcher( postFinder, postSelector );
-        }
-        return markFunction(function( seed, results, context, xml ) {
-                var temp, i, elem,
-                        preMap = [],
-                        postMap = [],
-                        preexisting = results.length,
-
-                        // Get initial elements from seed or context
-                        elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [] ),
-
-                        // Prefilter to get matcher input, preserving a map for seed-results synchronization
-                        matcherIn = preFilter && ( seed || !selector ) ?
-                                condense( elems, preMap, preFilter, context, xml ) :
-                                elems,
-
-                        matcherOut = matcher ?
-                                // If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results,
-                                postFinder || ( seed ? preFilter : preexisting || postFilter ) ?
-
-                                        // ...intermediate processing is necessary
-                                        [] :
-
-                                        // ...otherwise use results directly
-                                        results :
-                                matcherIn;
-
-                // Find primary matches
-                if ( matcher ) {
-                        matcher( matcherIn, matcherOut, context, xml );
-                }
-
-                // Apply postFilter
-                if ( postFilter ) {
-                        temp = condense( matcherOut, postMap );
-                        postFilter( temp, [], context, xml );
-
-                        // Un-match failing elements by moving them back to matcherIn
-                        i = temp.length;
-                        while ( i-- ) {
-                                if ( (elem = temp[i]) ) {
-                                        matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem);
-                                }
-                        }
-                }
-
-                if ( seed ) {
-                        if ( postFinder || preFilter ) {
-                                if ( postFinder ) {
-                                        // Get the final matcherOut by condensing this intermediate into postFinder contexts
-                                        temp = [];
-                                        i = matcherOut.length;
-                                        while ( i-- ) {
-                                                if ( (elem = matcherOut[i]) ) {
-                                                        // Restore matcherIn since elem is not yet a final match
-                                                        temp.push( (matcherIn[i] = elem) );
-                                                }
-                                        }
-                                        postFinder( null, (matcherOut = []), temp, xml );
-                                }
-
-                                // Move matched elements from seed to results to keep them synchronized
-                                i = matcherOut.length;
-                                while ( i-- ) {
-                                        if ( (elem = matcherOut[i]) &&
-                                                (temp = postFinder ? indexOf.call( seed, elem ) : preMap[i]) > -1 ) {
-
-                                                seed[temp] = !(results[temp] = elem);
-                                        }
-                                }
-                        }
-
-                // Add elements to results, through postFinder if defined
-                } else {
-                        matcherOut = condense(
-                                matcherOut === results ?
-                                        matcherOut.splice( preexisting, matcherOut.length ) :
-                                        matcherOut
-                        );
-                        if ( postFinder ) {
-                                postFinder( null, results, matcherOut, xml );
-                        } else {
-                                push.apply( results, matcherOut );
-                        }
-                }
-        });
-}
-
-function matcherFromTokens( tokens ) {
-        var checkContext, matcher, j,
-                len = tokens.length,
-                leadingRelative = Expr.relative[ tokens[0].type ],
-                implicitRelative = leadingRelative || Expr.relative[" "],
-                i = leadingRelative ? 1 : 0,
-
-                // The foundational matcher ensures that elements are reachable from top-level context(s)
-                matchContext = addCombinator( function( elem ) {
-                        return elem === checkContext;
-                }, implicitRelative, true ),
-                matchAnyContext = addCombinator( function( elem ) {
-                        return indexOf.call( checkContext, elem ) > -1;
-                }, implicitRelative, true ),
-                matchers = [ function( elem, context, xml ) {
-                        return ( !leadingRelative && ( xml || context !== outermostContext ) ) || (
-                                (checkContext = context).nodeType ?
-                                        matchContext( elem, context, xml ) :
-                                        matchAnyContext( elem, context, xml ) );
-                } ];
-
-        for ( ; i < len; i++ ) {
-                if ( (matcher = Expr.relative[ tokens[i].type ]) ) {
-                        matchers = [ addCombinator( elementMatcher( matchers ), matcher ) ];
-                } else {
-                        matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches );
-
-                        // Return special upon seeing a positional matcher
-                        if ( matcher[ expando ] ) {
-                                // Find the next relative operator (if any) for proper handling
-                                j = ++i;
-                                for ( ; j < len; j++ ) {
-                                        if ( Expr.relative[ tokens[j].type ] ) {
-                                                break;
-                                        }
-                                }
-                                return setMatcher(
-                                        i > 1 && elementMatcher( matchers ),
-                                        i > 1 && tokens.slice( 0, i - 1 ).join("").replace( rtrim, "$1" ),
-                                        matcher,
-                                        i < j && matcherFromTokens( tokens.slice( i, j ) ),
-                                        j < len && matcherFromTokens( (tokens = tokens.slice( j )) ),
-                                        j < len && tokens.join("")
-                                );
-                        }
-                        matchers.push( matcher );
-                }
-        }
-
-        return elementMatcher( matchers );
-}
-
-function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
-        var bySet = setMatchers.length > 0,
-                byElement = elementMatchers.length > 0,
-                superMatcher = function( seed, context, xml, results, expandContext ) {
-                        var elem, j, matcher,
-                                setMatched = [],
-                                matchedCount = 0,
-                                i = "0",
-                                unmatched = seed && [],
-                                outermost = expandContext != null,
-                                contextBackup = outermostContext,
-                                // We must always have either seed elements or context
-                                elems = seed || byElement && Expr.find["TAG"]( "*", expandContext && context.parentNode || context ),
-                                // Nested matchers should use non-integer dirruns
-                                dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.E);
-
-                        if ( outermost ) {
-                                outermostContext = context !== document && context;
-                                cachedruns = superMatcher.el;
-                        }
-
-                        // Add elements passing elementMatchers directly to results
-                        for ( ; (elem = elems[i]) != null; i++ ) {
-                                if ( byElement && elem ) {
-                                        for ( j = 0; (matcher = elementMatchers[j]); j++ ) {
-                                                if ( matcher( elem, context, xml ) ) {
-                                                        results.push( elem );
-                                                        break;
-                                                }
-                                        }
-                                        if ( outermost ) {
-                                                dirruns = dirrunsUnique;
-                                                cachedruns = ++superMatcher.el;
-                                        }
-                                }
-
-                                // Track unmatched elements for set filters
-                                if ( bySet ) {
-                                        // They will have gone through all possible matchers
-                                        if ( (elem = !matcher && elem) ) {
-                                                matchedCount--;
-                                        }
-
-                                        // Lengthen the array for every element, matched or not
-                                        if ( seed ) {
-                                                unmatched.push( elem );
-                                        }
-                                }
-                        }
-
-                        // Apply set filters to unmatched elements
-                        matchedCount += i;
-                        if ( bySet && i !== matchedCount ) {
-                                for ( j = 0; (matcher = setMatchers[j]); j++ ) {
-                                        matcher( unmatched, setMatched, context, xml );
-                                }
-
-                                if ( seed ) {
-                                        // Reintegrate element matches to eliminate the need for sorting
-                                        if ( matchedCount > 0 ) {
-                                                while ( i-- ) {
-                                                        if ( !(unmatched[i] || setMatched[i]) ) {
-                                                                setMatched[i] = pop.call( results );
-                                                        }
-                                                }
-                                        }
-
-                                        // Discard index placeholder values to get only actual matches
-                                        setMatched = condense( setMatched );
-                                }
-
-                                // Add matches to results
-                                push.apply( results, setMatched );
-
-                                // Seedless set matches succeeding multiple successful matchers stipulate sorting
-                                if ( outermost && !seed && setMatched.length > 0 &&
-                                        ( matchedCount + setMatchers.length ) > 1 ) {
-
-                                        Sizzle.uniqueSort( results );
-                                }
-                        }
-
-                        // Override manipulation of globals by nested matchers
-                        if ( outermost ) {
-                                dirruns = dirrunsUnique;
-                                outermostContext = contextBackup;
-                        }
-
-                        return unmatched;
-                };
-
-        superMatcher.el = 0;
-        return bySet ?
-                markFunction( superMatcher ) :
-                superMatcher;
-}
-
-compile = Sizzle.compile = function( selector, group /* Internal Use Only */ ) {
-        var i,
-                setMatchers = [],
-                elementMatchers = [],
-                cached = compilerCache[ expando ][ selector + " " ];
-
-        if ( !cached ) {
-                // Generate a function of recursive functions that can be used to check each element
-                if ( !group ) {
-                        group = tokenize( selector );
-                }
-                i = group.length;
-                while ( i-- ) {
-                        cached = matcherFromTokens( group[i] );
-                        if ( cached[ expando ] ) {
-                                setMatchers.push( cached );
-                        } else {
-                                elementMatchers.push( cached );
-                        }
-                }
-
-                // Cache the compiled function
-                cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) );
-        }
-        return cached;
-};
-
-function multipleContexts( selector, contexts, results ) {
-        var i = 0,
-                len = contexts.length;
-        for ( ; i < len; i++ ) {
-                Sizzle( selector, contexts[i], results );
-        }
-        return results;
-}
-
-function select( selector, context, results, seed, xml ) {
-        var i, tokens, token, type, find,
-                match = tokenize( selector ),
-                j = match.length;
-
-        if ( !seed ) {
-                // Try to minimize operations if there is only one group
-                if ( match.length === 1 ) {
-
-                        // Take a shortcut and set the context if the root selector is an ID
-                        tokens = match[0] = match[0].slice( 0 );
-                        if ( tokens.length > 2 && (token = tokens[0]).type === "ID" &&
-                                        context.nodeType === 9 && !xml &&
-                                        Expr.relative[ tokens[1].type ] ) {
-
-                                context = Expr.find["ID"]( token.matches[0].replace( rbackslash, "" ), context, xml )[0];
-                                if ( !context ) {
-                                        return results;
-                                }
-
-                                selector = selector.slice( tokens.shift().length );
-                        }
-
-                        // Fetch a seed set for right-to-left matching
-                        for ( i = matchExpr["POS"].test( selector ) ? -1 : tokens.length - 1; i >= 0; i-- ) {
-                                token = tokens[i];
-
-                                // Abort if we hit a combinator
-                                if ( Expr.relative[ (type = token.type) ] ) {
-                                        break;
-                                }
-                                if ( (find = Expr.find[ type ]) ) {
-                                        // Search, expanding context for leading sibling combinators
-                                        if ( (seed = find(
-                                                token.matches[0].replace( rbackslash, "" ),
-                                                rsibling.test( tokens[0].type ) && context.parentNode || context,
-                                                xml
-                                        )) ) {
-
-                                                // If seed is empty or no tokens remain, we can return early
-                                                tokens.splice( i, 1 );
-                                                selector = seed.length && tokens.join("");
-                                                if ( !selector ) {
-                                                        push.apply( results, slice.call( seed, 0 ) );
-                                                        return results;
-                                                }
-
-                                                break;
-                                        }
-                                }
-                        }
-                }
-        }
-
-        // Compile and execute a filtering function
-        // Provide `match` to avoid retokenization if we modified the selector above
-        compile( selector, match )(
-                seed,
-                context,
-                xml,
-                results,
-                rsibling.test( selector )
-        );
-        return results;
-}
-
-if ( document.querySelectorAll ) {
-        (function() {
-                var disconnectedMatch,
-                        oldSelect = select,
-                        rescape = /'|\\/g,
-                        rattributeQuotes = /\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,
-
-                        // qSa(:focus) reports false when true (Chrome 21), no need to also add to buggyMatches since matches checks buggyQSA
-                        // A support test would require too much code (would include document ready)
-                        rbuggyQSA = [ ":focus" ],
-
-                        // matchesSelector(:active) reports false when true (IE9/Opera 11.5)
-                        // A support test would require too much code (would include document ready)
-                        // just skip matchesSelector for :active
-                        rbuggyMatches = [ ":active" ],
-                        matches = docElem.matchesSelector ||
-                                docElem.mozMatchesSelector ||
-                                docElem.webkitMatchesSelector ||
-                                docElem.oMatchesSelector ||
-                                docElem.msMatchesSelector;
-
-                // Build QSA regex
-                // Regex strategy adopted from Diego Perini
-                assert(function( div ) {
-                        // Select is set to empty string on purpose
-                        // This is to test IE's treatment of not explictly
-                        // setting a boolean content attribute,
-                        // since its presence should be enough
-                        // http://bugs.jquery.com/ticket/12359
-                        div.innerHTML = "<select><option selected=''></option></select>";
-
-                        // IE8 - Some boolean attributes are not treated correctly
-                        if ( !div.querySelectorAll("[selected]").length ) {
-                                rbuggyQSA.push( "\\[" + whitespace + "*(?:checked|disabled|ismap|multiple|readonly|selected|value)" );
-                        }
-
-                        // Webkit/Opera - :checked should return selected option elements
-                        // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
-                        // IE8 throws error here (do not put tests after this one)
-                        if ( !div.querySelectorAll(":checked").length ) {
-                                rbuggyQSA.push(":checked");
-                        }
-                });
-
-                assert(function( div ) {
-
-                        // Opera 10-12/IE9 - ^= $= *= and empty values
-                        // Should not select anything
-                        div.innerHTML = "<p test=''></p>";
-                        if ( div.querySelectorAll("[test^='']").length ) {
-                                rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:\"\"|'')" );
-                        }
-
-                        // FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled)
-                        // IE8 throws error here (do not put tests after this one)
-                        div.innerHTML = "<input type='hidden'/>";
-                        if ( !div.querySelectorAll(":enabled").length ) {
-                                rbuggyQSA.push(":enabled", ":disabled");
-                        }
-                });
-
-                // rbuggyQSA always contains :focus, so no need for a length check
-                rbuggyQSA = /* rbuggyQSA.length && */ new RegExp( rbuggyQSA.join("|") );
-
-                select = function( selector, context, results, seed, xml ) {
-                        // Only use querySelectorAll when not filtering,
-                        // when this is not xml,
-                        // and when no QSA bugs apply
-                        if ( !seed && !xml && !rbuggyQSA.test( selector ) ) {
-                                var groups, i,
-                                        old = true,
-                                        nid = expando,
-                                        newContext = context,
-                                        newSelector = context.nodeType === 9 && selector;
-
-                                // qSA works strangely on Element-rooted queries
-                                // We can work around this by specifying an extra ID on the root
-                                // and working up from there (Thanks to Andrew Dupont for the technique)
-                                // IE 8 doesn't work on object elements
-                                if ( context.nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) {
-                                        groups = tokenize( selector );
-
-                                        if ( (old = context.getAttribute("id")) ) {
-                                                nid = old.replace( rescape, "\\$&" );
-                                        } else {
-                                                context.setAttribute( "id", nid );
-                                        }
-                                        nid = "[id='" + nid + "'] ";
-
-                                        i = groups.length;
-                                        while ( i-- ) {
-                                                groups[i] = nid + groups[i].join("");
-                                        }
-                                        newContext = rsibling.test( selector ) && context.parentNode || context;
-                                        newSelector = groups.join(",");
-                                }
-
-                                if ( newSelector ) {
-                                        try {
-                                                push.apply( results, slice.call( newContext.querySelectorAll(
-                                                        newSelector
-                                                ), 0 ) );
-                                                return results;
-                                        } catch(qsaError) {
-                                        } finally {
-                                                if ( !old ) {
-                                                        context.removeAttribute("id");
-                                                }
-                                        }
-                                }
-                        }
-
-                        return oldSelect( selector, context, results, seed, xml );
-                };
-
-                if ( matches ) {
-                        assert(function( div ) {
-                                // Check to see if it's possible to do matchesSelector
-                                // on a disconnected node (IE 9)
-                                disconnectedMatch = matches.call( div, "div" );
-
-                                // This should fail with an exception
-                                // Gecko does not error, returns false instead
-                                try {
-                                        matches.call( div, "[test!='']:sizzle" );
-                                        rbuggyMatches.push( "!=", pseudos );
-                                } catch ( e ) {}
-                        });
-
-                        // rbuggyMatches always contains :active and :focus, so no need for a length check
-                        rbuggyMatches = /* rbuggyMatches.length && */ new RegExp( rbuggyMatches.join("|") );
-
-                        Sizzle.matchesSelector = function( elem, expr ) {
-                                // Make sure that attribute selectors are quoted
-                                expr = expr.replace( rattributeQuotes, "='$1']" );
-
-                                // rbuggyMatches always contains :active, so no need for an existence check
-                                if ( !isXML( elem ) && !rbuggyMatches.test( expr ) && !rbuggyQSA.test( expr ) ) {
-                                        try {
-                                                var ret = matches.call( elem, expr );
-
-                                                // IE 9's matchesSelector returns false on disconnected nodes
-                                                if ( ret || disconnectedMatch ||
-                                                                // As well, disconnected nodes are said to be in a document
-                                                                // fragment in IE 9
-                                                                elem.document && elem.document.nodeType !== 11 ) {
-                                                        return ret;
-                                                }
-                                        } catch(e) {}
-                                }
-
-                                return Sizzle( expr, null, null, [ elem ] ).length > 0;
-                        };
-                }
-        })();
-}
-
-// Deprecated
-Expr.pseudos["nth"] = Expr.pseudos["eq"];
-
-// Back-compat
-function setFilters() {}
-Expr.filters = setFilters.prototype = Expr.pseudos;
-Expr.setFilters = new setFilters();
-
-// Override sizzle attribute retrieval
-Sizzle.attr = jQuery.attr;
-jQuery.find = Sizzle;
-jQuery.expr = Sizzle.selectors;
-jQuery.expr[":"] = jQuery.expr.pseudos;
-jQuery.unique = Sizzle.uniqueSort;
-jQuery.text = Sizzle.getText;
-jQuery.isXMLDoc = Sizzle.isXML;
-jQuery.contains = Sizzle.contains;
-
-
-})( window );
-var runtil = /Until$/,
-        rparentsprev = /^(?:parents|prev(?:Until|All))/,
-        isSimple = /^.[^:#\[\.,]*$/,
-        rneedsContext = jQuery.expr.match.needsContext,
-        // methods guaranteed to produce a unique set when starting from a unique set
-        guaranteedUnique = {
-                children: true,
-                contents: true,
-                next: true,
-                prev: true
-        };
-
-jQuery.fn.extend({
-        find: function( selector ) {
-                var i, l, length, n, r, ret,
-                        self = this;
-
-                if ( typeof selector !== "string" ) {
-                        return jQuery( selector ).filter(function() {
-                                for ( i = 0, l = self.length; i < l; i++ ) {
-                                        if ( jQuery.contains( self[ i ], this ) ) {
-                                                return true;
-                                        }
-                                }
-                        });
-                }
-
-                ret = this.pushStack( "", "find", selector );
-
-                for ( i = 0, l = this.length; i < l; i++ ) {
-                        length = ret.length;
-                        jQuery.find( selector, this[i], ret );
-
-                        if ( i > 0 ) {
-                                // Make sure that the results are unique
-                                for ( n = length; n < ret.length; n++ ) {
-                                        for ( r = 0; r < length; r++ ) {
-                                                if ( ret[r] === ret[n] ) {
-                                                        ret.splice(n--, 1);
-                                                        break;
-                                                }
-                                        }
-                                }
-                        }
-                }
-
-                return ret;
-        },
-
-        has: function( target ) {
-                var i,
-                        targets = jQuery( target, this ),
-                        len = targets.length;
-
-                return this.filter(function() {
-                        for ( i = 0; i < len; i++ ) {
-                                if ( jQuery.contains( this, targets[i] ) ) {
-                                        return true;
-                                }
-                        }
-                });
-        },
-
-        not: function( selector ) {
-                return this.pushStack( winnow(this, selector, false), "not", selector);
-        },
-
-        filter: function( selector ) {
-                return this.pushStack( winnow(this, selector, true), "filter", selector );
-        },
-
-        is: function( selector ) {
-                return !!selector && (
-                        typeof selector === "string" ?
-                                // If this is a positional/relative selector, check membership in the returned set
-                                // so $("p:first").is("p:last") won't return true for a doc with two "p".
-                                rneedsContext.test( selector ) ?
-                                        jQuery( selector, this.context ).index( this[0] ) >= 0 :
-                                        jQuery.filter( selector, this ).length > 0 :
-                                this.filter( selector ).length > 0 );
-        },
-
-        closest: function( selectors, context ) {
-                var cur,
-                        i = 0,
-                        l = this.length,
-                        ret = [],
-                        pos = rneedsContext.test( selectors ) || typeof selectors !== "string" ?
-                                jQuery( selectors, context || this.context ) :
-                                0;
-
-                for ( ; i < l; i++ ) {
-                        cur = this[i];
-
-                        while ( cur && cur.ownerDocument && cur !== context && cur.nodeType !== 11 ) {
-                                if ( pos ? pos.index(cur) > -1 : jQuery.find.matchesSelector(cur, selectors) ) {
-                                        ret.push( cur );
-                                        break;
-                                }
-                                cur = cur.parentNode;
-                        }
-                }
-
-                ret = ret.length > 1 ? jQuery.unique( ret ) : ret;
-
-                return this.pushStack( ret, "closest", selectors );
-        },
-
-        // Determine the position of an element within
-        // the matched set of elements
-        index: function( elem ) {
-
-                // No argument, return index in parent
-                if ( !elem ) {
-                        return ( this[0] && this[0].parentNode ) ? this.prevAll().length : -1;
-                }
-
-                // index in selector
-                if ( typeof elem === "string" ) {
-                        return jQuery.inArray( this[0], jQuery( elem ) );
-                }
-
-                // Locate the position of the desired element
-                return jQuery.inArray(
-                        // If it receives a jQuery object, the first element is used
-                        elem.jquery ? elem[0] : elem, this );
-        },
-
-        add: function( selector, context ) {
-                var set = typeof selector === "string" ?
-                                jQuery( selector, context ) :
-                                jQuery.makeArray( selector && selector.nodeType ? [ selector ] : selector ),
-                        all = jQuery.merge( this.get(), set );
-
-                return this.pushStack( isDisconnected( set[0] ) || isDisconnected( all[0] ) ?
-                        all :
-                        jQuery.unique( all ) );
-        },
-
-        addBack: function( selector ) {
-                return this.add( selector == null ?
-                        this.prevObject : this.prevObject.filter(selector)
-                );
-        }
-});
-
-jQuery.fn.andSelf = jQuery.fn.addBack;
-
-// A painfully simple check to see if an element is disconnected
-// from a document (should be improved, where feasible).
-function isDisconnected( node ) {
-        return !node || !node.parentNode || node.parentNode.nodeType === 11;
-}
-
-function sibling( cur, dir ) {
-        do {
-                cur = cur[ dir ];
-        } while ( cur && cur.nodeType !== 1 );
-
-        return cur;
-}
-
-jQuery.each({
-        parent: function( elem ) {
-                var parent = elem.parentNode;
-                return parent && parent.nodeType !== 11 ? parent : null;
-        },
-        parents: function( elem ) {
-                return jQuery.dir( elem, "parentNode" );
-        },
-        parentsUntil: function( elem, i, until ) {
-                return jQuery.dir( elem, "parentNode", until );
-        },
-        next: function( elem ) {
-                return sibling( elem, "nextSibling" );
-        },
-        prev: function( elem ) {
-                return sibling( elem, "previousSibling" );
-        },
-        nextAll: function( elem ) {
-                return jQuery.dir( elem, "nextSibling" );
-        },
-        prevAll: function( elem ) {
-                return jQuery.dir( elem, "previousSibling" );
-        },
-        nextUntil: function( elem, i, until ) {
-                return jQuery.dir( elem, "nextSibling", until );
-        },
-        prevUntil: function( elem, i, until ) {
-                return jQuery.dir( elem, "previousSibling", until );
-        },
-        siblings: function( elem ) {
-                return jQuery.sibling( ( elem.parentNode || {} ).firstChild, elem );
-        },
-        children: function( elem ) {
-                return jQuery.sibling( elem.firstChild );
-        },
-        contents: function( elem ) {
-                return jQuery.nodeName( elem, "iframe" ) ?
-                        elem.contentDocument || elem.contentWindow.document :
-                        jQuery.merge( [], elem.childNodes );
-        }
-}, function( name, fn ) {
-        jQuery.fn[ name ] = function( until, selector ) {
-                var ret = jQuery.map( this, fn, until );
-
-                if ( !runtil.test( name ) ) {
-                        selector = until;
-                }
-
-                if ( selector && typeof selector === "string" ) {
-                        ret = jQuery.filter( selector, ret );
-                }
-
-                ret = this.length > 1 && !guaranteedUnique[ name ] ? jQuery.unique( ret ) : ret;
-
-                if ( this.length > 1 && rparentsprev.test( name ) ) {
-                        ret = ret.reverse();
-                }
-
-                return this.pushStack( ret, name, core_slice.call( arguments ).join(",") );
-        };
-});
-
-jQuery.extend({
-        filter: function( expr, elems, not ) {
-                if ( not ) {
-                        expr = ":not(" + expr + ")";
-                }
-
-                return elems.length === 1 ?
-                        jQuery.find.matchesSelector(elems[0], expr) ? [ elems[0] ] : [] :
-                        jQuery.find.matches(expr, elems);
-        },
-
-        dir: function( elem, dir, until ) {
-                var matched = [],
-                        cur = elem[ dir ];
-
-                while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) {
-                        if ( cur.nodeType === 1 ) {
-                                matched.push( cur );
-                        }
-                        cur = cur[dir];
-                }
-                return matched;
-        },
-
-        sibling: function( n, elem ) {
-                var r = [];
-
-                for ( ; n; n = n.nextSibling ) {
-                        if ( n.nodeType === 1 && n !== elem ) {
-                                r.push( n );
-                        }
-                }
-
-                return r;
-        }
-});
-
-// Implement the identical functionality for filter and not
-function winnow( elements, qualifier, keep ) {
-
-        // Can't pass null or undefined to indexOf in Firefox 4
-        // Set to 0 to skip string check
-        qualifier = qualifier || 0;
-
-        if ( jQuery.isFunction( qualifier ) ) {
-                return jQuery.grep(elements, function( elem, i ) {
-                        var retVal = !!qualifier.call( elem, i, elem );
-                        return retVal === keep;
-                });
-
-        } else if ( qualifier.nodeType ) {
-                return jQuery.grep(elements, function( elem, i ) {
-                        return ( elem === qualifier ) === keep;
-                });
-
-        } else if ( typeof qualifier === "string" ) {
-                var filtered = jQuery.grep(elements, function( elem ) {
-                        return elem.nodeType === 1;
-                });
-
-                if ( isSimple.test( qualifier ) ) {
-                        return jQuery.filter(qualifier, filtered, !keep);
-                } else {
-                        qualifier = jQuery.filter( qualifier, filtered );
-                }
-        }
-
-        return jQuery.grep(elements, function( elem, i ) {
-                return ( jQuery.inArray( elem, qualifier ) >= 0 ) === keep;
-        });
-}
-function createSafeFragment( document ) {
-        var list = nodeNames.split( "|" ),
-        safeFrag = document.createDocumentFragment();
-
-        if ( safeFrag.createElement ) {
-                while ( list.length ) {
-                        safeFrag.createElement(
-                                list.pop()
-                        );
-                }
-        }
-        return safeFrag;
-}
-
-var nodeNames = "abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|" +
-                "header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",
-        rinlinejQuery = / jQuery\d+="(?:null|\d+)"/g,
-        rleadingWhitespace = /^\s+/,
-        rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,
-        rtagName = /<([\w:]+)/,
-        rtbody = /<tbody/i,
-        rhtml = /<|&#?\w+;/,
-        rnoInnerhtml = /<(?:script|style|link)/i,
-        rnocache = /<(?:script|object|embed|option|style)/i,
-        rnoshimcache = new RegExp("<(?:" + nodeNames + ")[\\s/>]", "i"),
-        rcheckableType = /^(?:checkbox|radio)$/,
-        // checked="checked" or checked
-        rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
-        rscriptType = /\/(java|ecma)script/i,
-        rcleanScript = /^\s*<!(?:\[CDATA\[|\-\-)|[\]\-]{2}>\s*$/g,
-        wrapMap = {
-                option: [ 1, "<select multiple='multiple'>", "</select>" ],
-                legend: [ 1, "<fieldset>", "</fieldset>" ],
-                thead: [ 1, "<table>", "</table>" ],
-                tr: [ 2, "<table><tbody>", "</tbody></table>" ],
-                td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
-                col: [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ],
-                area: [ 1, "<map>", "</map>" ],
-                _default: [ 0, "", "" ]
-        },
-        safeFragment = createSafeFragment( document ),
-        fragmentDiv = safeFragment.appendChild( document.createElement("div") );
-
-wrapMap.optgroup = wrapMap.option;
-wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
-wrapMap.th = wrapMap.td;
-
-// IE6-8 can't serialize link, script, style, or any html5 (NoScope) tags,
-// unless wrapped in a div with non-breaking characters in front of it.
-if ( !jQuery.support.htmlSerialize ) {
-        wrapMap._default = [ 1, "X<div>", "</div>" ];
-}
-
-jQuery.fn.extend({
-        text: function( value ) {
-                return jQuery.access( this, function( value ) {
-                        return value === undefined ?
-                                jQuery.text( this ) :
-                                this.empty().append( ( this[0] && this[0].ownerDocument || document ).createTextNode( value ) );
-                }, null, value, arguments.length );
-        },
-
-        wrapAll: function( html ) {
-                if ( jQuery.isFunction( html ) ) {
-                        return this.each(function(i) {
-                                jQuery(this).wrapAll( html.call(this, i) );
-                        });
-                }
-
-                if ( this[0] ) {
-                        // The elements to wrap the target around
-                        var wrap = jQuery( html, this[0].ownerDocument ).eq(0).clone(true);
-
-                        if ( this[0].parentNode ) {
-                                wrap.insertBefore( this[0] );
-                        }
-
-                        wrap.map(function() {
-                                var elem = this;
-
-                                while ( elem.firstChild && elem.firstChild.nodeType === 1 ) {
-                                        elem = elem.firstChild;
-                                }
-
-                                return elem;
-                        }).append( this );
-                }
-
-                return this;
-        },
-
-        wrapInner: function( html ) {
-                if ( jQuery.isFunction( html ) ) {
-                        return this.each(function(i) {
-                                jQuery(this).wrapInner( html.call(this, i) );
-                        });
-                }
-
-                return this.each(function() {
-                        var self = jQuery( this ),
-                                contents = self.contents();
-
-                        if ( contents.length ) {
-                                contents.wrapAll( html );
-
-                        } else {
-                                self.append( html );
-                        }
-                });
-        },
-
-        wrap: function( html ) {
-                var isFunction = jQuery.isFunction( html );
-
-                return this.each(function(i) {
-                        jQuery( this ).wrapAll( isFunction ? html.call(this, i) : html );
-                });
-        },
-
-        unwrap: function() {
-                return this.parent().each(function() {
-                        if ( !jQuery.nodeName( this, "body" ) ) {
-                                jQuery( this ).replaceWith( this.childNodes );
-                        }
-                }).end();
-        },
-
-        append: function() {
-                return this.domManip(arguments, true, function( elem ) {
-                        if ( this.nodeType === 1 || this.nodeType === 11 ) {
-                                this.appendChild( elem );
-                        }
-                });
-        },
-
-        prepend: function() {
-                return this.domManip(arguments, true, function( elem ) {
-                        if ( this.nodeType === 1 || this.nodeType === 11 ) {
-                                this.insertBefore( elem, this.firstChild );
-                        }
-                });
-        },
-
-        before: function() {
-                if ( !isDisconnected( this[0] ) ) {
-                        return this.domManip(arguments, false, function( elem ) {
-                                this.parentNode.insertBefore( elem, this );
-                        });
-                }
-
-                if ( arguments.length ) {
-                        var set = jQuery.clean( arguments );
-                        return this.pushStack( jQuery.merge( set, this ), "before", this.selector );
-                }
-        },
-
-        after: function() {
-                if ( !isDisconnected( this[0] ) ) {
-                        return this.domManip(arguments, false, function( elem ) {
-                                this.parentNode.insertBefore( elem, this.nextSibling );
-                        });
-                }
-
-                if ( arguments.length ) {
-                        var set = jQuery.clean( arguments );
-                        return this.pushStack( jQuery.merge( this, set ), "after", this.selector );
-                }
-        },
-
-        // keepData is for internal use only--do not document
-        remove: function( selector, keepData ) {
-                var elem,
-                        i = 0;
-
-                for ( ; (elem = this[i]) != null; i++ ) {
-                        if ( !selector || jQuery.filter( selector, [ elem ] ).length ) {
-                                if ( !keepData && elem.nodeType === 1 ) {
-                                        jQuery.cleanData( elem.getElementsByTagName("*") );
-                                        jQuery.cleanData( [ elem ] );
-                                }
-
-                                if ( elem.parentNode ) {
-                                        elem.parentNode.removeChild( elem );
-                                }
-                        }
-                }
-
-                return this;
-        },
-
-        empty: function() {
-                var elem,
-                        i = 0;
-
-                for ( ; (elem = this[i]) != null; i++ ) {
-                        // Remove element nodes and prevent memory leaks
-                        if ( elem.nodeType === 1 ) {
-                                jQuery.cleanData( elem.getElementsByTagName("*") );
-                        }
-
-                        // Remove any remaining nodes
-                        while ( elem.firstChild ) {
-                                elem.removeChild( elem.firstChild );
-                        }
-                }
-
-                return this;
-        },
-
-        clone: function( dataAndEvents, deepDataAndEvents ) {
-                dataAndEvents = dataAndEvents == null ? false : dataAndEvents;
-                deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
-
-                return this.map( function () {
-                        return jQuery.clone( this, dataAndEvents, deepDataAndEvents );
-                });
-        },
-
-        html: function( value ) {
-                return jQuery.access( this, function( value ) {
-                        var elem = this[0] || {},
-                                i = 0,
-                                l = this.length;
-
-                        if ( value === undefined ) {
-                                return elem.nodeType === 1 ?
-                                        elem.innerHTML.replace( rinlinejQuery, "" ) :
-                                        undefined;
-                        }
-
-                        // See if we can take a shortcut and just use innerHTML
-                        if ( typeof value === "string" && !rnoInnerhtml.test( value ) &&
-                                ( jQuery.support.htmlSerialize || !rnoshimcache.test( value )  ) &&
-                                ( jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value ) ) &&
-                                !wrapMap[ ( rtagName.exec( value ) || ["", ""] )[1].toLowerCase() ] ) {
-
-                                value = value.replace( rxhtmlTag, "<$1></$2>" );
-
-                                try {
-                                        for (; i < l; i++ ) {
-                                                // Remove element nodes and prevent memory leaks
-                                                elem = this[i] || {};
-                                                if ( elem.nodeType === 1 ) {
-                                                        jQuery.cleanData( elem.getElementsByTagName( "*" ) );
-                                                        elem.innerHTML = value;
-                                                }
-                                        }
-
-                                        elem = 0;
-
-                                // If using innerHTML throws an exception, use the fallback method
-                                } catch(e) {}
-                        }
-
-                        if ( elem ) {
-                                this.empty().append( value );
-                        }
-                }, null, value, arguments.length );
-        },
-
-        replaceWith: function( value ) {
-                if ( !isDisconnected( this[0] ) ) {
-                        // Make sure that the elements are removed from the DOM before they are inserted
-                        // this can help fix replacing a parent with child elements
-                        if ( jQuery.isFunction( value ) ) {
-                                return this.each(function(i) {
-                                        var self = jQuery(this), old = self.html();
-                                        self.replaceWith( value.call( this, i, old ) );
-                                });
-                        }
-
-                        if ( typeof value !== "string" ) {
-                                value = jQuery( value ).detach();
-                        }
-
-                        return this.each(function() {
-                                var next = this.nextSibling,
-                                        parent = this.parentNode;
-
-                                jQuery( this ).remove();
-
-                                if ( next ) {
-                                        jQuery(next).before( value );
-                                } else {
-                                        jQuery(parent).append( value );
-                                }
-                        });
-                }
-
-                return this.length ?
-                        this.pushStack( jQuery(jQuery.isFunction(value) ? value() : value), "replaceWith", value ) :
-                        this;
-        },
-
-        detach: function( selector ) {
-                return this.remove( selector, true );
-        },
-
-        domManip: function( args, table, callback ) {
-
-                // Flatten any nested arrays
-                args = [].concat.apply( [], args );
-
-                var results, first, fragment, iNoClone,
-                        i = 0,
-                        value = args[0],
-                        scripts = [],
-                        l = this.length;
-
-                // We can't cloneNode fragments that contain checked, in WebKit
-                if ( !jQuery.support.checkClone && l > 1 && typeof value === "string" && rchecked.test( value ) ) {
-                        return this.each(function() {
-                                jQuery(this).domManip( args, table, callback );
-                        });
-                }
-
-                if ( jQuery.isFunction(value) ) {
-                        return this.each(function(i) {
-                                var self = jQuery(this);
-                                args[0] = value.call( this, i, table ? self.html() : undefined );
-                                self.domManip( args, table, callback );
-                        });
-                }
-
-                if ( this[0] ) {
-                        results = jQuery.buildFragment( args, this, scripts );
-                        fragment = results.fragment;
-                        first = fragment.firstChild;
-
-                        if ( fragment.childNodes.length === 1 ) {
-                                fragment = first;
-                        }
-
-                        if ( first ) {
-                                table = table && jQuery.nodeName( first, "tr" );
-
-                                // Use the original fragment for the last item instead of the first because it can end up
-                                // being emptied incorrectly in certain situations (#8070).
-                                // Fragments from the fragment cache must always be cloned and never used in place.
-                                for ( iNoClone = results.cacheable || l - 1; i < l; i++ ) {
-                                        callback.call(
-                                                table && jQuery.nodeName( this[i], "table" ) ?
-                                                        findOrAppend( this[i], "tbody" ) :
-                                                        this[i],
-                                                i === iNoClone ?
-                                                        fragment :
-                                                        jQuery.clone( fragment, true, true )
-                                        );
-                                }
-                        }
-
-                        // Fix #11809: Avoid leaking memory
-                        fragment = first = null;
-
-                        if ( scripts.length ) {
-                                jQuery.each( scripts, function( i, elem ) {
-                                        if ( elem.src ) {
-                                                if ( jQuery.ajax ) {
-                                                        jQuery.ajax({
-                                                                url: elem.src,
-                                                                type: "GET",
-                                                                dataType: "script",
-                                                                async: false,
-                                                                global: false,
-                                                                "throws": true
-                                                        });
-                                                } else {
-                                                        jQuery.error("no ajax");
-                                                }
-                                        } else {
-                                                jQuery.globalEval( ( elem.text || elem.textContent || elem.innerHTML || "" ).replace( rcleanScript, "" ) );
-                                        }
-
-                                        if ( elem.parentNode ) {
-                                                elem.parentNode.removeChild( elem );
-                                        }
-                                });
-                        }
-                }
-
-                return this;
-        }
-});
-
-function findOrAppend( elem, tag ) {
-        return elem.getElementsByTagName( tag )[0] || elem.appendChild( elem.ownerDocument.createElement( tag ) );
-}
-
-function cloneCopyEvent( src, dest ) {
-
-        if ( dest.nodeType !== 1 || !jQuery.hasData( src ) ) {
-                return;
-        }
-
-        var type, i, l,
-                oldData = jQuery._data( src ),
-                curData = jQuery._data( dest, oldData ),
-                events = oldData.events;
-
-        if ( events ) {
-                delete curData.handle;
-                curData.events = {};
-
-                for ( type in events ) {
-                        for ( i = 0, l = events[ type ].length; i < l; i++ ) {
-                                jQuery.event.add( dest, type, events[ type ][ i ] );
-                        }
-                }
-        }
-
-        // make the cloned public data object a copy from the original
-        if ( curData.data ) {
-                curData.data = jQuery.extend( {}, curData.data );
-        }
-}
-
-function cloneFixAttributes( src, dest ) {
-        var nodeName;
-
-        // We do not need to do anything for non-Elements
-        if ( dest.nodeType !== 1 ) {
-                return;
-        }
-
-        // clearAttributes removes the attributes, which we don't want,
-        // but also removes the attachEvent events, which we *do* want
-        if ( dest.clearAttributes ) {
-                dest.clearAttributes();
-        }
-
-        // mergeAttributes, in contrast, only merges back on the
-        // original attributes, not the events
-        if ( dest.mergeAttributes ) {
-                dest.mergeAttributes( src );
-        }
-
-        nodeName = dest.nodeName.toLowerCase();
-
-        if ( nodeName === "object" ) {
-                // IE6-10 improperly clones children of object elements using classid.
-                // IE10 throws NoModificationAllowedError if parent is null, #12132.
-                if ( dest.parentNode ) {
-                        dest.outerHTML = src.outerHTML;
-                }
-
-                // This path appears unavoidable for IE9. When cloning an object
-                // element in IE9, the outerHTML strategy above is not sufficient.
-                // If the src has innerHTML and the destination does not,
-                // copy the src.innerHTML into the dest.innerHTML. #10324
-                if ( jQuery.support.html5Clone && (src.innerHTML && !jQuery.trim(dest.innerHTML)) ) {
-                        dest.innerHTML = src.innerHTML;
-                }
-
-        } else if ( nodeName === "input" && rcheckableType.test( src.type ) ) {
-                // IE6-8 fails to persist the checked state of a cloned checkbox
-                // or radio button. Worse, IE6-7 fail to give the cloned element
-                // a checked appearance if the defaultChecked value isn't also set
-
-                dest.defaultChecked = dest.checked = src.checked;
-
-                // IE6-7 get confused and end up setting the value of a cloned
-                // checkbox/radio button to an empty string instead of "on"
-                if ( dest.value !== src.value ) {
-                        dest.value = src.value;
-                }
-
-        // IE6-8 fails to return the selected option to the default selected
-        // state when cloning options
-        } else if ( nodeName === "option" ) {
-                dest.selected = src.defaultSelected;
-
-        // IE6-8 fails to set the defaultValue to the correct value when
-        // cloning other types of input fields
-        } else if ( nodeName === "input" || nodeName === "textarea" ) {
-                dest.defaultValue = src.defaultValue;
-
-        // IE blanks contents when cloning scripts
-        } else if ( nodeName === "script" && dest.text !== src.text ) {
-                dest.text = src.text;
-        }
-
-        // Event data gets referenced instead of copied if the expando
-        // gets copied too
-        dest.removeAttribute( jQuery.expando );
-}
-
-jQuery.buildFragment = function( args, context, scripts ) {
-        var fragment, cacheable, cachehit,
-                first = args[ 0 ];
-
-        // Set context from what may come in as undefined or a jQuery collection or a node
-        // Updated to fix #12266 where accessing context[0] could throw an exception in IE9/10 &
-        // also doubles as fix for #8950 where plain objects caused createDocumentFragment exception
-        context = context || document;
-        context = !context.nodeType && context[0] || context;
-        context = context.ownerDocument || context;
-
-        // Only cache "small" (1/2 KB) HTML strings that are associated with the main document
-        // Cloning options loses the selected state, so don't cache them
-        // IE 6 doesn't like it when you put <object> or <embed> elements in a fragment
-        // Also, WebKit does not clone 'checked' attributes on cloneNode, so don't cache
-        // Lastly, IE6,7,8 will not correctly reuse cached fragments that were created from unknown elems #10501
-        if ( args.length === 1 && typeof first === "string" && first.length < 512 && context === document &&
-                first.charAt(0) === "<" && !rnocache.test( first ) &&
-                (jQuery.support.checkClone || !rchecked.test( first )) &&
-                (jQuery.support.html5Clone || !rnoshimcache.test( first )) ) {
-
-                // Mark cacheable and look for a hit
-                cacheable = true;
-                fragment = jQuery.fragments[ first ];
-                cachehit = fragment !== undefined;
-        }
-
-        if ( !fragment ) {
-                fragment = context.createDocumentFragment();
-                jQuery.clean( args, context, fragment, scripts );
-
-                // Update the cache, but only store false
-                // unless this is a second parsing of the same content
-                if ( cacheable ) {
-                        jQuery.fragments[ first ] = cachehit && fragment;
-                }
-        }
-
-        return { fragment: fragment, cacheable: cacheable };
-};
-
-jQuery.fragments = {};
-
-jQuery.each({
-        appendTo: "append",
-        prependTo: "prepend",
-        insertBefore: "before",
-        insertAfter: "after",
-        replaceAll: "replaceWith"
-}, function( name, original ) {
-        jQuery.fn[ name ] = function( selector ) {
-                var elems,
-                        i = 0,
-                        ret = [],
-                        insert = jQuery( selector ),
-                        l = insert.length,
-                        parent = this.length === 1 && this[0].parentNode;
-
-                if ( (parent == null || parent && parent.nodeType === 11 && parent.childNodes.length === 1) && l === 1 ) {
-                        insert[ original ]( this[0] );
-                        return this;
-                } else {
-                        for ( ; i < l; i++ ) {
-                                elems = ( i > 0 ? this.clone(true) : this ).get();
-                                jQuery( insert[i] )[ original ]( elems );
-                                ret = ret.concat( elems );
-                        }
-
-                        return this.pushStack( ret, name, insert.selector );
-                }
-        };
-});
-
-function getAll( elem ) {
-        if ( typeof elem.getElementsByTagName !== "undefined" ) {
-                return elem.getElementsByTagName( "*" );
-
-        } else if ( typeof elem.querySelectorAll !== "undefined" ) {
-                return elem.querySelectorAll( "*" );
-
-        } else {
-                return [];
-        }
-}
-
-// Used in clean, fixes the defaultChecked property
-function fixDefaultChecked( elem ) {
-        if ( rcheckableType.test( elem.type ) ) {
-                elem.defaultChecked = elem.checked;
-        }
-}
-
-jQuery.extend({
-        clone: function( elem, dataAndEvents, deepDataAndEvents ) {
-                var srcElements,
-                        destElements,
-                        i,
-                        clone;
-
-                if ( jQuery.support.html5Clone || jQuery.isXMLDoc(elem) || !rnoshimcache.test( "<" + elem.nodeName + ">" ) ) {
-                        clone = elem.cloneNode( true );
-
-                // IE<=8 does not properly clone detached, unknown element nodes
-                } else {
-                        fragmentDiv.innerHTML = elem.outerHTML;
-                        fragmentDiv.removeChild( clone = fragmentDiv.firstChild );
-                }
-
-                if ( (!jQuery.support.noCloneEvent || !jQuery.support.noCloneChecked) &&
-                                (elem.nodeType === 1 || elem.nodeType === 11) && !jQuery.isXMLDoc(elem) ) {
-                        // IE copies events bound via attachEvent when using cloneNode.
-                        // Calling detachEvent on the clone will also remove the events
-                        // from the original. In order to get around this, we use some
-                        // proprietary methods to clear the events. Thanks to MooTools
-                        // guys for this hotness.
-
-                        cloneFixAttributes( elem, clone );
-
-                        // Using Sizzle here is crazy slow, so we use getElementsByTagName instead
-                        srcElements = getAll( elem );
-                        destElements = getAll( clone );
-
-                        // Weird iteration because IE will replace the length property
-                        // with an element if you are cloning the body and one of the
-                        // elements on the page has a name or id of "length"
-                        for ( i = 0; srcElements[i]; ++i ) {
-                                // Ensure that the destination node is not null; Fixes #9587
-                                if ( destElements[i] ) {
-                                        cloneFixAttributes( srcElements[i], destElements[i] );
-                                }
-                        }
-                }
-
-                // Copy the events from the original to the clone
-                if ( dataAndEvents ) {
-                        cloneCopyEvent( elem, clone );
-
-                        if ( deepDataAndEvents ) {
-                                srcElements = getAll( elem );
-                                destElements = getAll( clone );
-
-                                for ( i = 0; srcElements[i]; ++i ) {
-                                        cloneCopyEvent( srcElements[i], destElements[i] );
-                                }
-                        }
-                }
-
-                srcElements = destElements = null;
-
-                // Return the cloned set
-                return clone;
-        },
-
-        clean: function( elems, context, fragment, scripts ) {
-                var i, j, elem, tag, wrap, depth, div, hasBody, tbody, len, handleScript, jsTags,
-                        safe = context === document && safeFragment,
-                        ret = [];
-
-                // Ensure that context is a document
-                if ( !context || typeof context.createDocumentFragment === "undefined" ) {
-                        context = document;
-                }
-
-                // Use the already-created safe fragment if context permits
-                for ( i = 0; (elem = elems[i]) != null; i++ ) {
-                        if ( typeof elem === "number" ) {
-                                elem += "";
-                        }
-
-                        if ( !elem ) {
-                                continue;
-                        }
-
-                        // Convert html string into DOM nodes
-                        if ( typeof elem === "string" ) {
-                                if ( !rhtml.test( elem ) ) {
-                                        elem = context.createTextNode( elem );
-                                } else {
-                                        // Ensure a safe container in which to render the html
-                                        safe = safe || createSafeFragment( context );
-                                        div = context.createElement("div");
-                                        safe.appendChild( div );
-
-                                        // Fix "XHTML"-style tags in all browsers
-                                        elem = elem.replace(rxhtmlTag, "<$1></$2>");
-
-                                        // Go to html and back, then peel off extra wrappers
-                                        tag = ( rtagName.exec( elem ) || ["", ""] )[1].toLowerCase();
-                                        wrap = wrapMap[ tag ] || wrapMap._default;
-                                        depth = wrap[0];
-                                        div.innerHTML = wrap[1] + elem + wrap[2];
-
-                                        // Move to the right depth
-                                        while ( depth-- ) {
-                                                div = div.lastChild;
-                                        }
-
-                                        // Remove IE's autoinserted <tbody> from table fragments
-                                        if ( !jQuery.support.tbody ) {
-
-                                                // String was a <table>, *may* have spurious <tbody>
-                                                hasBody = rtbody.test(elem);
-                                                        tbody = tag === "table" && !hasBody ?
-                                                                div.firstChild && div.firstChild.childNodes :
-
-                                                                // String was a bare <thead> or <tfoot>
-                                                                wrap[1] === "<table>" && !hasBody ?
-                                                                        div.childNodes :
-                                                                        [];
-
-                                                for ( j = tbody.length - 1; j >= 0 ; --j ) {
-                                                        if ( jQuery.nodeName( tbody[ j ], "tbody" ) && !tbody[ j ].childNodes.length ) {
-                                                                tbody[ j ].parentNode.removeChild( tbody[ j ] );
-                                                        }
-                                                }
-                                        }
-
-                                        // IE completely kills leading whitespace when innerHTML is used
-                                        if ( !jQuery.support.leadingWhitespace && rleadingWhitespace.test( elem ) ) {
-                                                div.insertBefore( context.createTextNode( rleadingWhitespace.exec(elem)[0] ), div.firstChild );
-                                        }
-
-                                        elem = div.childNodes;
-
-                                        // Take out of fragment container (we need a fresh div each time)
-                                        div.parentNode.removeChild( div );
-                                }
-                        }
-
-                        if ( elem.nodeType ) {
-                                ret.push( elem );
-                        } else {
-                                jQuery.merge( ret, elem );
-                        }
-                }
-
-                // Fix #11356: Clear elements from safeFragment
-                if ( div ) {
-                        elem = div = safe = null;
-                }
-
-                // Reset defaultChecked for any radios and checkboxes
-                // about to be appended to the DOM in IE 6/7 (#8060)
-                if ( !jQuery.support.appendChecked ) {
-                        for ( i = 0; (elem = ret[i]) != null; i++ ) {
-                                if ( jQuery.nodeName( elem, "input" ) ) {
-                                        fixDefaultChecked( elem );
-                                } else if ( typeof elem.getElementsByTagName !== "undefined" ) {
-                                        jQuery.grep( elem.getElementsByTagName("input"), fixDefaultChecked );
-                                }
-                        }
-                }
-
-                // Append elements to a provided document fragment
-                if ( fragment ) {
-                        // Special handling of each script element
-                        handleScript = function( elem ) {
-                                // Check if we consider it executable
-                                if ( !elem.type || rscriptType.test( elem.type ) ) {
-                                        // Detach the script and store it in the scripts array (if provided) or the fragment
-                                        // Return truthy to indicate that it has been handled
-                                        return scripts ?
-                                                scripts.push( elem.parentNode ? elem.parentNode.removeChild( elem ) : elem ) :
-                                                fragment.appendChild( elem );
-                                }
-                        };
-
-                        for ( i = 0; (elem = ret[i]) != null; i++ ) {
-                                // Check if we're done after handling an executable script
-                                if ( !( jQuery.nodeName( elem, "script" ) && handleScript( elem ) ) ) {
-                                        // Append to fragment and handle embedded scripts
-                                        fragment.appendChild( elem );
-                                        if ( typeof elem.getElementsByTagName !== "undefined" ) {
-                                                // handleScript alters the DOM, so use jQuery.merge to ensure snapshot iteration
-                                                jsTags = jQuery.grep( jQuery.merge( [], elem.getElementsByTagName("script") ), handleScript );
-
-                                                // Splice the scripts into ret after their former ancestor and advance our index beyond them
-                                                ret.splice.apply( ret, [i + 1, 0].concat( jsTags ) );
-                                                i += jsTags.length;
-                                        }
-                                }
-                        }
-                }
-
-                return ret;
-        },
-
-        cleanData: function( elems, /* internal */ acceptData ) {
-                var data, id, elem, type,
-                        i = 0,
-                        internalKey = jQuery.expando,
-                        cache = jQuery.cache,
-                        deleteExpando = jQuery.support.deleteExpando,
-                        special = jQuery.event.special;
-
-                for ( ; (elem = elems[i]) != null; i++ ) {
-
-                        if ( acceptData || jQuery.acceptData( elem ) ) {
-
-                                id = elem[ internalKey ];
-                                data = id && cache[ id ];
-
-                                if ( data ) {
-                                        if ( data.events ) {
-                                                for ( type in data.events ) {
-                                                        if ( special[ type ] ) {
-                                                                jQuery.event.remove( elem, type );
-
-                                                        // This is a shortcut to avoid jQuery.event.remove's overhead
-                                                        } else {
-                                                                jQuery.removeEvent( elem, type, data.handle );
-                                                        }
-                                                }
-                                        }
-
-                                        // Remove cache only if it was not already removed by jQuery.event.remove
-                                        if ( cache[ id ] ) {
-
-                                                delete cache[ id ];
-
-                                                // IE does not allow us to delete expando properties from nodes,
-                                                // nor does it have a removeAttribute function on Document nodes;
-                                                // we must handle all of these cases
-                                                if ( deleteExpando ) {
-                                                        delete elem[ internalKey ];
-
-                                                } else if ( elem.removeAttribute ) {
-                                                        elem.removeAttribute( internalKey );
-
-                                                } else {
-                                                        elem[ internalKey ] = null;
-                                                }
-
-                                                jQuery.deletedIds.push( id );
-                                        }
-                                }
-                        }
-                }
-        }
-});
-// Limit scope pollution from any deprecated API
-(function() {
-
-var matched, browser;
-
-// Use of jQuery.browser is frowned upon.
-// More details: http://api.jquery.com/jQuery.browser
-// jQuery.uaMatch maintained for back-compat
-jQuery.uaMatch = function( ua ) {
-        ua = ua.toLowerCase();
-
-        var match = /(chrome)[ \/]([\w.]+)/.exec( ua ) ||
-                /(webkit)[ \/]([\w.]+)/.exec( ua ) ||
-                /(opera)(?:.*version|)[ \/]([\w.]+)/.exec( ua ) ||
-                /(msie) ([\w.]+)/.exec( ua ) ||
-                ua.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec( ua ) ||
-                [];
-
-        return {
-                browser: match[ 1 ] || "",
-                version: match[ 2 ] || "0"
-        };
-};
-
-matched = jQuery.uaMatch( navigator.userAgent );
-browser = {};
-
-if ( matched.browser ) {
-        browser[ matched.browser ] = true;
-        browser.version = matched.version;
-}
-
-// Chrome is Webkit, but Webkit is also Safari.
-if ( browser.chrome ) {
-        browser.webkit = true;
-} else if ( browser.webkit ) {
-        browser.safari = true;
-}
-
-jQuery.browser = browser;
-
-jQuery.sub = function() {
-        function jQuerySub( selector, context ) {
-                return new jQuerySub.fn.init( selector, context );
-        }
-        jQuery.extend( true, jQuerySub, this );
-        jQuerySub.superclass = this;
-        jQuerySub.fn = jQuerySub.prototype = this();
-        jQuerySub.fn.constructor = jQuerySub;
-        jQuerySub.sub = this.sub;
-        jQuerySub.fn.init = function init( selector, context ) {
-                if ( context && context instanceof jQuery && !(context instanceof jQuerySub) ) {
-                        context = jQuerySub( context );
-                }
-
-                return jQuery.fn.init.call( this, selector, context, rootjQuerySub );
-        };
-        jQuerySub.fn.init.prototype = jQuerySub.fn;
-        var rootjQuerySub = jQuerySub(document);
-        return jQuerySub;
-};
-
-})();
-var curCSS, iframe, iframeDoc,
-        ralpha = /alpha\([^)]*\)/i,
-        ropacity = /opacity=([^)]*)/,
-        rposition = /^(top|right|bottom|left)$/,
-        // swappable if display is none or starts with table except "table", "table-cell", or "table-caption"
-        // see here for display values: https://developer.mozilla.org/en-US/docs/CSS/display
-        rdisplayswap = /^(none|table(?!-c[ea]).+)/,
-        rmargin = /^margin/,
-        rnumsplit = new RegExp( "^(" + core_pnum + ")(.*)$", "i" ),
-        rnumnonpx = new RegExp( "^(" + core_pnum + ")(?!px)[a-z%]+$", "i" ),
-        rrelNum = new RegExp( "^([-+])=(" + core_pnum + ")", "i" ),
-        elemdisplay = { BODY: "block" },
-
-        cssShow = { position: "absolute", visibility: "hidden", display: "block" },
-        cssNormalTransform = {
-                letterSpacing: 0,
-                fontWeight: 400
-        },
-
-        cssExpand = [ "Top", "Right", "Bottom", "Left" ],
-        cssPrefixes = [ "Webkit", "O", "Moz", "ms" ],
-
-        eventsToggle = jQuery.fn.toggle;
-
-// return a css property mapped to a potentially vendor prefixed property
-function vendorPropName( style, name ) {
-
-        // shortcut for names that are not vendor prefixed
-        if ( name in style ) {
-                return name;
-        }
-
-        // check for vendor prefixed names
-        var capName = name.charAt(0).toUpperCase() + name.slice(1),
-                origName = name,
-                i = cssPrefixes.length;
-
-        while ( i-- ) {
-                name = cssPrefixes[ i ] + capName;
-                if ( name in style ) {
-                        return name;
-                }
-        }
-
-        return origName;
-}
-
-function isHidden( elem, el ) {
-        elem = el || elem;
-        return jQuery.css( elem, "display" ) === "none" || !jQuery.contains( elem.ownerDocument, elem );
-}
-
-function showHide( elements, show ) {
-        var elem, display,
-                values = [],
-                index = 0,
-                length = elements.length;
-
-        for ( ; index < length; index++ ) {
-                elem = elements[ index ];
-                if ( !elem.style ) {
-                        continue;
-                }
-                values[ index ] = jQuery._data( elem, "olddisplay" );
-                if ( show ) {
-                        // Reset the inline display of this element to learn if it is
-                        // being hidden by cascaded rules or not
-                        if ( !values[ index ] && elem.style.display === "none" ) {
-                                elem.style.display = "";
-                        }
-
-                        // Set elements which have been overridden with display: none
-                        // in a stylesheet to whatever the default browser style is
-                        // for such an element
-                        if ( elem.style.display === "" && isHidden( elem ) ) {
-                                values[ index ] = jQuery._data( elem, "olddisplay", css_defaultDisplay(elem.nodeName) );
-                        }
-                } else {
-                        display = curCSS( elem, "display" );
-
-                        if ( !values[ index ] && display !== "none" ) {
-                                jQuery._data( elem, "olddisplay", display );
-                        }
-                }
-        }
-
-        // Set the display of most of the elements in a second loop
-        // to avoid the constant reflow
-        for ( index = 0; index < length; index++ ) {
-                elem = elements[ index ];
-                if ( !elem.style ) {
-                        continue;
-                }
-                if ( !show || elem.style.display === "none" || elem.style.display === "" ) {
-                        elem.style.display = show ? values[ index ] || "" : "none";
-                }
-        }
-
-        return elements;
-}
-
-jQuery.fn.extend({
-        css: function( name, value ) {
-                return jQuery.access( this, function( elem, name, value ) {
-                        return value !== undefined ?
-                                jQuery.style( elem, name, value ) :
-                                jQuery.css( elem, name );
-                }, name, value, arguments.length > 1 );
-        },
-        show: function() {
-                return showHide( this, true );
-        },
-        hide: function() {
-                return showHide( this );
-        },
-        toggle: function( state, fn2 ) {
-                var bool = typeof state === "boolean";
-
-                if ( jQuery.isFunction( state ) && jQuery.isFunction( fn2 ) ) {
-                        return eventsToggle.apply( this, arguments );
-                }
-
-                return this.each(function() {
-                        if ( bool ? state : isHidden( this ) ) {
-                                jQuery( this ).show();
-                        } else {
-                                jQuery( this ).hide();
-                        }
-                });
-        }
-});
-
-jQuery.extend({
-        // Add in style property hooks for overriding the default
-        // behavior of getting and setting a style property
-        cssHooks: {
-                opacity: {
-                        get: function( elem, computed ) {
-                                if ( computed ) {
-                                        // We should always get a number back from opacity
-                                        var ret = curCSS( elem, "opacity" );
-                                        return ret === "" ? "1" : ret;
-
-                                }
-                        }
-                }
-        },
-
-        // Exclude the following css properties to add px
-        cssNumber: {
-                "fillOpacity": true,
-                "fontWeight": true,
-                "lineHeight": true,
-                "opacity": true,
-                "orphans": true,
-                "widows": true,
-                "zIndex": true,
-                "zoom": true
-        },
-
-        // Add in properties whose names you wish to fix before
-        // setting or getting the value
-        cssProps: {
-                // normalize float css property
-                "float": jQuery.support.cssFloat ? "cssFloat" : "styleFloat"
-        },
-
-        // Get and set the style property on a DOM Node
-        style: function( elem, name, value, extra ) {
-                // Don't set styles on text and comment nodes
-                if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
-                        return;
-                }
-
-                // Make sure that we're working with the right name
-                var ret, type, hooks,
-                        origName = jQuery.camelCase( name ),
-                        style = elem.style;
-
-                name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( style, origName ) );
-
-                // gets hook for the prefixed version
-                // followed by the unprefixed version
-                hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
-
-                // Check if we're setting a value
-                if ( value !== undefined ) {
-                        type = typeof value;
-
-                        // convert relative number strings (+= or -=) to relative numbers. #7345
-                        if ( type === "string" && (ret = rrelNum.exec( value )) ) {
-                                value = ( ret[1] + 1 ) * ret[2] + parseFloat( jQuery.css( elem, name ) );
-                                // Fixes bug #9237
-                                type = "number";
-                        }
-
-                        // Make sure that NaN and null values aren't set. See: #7116
-                        if ( value == null || type === "number" && isNaN( value ) ) {
-                                return;
-                        }
-
-                        // If a number was passed in, add 'px' to the (except for certain CSS properties)
-                        if ( type === "number" && !jQuery.cssNumber[ origName ] ) {
-                                value += "px";
-                        }
-
-                        // If a hook was provided, use that value, otherwise just set the specified value
-                        if ( !hooks || !("set" in hooks) || (value = hooks.set( elem, value, extra )) !== undefined ) {
-                                // Wrapped to prevent IE from throwing errors when 'invalid' values are provided
-                                // Fixes bug #5509
-                                try {
-                                        style[ name ] = value;
-                                } catch(e) {}
-                        }
-
-                } else {
-                        // If a hook was provided get the non-computed value from there
-                        if ( hooks && "get" in hooks && (ret = hooks.get( elem, false, extra )) !== undefined ) {
-                                return ret;
-                        }
-
-                        // Otherwise just get the value from the style object
-                        return style[ name ];
-                }
-        },
-
-        css: function( elem, name, numeric, extra ) {
-                var val, num, hooks,
-                        origName = jQuery.camelCase( name );
-
-                // Make sure that we're working with the right name
-                name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( elem.style, origName ) );
-
-                // gets hook for the prefixed version
-                // followed by the unprefixed version
-                hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
-
-                // If a hook was provided get the computed value from there
-                if ( hooks && "get" in hooks ) {
-                        val = hooks.get( elem, true, extra );
-                }
-
-                // Otherwise, if a way to get the computed value exists, use that
-                if ( val === undefined ) {
-                        val = curCSS( elem, name );
-                }
-
-                //convert "normal" to computed value
-                if ( val === "normal" && name in cssNormalTransform ) {
-                        val = cssNormalTransform[ name ];
-                }
-
-                // Return, converting to number if forced or a qualifier was provided and val looks numeric
-                if ( numeric || extra !== undefined ) {
-                        num = parseFloat( val );
-                        return numeric || jQuery.isNumeric( num ) ? num || 0 : val;
-                }
-                return val;
-        },
-
-        // A method for quickly swapping in/out CSS properties to get correct calculations
-        swap: function( elem, options, callback ) {
-                var ret, name,
-                        old = {};
-
-                // Remember the old values, and insert the new ones
-                for ( name in options ) {
-                        old[ name ] = elem.style[ name ];
-                        elem.style[ name ] = options[ name ];
-                }
-
-                ret = callback.call( elem );
-
-                // Revert the old values
-                for ( name in options ) {
-                        elem.style[ name ] = old[ name ];
-                }
-
-                return ret;
-        }
-});
-
-// NOTE: To any future maintainer, we've window.getComputedStyle
-// because jsdom on node.js will break without it.
-if ( window.getComputedStyle ) {
-        curCSS = function( elem, name ) {
-                var ret, width, minWidth, maxWidth,
-                        computed = window.getComputedStyle( elem, null ),
-                        style = elem.style;
-
-                if ( computed ) {
-
-                        // getPropertyValue is only needed for .css('filter') in IE9, see #12537
-                        ret = computed.getPropertyValue( name ) || computed[ name ];
-
-                        if ( ret === "" && !jQuery.contains( elem.ownerDocument, elem ) ) {
-                                ret = jQuery.style( elem, name );
-                        }
-
-                        // A tribute to the "awesome hack by Dean Edwards"
-                        // Chrome < 17 and Safari 5.0 uses "computed value" instead of "used value" for margin-right
-                        // Safari 5.1.7 (at least) returns percentage for a larger set of values, but width seems to be reliably pixels
-                        // this is against the CSSOM draft spec: http://dev.w3.org/csswg/cssom/#resolved-values
-                        if ( rnumnonpx.test( ret ) && rmargin.test( name ) ) {
-                                width = style.width;
-                                minWidth = style.minWidth;
-                                maxWidth = style.maxWidth;
-
-                                style.minWidth = style.maxWidth = style.width = ret;
-                                ret = computed.width;
-
-                                style.width = width;
-                                style.minWidth = minWidth;
-                                style.maxWidth = maxWidth;
-                        }
-                }
-
-                return ret;
-        };
-} else if ( document.documentElement.currentStyle ) {
-        curCSS = function( elem, name ) {
-                var left, rsLeft,
-                        ret = elem.currentStyle && elem.currentStyle[ name ],
-                        style = elem.style;
-
-                // Avoid setting ret to empty string here
-                // so we don't default to auto
-                if ( ret == null && style && style[ name ] ) {
-                        ret = style[ name ];
-                }
-
-                // From the awesome hack by Dean Edwards
-                // http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
-
-                // If we're not dealing with a regular pixel number
-                // but a number that has a weird ending, we need to convert it to pixels
-                // but not position css attributes, as those are proportional to the parent element instead
-                // and we can't measure the parent instead because it might trigger a "stacking dolls" problem
-                if ( rnumnonpx.test( ret ) && !rposition.test( name ) ) {
-
-                        // Remember the original values
-                        left = style.left;
-                        rsLeft = elem.runtimeStyle && elem.runtimeStyle.left;
-
-                        // Put in the new values to get a computed value out
-                        if ( rsLeft ) {
-                                elem.runtimeStyle.left = elem.currentStyle.left;
-                        }
-                        style.left = name === "fontSize" ? "1em" : ret;
-                        ret = style.pixelLeft + "px";
-
-                        // Revert the changed values
-                        style.left = left;
-                        if ( rsLeft ) {
-                                elem.runtimeStyle.left = rsLeft;
-                        }
-                }
-
-                return ret === "" ? "auto" : ret;
-        };
-}
-
-function setPositiveNumber( elem, value, subtract ) {
-        var matches = rnumsplit.exec( value );
-        return matches ?
-                        Math.max( 0, matches[ 1 ] - ( subtract || 0 ) ) + ( matches[ 2 ] || "px" ) :
-                        value;
-}
-
-function augmentWidthOrHeight( elem, name, extra, isBorderBox ) {
-        var i = extra === ( isBorderBox ? "border" : "content" ) ?
-                // If we already have the right measurement, avoid augmentation
-                4 :
-                // Otherwise initialize for horizontal or vertical properties
-                name === "width" ? 1 : 0,
-
-                val = 0;
-
-        for ( ; i < 4; i += 2 ) {
-                // both box models exclude margin, so add it if we want it
-                if ( extra === "margin" ) {
-                        // we use jQuery.css instead of curCSS here
-                        // because of the reliableMarginRight CSS hook!
-                        val += jQuery.css( elem, extra + cssExpand[ i ], true );
-                }
-
-                // From this point on we use curCSS for maximum performance (relevant in animations)
-                if ( isBorderBox ) {
-                        // border-box includes padding, so remove it if we want content
-                        if ( extra === "content" ) {
-                                val -= parseFloat( curCSS( elem, "padding" + cssExpand[ i ] ) ) || 0;
-                        }
-
-                        // at this point, extra isn't border nor margin, so remove border
-                        if ( extra !== "margin" ) {
-                                val -= parseFloat( curCSS( elem, "border" + cssExpand[ i ] + "Width" ) ) || 0;
-                        }
-                } else {
-                        // at this point, extra isn't content, so add padding
-                        val += parseFloat( curCSS( elem, "padding" + cssExpand[ i ] ) ) || 0;
-
-                        // at this point, extra isn't content nor padding, so add border
-                        if ( extra !== "padding" ) {
-                                val += parseFloat( curCSS( elem, "border" + cssExpand[ i ] + "Width" ) ) || 0;
-                        }
-                }
-        }
-
-        return val;
-}
-
-function getWidthOrHeight( elem, name, extra ) {
-
-        // Start with offset property, which is equivalent to the border-box value
-        var val = name === "width" ? elem.offsetWidth : elem.offsetHeight,
-                valueIsBorderBox = true,
-                isBorderBox = jQuery.support.boxSizing && jQuery.css( elem, "boxSizing" ) === "border-box";
-
-        // some non-html elements return undefined for offsetWidth, so check for null/undefined
-        // svg - https://bugzilla.mozilla.org/show_bug.cgi?id=649285
-        // MathML - https://bugzilla.mozilla.org/show_bug.cgi?id=491668
-        if ( val <= 0 || val == null ) {
-                // Fall back to computed then uncomputed css if necessary
-                val = curCSS( elem, name );
-                if ( val < 0 || val == null ) {
-                        val = elem.style[ name ];
-                }
-
-                // Computed unit is not pixels. Stop here and return.
-                if ( rnumnonpx.test(val) ) {
-                        return val;
-                }
-
-                // we need the check for style in case a browser which returns unreliable values
-                // for getComputedStyle silently falls back to the reliable elem.style
-                valueIsBorderBox = isBorderBox && ( jQuery.support.boxSizingReliable || val === elem.style[ name ] );
-
-                // Normalize "", auto, and prepare for extra
-                val = parseFloat( val ) || 0;
-        }
-
-        // use the active box-sizing model to add/subtract irrelevant styles
-        return ( val +
-                augmentWidthOrHeight(
-                        elem,
-                        name,
-                        extra || ( isBorderBox ? "border" : "content" ),
-                        valueIsBorderBox
-                )
-        ) + "px";
-}
-
-
-// Try to determine the default display value of an element
-function css_defaultDisplay( nodeName ) {
-        if ( elemdisplay[ nodeName ] ) {
-                return elemdisplay[ nodeName ];
-        }
-
-        var elem = jQuery( "<" + nodeName + ">" ).appendTo( document.body ),
-                display = elem.css("display");
-        elem.remove();
-
-        // If the simple way fails,
-        // get element's real default display by attaching it to a temp iframe
-        if ( display === "none" || display === "" ) {
-                // Use the already-created iframe if possible
-                iframe = document.body.appendChild(
-                        iframe || jQuery.extend( document.createElement("iframe"), {
-                                frameBorder: 0,
-                                width: 0,
-                                height: 0
-                        })
-                );
-
-                // Create a cacheable copy of the iframe document on first call.
-                // IE and Opera will allow us to reuse the iframeDoc without re-writing the fake HTML
-                // document to it; WebKit & Firefox won't allow reusing the iframe document.
-                if ( !iframeDoc || !iframe.createElement ) {
-                        iframeDoc = ( iframe.contentWindow || iframe.contentDocument ).document;
-                        iframeDoc.write("<!doctype html><html><body>");
-                        iframeDoc.close();
-                }
-
-                elem = iframeDoc.body.appendChild( iframeDoc.createElement(nodeName) );
-
-                display = curCSS( elem, "display" );
-                document.body.removeChild( iframe );
-        }
-
-        // Store the correct default display
-        elemdisplay[ nodeName ] = display;
-
-        return display;
-}
-
-jQuery.each([ "height", "width" ], function( i, name ) {
-        jQuery.cssHooks[ name ] = {
-                get: function( elem, computed, extra ) {
-                        if ( computed ) {
-                                // certain elements can have dimension info if we invisibly show them
-                                // however, it must have a current display style that would benefit from this
-                                if ( elem.offsetWidth === 0 && rdisplayswap.test( curCSS( elem, "display" ) ) ) {
-                                        return jQuery.swap( elem, cssShow, function() {
-                                                return getWidthOrHeight( elem, name, extra );
-                                        });
-                                } else {
-                                        return getWidthOrHeight( elem, name, extra );
-                                }
-                        }
-                },
-
-                set: function( elem, value, extra ) {
-                        return setPositiveNumber( elem, value, extra ?
-                                augmentWidthOrHeight(
-                                        elem,
-                                        name,
-                                        extra,
-                                        jQuery.support.boxSizing && jQuery.css( elem, "boxSizing" ) === "border-box"
-                                ) : 0
-                        );
-                }
-        };
-});
-
-if ( !jQuery.support.opacity ) {
-        jQuery.cssHooks.opacity = {
-                get: function( elem, computed ) {
-                        // IE uses filters for opacity
-                        return ropacity.test( (computed && elem.currentStyle ? elem.currentStyle.filter : elem.style.filter) || "" ) ?
-                                ( 0.01 * parseFloat( RegExp.$1 ) ) + "" :
-                                computed ? "1" : "";
-                },
-
-                set: function( elem, value ) {
-                        var style = elem.style,
-                                currentStyle = elem.currentStyle,
-                                opacity = jQuery.isNumeric( value ) ? "alpha(opacity=" + value * 100 + ")" : "",
-                                filter = currentStyle && currentStyle.filter || style.filter || "";
-
-                        // IE has trouble with opacity if it does not have layout
-                        // Force it by setting the zoom level
-                        style.zoom = 1;
-
-                        // if setting opacity to 1, and no other filters exist - attempt to remove filter attribute #6652
-                        if ( value >= 1 && jQuery.trim( filter.replace( ralpha, "" ) ) === "" &&
-                                style.removeAttribute ) {
-
-                                // Setting style.filter to null, "" & " " still leave "filter:" in the cssText
-                                // if "filter:" is present at all, clearType is disabled, we want to avoid this
-                                // style.removeAttribute is IE Only, but so apparently is this code path...
-                                style.removeAttribute( "filter" );
-
-                                // if there there is no filter style applied in a css rule, we are done
-                                if ( currentStyle && !currentStyle.filter ) {
-                                        return;
-                                }
-                        }
-
-                        // otherwise, set new filter values
-                        style.filter = ralpha.test( filter ) ?
-                                filter.replace( ralpha, opacity ) :
-                                filter + " " + opacity;
-                }
-        };
-}
-
-// These hooks cannot be added until DOM ready because the support test
-// for it is not run until after DOM ready
-jQuery(function() {
-        if ( !jQuery.support.reliableMarginRight ) {
-                jQuery.cssHooks.marginRight = {
-                        get: function( elem, computed ) {
-                                // WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
-                                // Work around by temporarily setting element display to inline-block
-                                return jQuery.swap( elem, { "display": "inline-block" }, function() {
-                                        if ( computed ) {
-                                                return curCSS( elem, "marginRight" );
-                                        }
-                                });
-                        }
-                };
-        }
-
-        // Webkit bug: https://bugs.webkit.org/show_bug.cgi?id=29084
-        // getComputedStyle returns percent when specified for top/left/bottom/right
-        // rather than make the css module depend on the offset module, we just check for it here
-        if ( !jQuery.support.pixelPosition && jQuery.fn.position ) {
-                jQuery.each( [ "top", "left" ], function( i, prop ) {
-                        jQuery.cssHooks[ prop ] = {
-                                get: function( elem, computed ) {
-                                        if ( computed ) {
-                                                var ret = curCSS( elem, prop );
-                                                // if curCSS returns percentage, fallback to offset
-                                                return rnumnonpx.test( ret ) ? jQuery( elem ).position()[ prop ] + "px" : ret;
-                                        }
-                                }
-                        };
-                });
-        }
-
-});
-
-if ( jQuery.expr && jQuery.expr.filters ) {
-        jQuery.expr.filters.hidden = function( elem ) {
-                return ( elem.offsetWidth === 0 && elem.offsetHeight === 0 ) || (!jQuery.support.reliableHiddenOffsets && ((elem.style && elem.style.display) || curCSS( elem, "display" )) === "none");
-        };
-
-        jQuery.expr.filters.visible = function( elem ) {
-                return !jQuery.expr.filters.hidden( elem );
-        };
-}
-
-// These hooks are used by animate to expand properties
-jQuery.each({
-        margin: "",
-        padding: "",
-        border: "Width"
-}, function( prefix, suffix ) {
-        jQuery.cssHooks[ prefix + suffix ] = {
-                expand: function( value ) {
-                        var i,
-
-                                // assumes a single number if not a string
-                                parts = typeof value === "string" ? value.split(" ") : [ value ],
-                                expanded = {};
-
-                        for ( i = 0; i < 4; i++ ) {
-                                expanded[ prefix + cssExpand[ i ] + suffix ] =
-                                        parts[ i ] || parts[ i - 2 ] || parts[ 0 ];
-                        }
-
-                        return expanded;
-                }
-        };
-
-        if ( !rmargin.test( prefix ) ) {
-                jQuery.cssHooks[ prefix + suffix ].set = setPositiveNumber;
-        }
-});
-var r20 = /%20/g,
-        rbracket = /\[\]$/,
-        rCRLF = /\r?\n/g,
-        rinput = /^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,
-        rselectTextarea = /^(?:select|textarea)/i;
-
-jQuery.fn.extend({
-        serialize: function() {
-                return jQuery.param( this.serializeArray() );
-        },
-        serializeArray: function() {
-                return this.map(function(){
-                        return this.elements ? jQuery.makeArray( this.elements ) : this;
-                })
-                .filter(function(){
-                        return this.name && !this.disabled &&
-                                ( this.checked || rselectTextarea.test( this.nodeName ) ||
-                                        rinput.test( this.type ) );
-                })
-                .map(function( i, elem ){
-                        var val = jQuery( this ).val();
-
-                        return val == null ?
-                                null :
-                                jQuery.isArray( val ) ?
-                                        jQuery.map( val, function( val, i ){
-                                                return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
-                                        }) :
-                                        { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
-                }).get();
-        }
-});
-
-//Serialize an array of form elements or a set of
-//key/values into a query string
-jQuery.param = function( a, traditional ) {
-        var prefix,
-                s = [],
-                add = function( key, value ) {
-                        // If value is a function, invoke it and return its value
-                        value = jQuery.isFunction( value ) ? value() : ( value == null ? "" : value );
-                        s[ s.length ] = encodeURIComponent( key ) + "=" + encodeURIComponent( value );
-                };
-
-        // Set traditional to true for jQuery <= 1.3.2 behavior.
-        if ( traditional === undefined ) {
-                traditional = jQuery.ajaxSettings && jQuery.ajaxSettings.traditional;
-        }
-
-        // If an array was passed in, assume that it is an array of form elements.
-        if ( jQuery.isArray( a ) || ( a.jquery && !jQuery.isPlainObject( a ) ) ) {
-                // Serialize the form elements
-                jQuery.each( a, function() {
-                        add( this.name, this.value );
-                });
-
-        } else {
-                // If traditional, encode the "old" way (the way 1.3.2 or older
-                // did it), otherwise encode params recursively.
-                for ( prefix in a ) {
-                        buildParams( prefix, a[ prefix ], traditional, add );
-                }
-        }
-
-        // Return the resulting serialization
-        return s.join( "&" ).replace( r20, "+" );
-};
-
-function buildParams( prefix, obj, traditional, add ) {
-        var name;
-
-        if ( jQuery.isArray( obj ) ) {
-                // Serialize array item.
-                jQuery.each( obj, function( i, v ) {
-                        if ( traditional || rbracket.test( prefix ) ) {
-                                // Treat each array item as a scalar.
-                                add( prefix, v );
-
-                        } else {
-                                // If array item is non-scalar (array or object), encode its
-                                // numeric index to resolve deserialization ambiguity issues.
-                                // Note that rack (as of 1.0.0) can't currently deserialize
-                                // nested arrays properly, and attempting to do so may cause
-                                // a server error. Possible fixes are to modify rack's
-                                // deserialization algorithm or to provide an option or flag
-                                // to force array serialization to be shallow.
-                                buildParams( prefix + "[" + ( typeof v === "object" ? i : "" ) + "]", v, traditional, add );
-                        }
-                });
-
-        } else if ( !traditional && jQuery.type( obj ) === "object" ) {
-                // Serialize object item.
-                for ( name in obj ) {
-                        buildParams( prefix + "[" + name + "]", obj[ name ], traditional, add );
-                }
-
-        } else {
-                // Serialize scalar item.
-                add( prefix, obj );
-        }
-}
-var
-        // Document location
-        ajaxLocParts,
-        ajaxLocation,
-
-        rhash = /#.*$/,
-        rheaders = /^(.*?):[ \t]*([^\r\n]*)\r?$/mg, // IE leaves an \r character at EOL
-        // #7653, #8125, #8152: local protocol detection
-        rlocalProtocol = /^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,
-        rnoContent = /^(?:GET|HEAD)$/,
-        rprotocol = /^\/\//,
-        rquery = /\?/,
-        rscript = /<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,
-        rts = /([?&])_=[^&]*/,
-        rurl = /^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,
-
-        // Keep a copy of the old load method
-        _load = jQuery.fn.load,
-
-        /* Prefilters
-         * 1) They are useful to introduce custom dataTypes (see ajax/jsonp.js for an example)
-         * 2) These are called:
-         *    - BEFORE asking for a transport
-         *    - AFTER param serialization (s.data is a string if s.processData is true)
-         * 3) key is the dataType
-         * 4) the catchall symbol "*" can be used
-         * 5) execution will start with transport dataType and THEN continue down to "*" if needed
-         */
-        prefilters = {},
-
-        /* Transports bindings
-         * 1) key is the dataType
-         * 2) the catchall symbol "*" can be used
-         * 3) selection will start with transport dataType and THEN go to "*" if needed
-         */
-        transports = {},
-
-        // Avoid comment-prolog char sequence (#10098); must appease lint and evade compression
-        allTypes = ["*/"] + ["*"];
-
-// #8138, IE may throw an exception when accessing
-// a field from window.location if document.domain has been set
-try {
-        ajaxLocation = location.href;
-} catch( e ) {
-        // Use the href attribute of an A element
-        // since IE will modify it given document.location
-        ajaxLocation = document.createElement( "a" );
-        ajaxLocation.href = "";
-        ajaxLocation = ajaxLocation.href;
-}
-
-// Segment location into parts
-ajaxLocParts = rurl.exec( ajaxLocation.toLowerCase() ) || [];
-
-// Base "constructor" for jQuery.ajaxPrefilter and jQuery.ajaxTransport
-function addToPrefiltersOrTransports( structure ) {
-
-        // dataTypeExpression is optional and defaults to "*"
-        return function( dataTypeExpression, func ) {
-
-                if ( typeof dataTypeExpression !== "string" ) {
-                        func = dataTypeExpression;
-                        dataTypeExpression = "*";
-                }
-
-                var dataType, list, placeBefore,
-                        dataTypes = dataTypeExpression.toLowerCase().split( core_rspace ),
-                        i = 0,
-                        length = dataTypes.length;
-
-                if ( jQuery.isFunction( func ) ) {
-                        // For each dataType in the dataTypeExpression
-                        for ( ; i < length; i++ ) {
-                                dataType = dataTypes[ i ];
-                                // We control if we're asked to add before
-                                // any existing element
-                                placeBefore = /^\+/.test( dataType );
-                                if ( placeBefore ) {
-                                        dataType = dataType.substr( 1 ) || "*";
-                                }
-                                list = structure[ dataType ] = structure[ dataType ] || [];
-                                // then we add to the structure accordingly
-                                list[ placeBefore ? "unshift" : "push" ]( func );
-                        }
-                }
-        };
-}
-
-// Base inspection function for prefilters and transports
-function inspectPrefiltersOrTransports( structure, options, originalOptions, jqXHR,
-                dataType /* internal */, inspected /* internal */ ) {
-
-        dataType = dataType || options.dataTypes[ 0 ];
-        inspected = inspected || {};
-
-        inspected[ dataType ] = true;
-
-        var selection,
-                list = structure[ dataType ],
-                i = 0,
-                length = list ? list.length : 0,
-                executeOnly = ( structure === prefilters );
-
-        for ( ; i < length && ( executeOnly || !selection ); i++ ) {
-                selection = list[ i ]( options, originalOptions, jqXHR );
-                // If we got redirected to another dataType
-                // we try there if executing only and not done already
-                if ( typeof selection === "string" ) {
-                        if ( !executeOnly || inspected[ selection ] ) {
-                                selection = undefined;
-                        } else {
-                                options.dataTypes.unshift( selection );
-                                selection = inspectPrefiltersOrTransports(
-                                                structure, options, originalOptions, jqXHR, selection, inspected );
-                        }
-                }
-        }
-        // If we're only executing or nothing was selected
-        // we try the catchall dataType if not done already
-        if ( ( executeOnly || !selection ) && !inspected[ "*" ] ) {
-                selection = inspectPrefiltersOrTransports(
-                                structure, options, originalOptions, jqXHR, "*", inspected );
-        }
-        // unnecessary when only executing (prefilters)
-        // but it'll be ignored by the caller in that case
-        return selection;
-}
-
-// A special extend for ajax options
-// that takes "flat" options (not to be deep extended)
-// Fixes #9887
-function ajaxExtend( target, src ) {
-        var key, deep,
-                flatOptions = jQuery.ajaxSettings.flatOptions || {};
-        for ( key in src ) {
-                if ( src[ key ] !== undefined ) {
-                        ( flatOptions[ key ] ? target : ( deep || ( deep = {} ) ) )[ key ] = src[ key ];
-                }
-        }
-        if ( deep ) {
-                jQuery.extend( true, target, deep );
-        }
-}
-
-jQuery.fn.load = function( url, params, callback ) {
-        if ( typeof url !== "string" && _load ) {
-                return _load.apply( this, arguments );
-        }
-
-        // Don't do a request if no elements are being requested
-        if ( !this.length ) {
-                return this;
-        }
-
-        var selector, type, response,
-                self = this,
-                off = url.indexOf(" ");
-
-        if ( off >= 0 ) {
-                selector = url.slice( off, url.length );
-                url = url.slice( 0, off );
-        }
-
-        // If it's a function
-        if ( jQuery.isFunction( params ) ) {
-
-                // We assume that it's the callback
-                callback = params;
-                params = undefined;
-
-        // Otherwise, build a param string
-        } else if ( params && typeof params === "object" ) {
-                type = "POST";
-        }
-
-        // Request the remote document
-        jQuery.ajax({
-                url: url,
-
-                // if "type" variable is undefined, then "GET" method will be used
-                type: type,
-                dataType: "html",
-                data: params,
-                complete: function( jqXHR, status ) {
-                        if ( callback ) {
-                                self.each( callback, response || [ jqXHR.responseText, status, jqXHR ] );
-                        }
-                }
-        }).done(function( responseText ) {
-
-                // Save response for use in complete callback
-                response = arguments;
-
-                // See if a selector was specified
-                self.html( selector ?
-
-                        // Create a dummy div to hold the results
-                        jQuery("<div>")
-
-                                // inject the contents of the document in, removing the scripts
-                                // to avoid any 'Permission Denied' errors in IE
-                                .append( responseText.replace( rscript, "" ) )
-
-                                // Locate the specified elements
-                                .find( selector ) :
-
-                        // If not, just inject the full result
-                        responseText );
-
-        });
-
-        return this;
-};
-
-// Attach a bunch of functions for handling common AJAX events
-jQuery.each( "ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split( " " ), function( i, o ){
-        jQuery.fn[ o ] = function( f ){
-                return this.on( o, f );
-        };
-});
-
-jQuery.each( [ "get", "post" ], function( i, method ) {
-        jQuery[ method ] = function( url, data, callback, type ) {
-                // shift arguments if data argument was omitted
-                if ( jQuery.isFunction( data ) ) {
-                        type = type || callback;
-                        callback = data;
-                        data = undefined;
-                }
-
-                return jQuery.ajax({
-                        type: method,
-                        url: url,
-                        data: data,
-                        success: callback,
-                        dataType: type
-                });
-        };
-});
-
-jQuery.extend({
-
-        getScript: function( url, callback ) {
-                return jQuery.get( url, undefined, callback, "script" );
-        },
-
-        getJSON: function( url, data, callback ) {
-                return jQuery.get( url, data, callback, "json" );
-        },
-
-        // Creates a full fledged settings object into target
-        // with both ajaxSettings and settings fields.
-        // If target is omitted, writes into ajaxSettings.
-        ajaxSetup: function( target, settings ) {
-                if ( settings ) {
-                        // Building a settings object
-                        ajaxExtend( target, jQuery.ajaxSettings );
-                } else {
-                        // Extending ajaxSettings
-                        settings = target;
-                        target = jQuery.ajaxSettings;
-                }
-                ajaxExtend( target, settings );
-                return target;
-        },
-
-        ajaxSettings: {
-                url: ajaxLocation,
-                isLocal: rlocalProtocol.test( ajaxLocParts[ 1 ] ),
-                global: true,
-                type: "GET",
-                contentType: "application/x-www-form-urlencoded; charset=UTF-8",
-                processData: true,
-                async: true,
-                /*
-                timeout: 0,
-                data: null,
-                dataType: null,
-                username: null,
-                password: null,
-                cache: null,
-                throws: false,
-                traditional: false,
-                headers: {},
-                */
-
-                accepts: {
-                        xml: "application/xml, text/xml",
-                        html: "text/html",
-                        text: "text/plain",
-                        json: "application/json, text/javascript",
-                        "*": allTypes
-                },
-
-                contents: {
-                        xml: /xml/,
-                        html: /html/,
-                        json: /json/
-                },
-
-                responseFields: {
-                        xml: "responseXML",
-                        text: "responseText"
-                },
-
-                // List of data converters
-                // 1) key format is "source_type destination_type" (a single space in-between)
-                // 2) the catchall symbol "*" can be used for source_type
-                converters: {
-
-                        // Convert anything to text
-                        "* text": window.String,
-
-                        // Text to html (true = no transformation)
-                        "text html": true,
-
-                        // Evaluate text as a json expression
-                        "text json": jQuery.parseJSON,
-
-                        // Parse text as xml
-                        "text xml": jQuery.parseXML
-                },
-
-                // For options that shouldn't be deep extended:
-                // you can add your own custom options here if
-                // and when you create one that shouldn't be
-                // deep extended (see ajaxExtend)
-                flatOptions: {
-                        context: true,
-                        url: true
-                }
-        },
-
-        ajaxPrefilter: addToPrefiltersOrTransports( prefilters ),
-        ajaxTransport: addToPrefiltersOrTransports( transports ),
-
-        // Main method
-        ajax: function( url, options ) {
-
-                // If url is an object, simulate pre-1.5 signature
-                if ( typeof url === "object" ) {
-                        options = url;
-                        url = undefined;
-                }
-
-                // Force options to be an object
-                options = options || {};
-
-                var // ifModified key
-                        ifModifiedKey,
-                        // Response headers
-                        responseHeadersString,
-                        responseHeaders,
-                        // transport
-                        transport,
-                        // timeout handle
-                        timeoutTimer,
-                        // Cross-domain detection vars
-                        parts,
-                        // To know if global events are to be dispatched
-                        fireGlobals,
-                        // Loop variable
-                        i,
-                        // Create the final options object
-                        s = jQuery.ajaxSetup( {}, options ),
-                        // Callbacks context
-                        callbackContext = s.context || s,
-                        // Context for global events
-                        // It's the callbackContext if one was provided in the options
-                        // and if it's a DOM node or a jQuery collection
-                        globalEventContext = callbackContext !== s &&
-                                ( callbackContext.nodeType || callbackContext instanceof jQuery ) ?
-                                                jQuery( callbackContext ) : jQuery.event,
-                        // Deferreds
-                        deferred = jQuery.Deferred(),
-                        completeDeferred = jQuery.Callbacks( "once memory" ),
-                        // Status-dependent callbacks
-                        statusCode = s.statusCode || {},
-                        // Headers (they are sent all at once)
-                        requestHeaders = {},
-                        requestHeadersNames = {},
-                        // The jqXHR state
-                        state = 0,
-                        // Default abort message
-                        strAbort = "canceled",
-                        // Fake xhr
-                        jqXHR = {
-
-                                readyState: 0,
-
-                                // Caches the header
-                                setRequestHeader: function( name, value ) {
-                                        if ( !state ) {
-                                                var lname = name.toLowerCase();
-                                                name = requestHeadersNames[ lname ] = requestHeadersNames[ lname ] || name;
-                                                requestHeaders[ name ] = value;
-                                        }
-                                        return this;
-                                },
-
-                                // Raw string
-                                getAllResponseHeaders: function() {
-                                        return state === 2 ? responseHeadersString : null;
-                                },
-
-                                // Builds headers hashtable if needed
-                                getResponseHeader: function( key ) {
-                                        var match;
-                                        if ( state === 2 ) {
-                                                if ( !responseHeaders ) {
-                                                        responseHeaders = {};
-                                                        while( ( match = rheaders.exec( responseHeadersString ) ) ) {
-                                                                responseHeaders[ match[1].toLowerCase() ] = match[ 2 ];
-                                                        }
-                                                }
-                                                match = responseHeaders[ key.toLowerCase() ];
-                                        }
-                                        return match === undefined ? null : match;
-                                },
-
-                                // Overrides response content-type header
-                                overrideMimeType: function( type ) {
-                                        if ( !state ) {
-                                                s.mimeType = type;
-                                        }
-                                        return this;
-                                },
-
-                                // Cancel the request
-                                abort: function( statusText ) {
-                                        statusText = statusText || strAbort;
-                                        if ( transport ) {
-                                                transport.abort( statusText );
-                                        }
-                                        done( 0, statusText );
-                                        return this;
-                                }
-                        };
-
-                // Callback for when everything is done
-                // It is defined here because jslint complains if it is declared
-                // at the end of the function (which would be more logical and readable)
-                function done( status, nativeStatusText, responses, headers ) {
-                        var isSuccess, success, error, response, modified,
-                                statusText = nativeStatusText;
-
-                        // Called once
-                        if ( state === 2 ) {
-                                return;
-                        }
-
-                        // State is "done" now
-                        state = 2;
-
-                        // Clear timeout if it exists
-                        if ( timeoutTimer ) {
-                                clearTimeout( timeoutTimer );
-                        }
-
-                        // Dereference transport for early garbage collection
-                        // (no matter how long the jqXHR object will be used)
-                        transport = undefined;
-
-                        // Cache response headers
-                        responseHeadersString = headers || "";
-
-                        // Set readyState
-                        jqXHR.readyState = status > 0 ? 4 : 0;
-
-                        // Get response data
-                        if ( responses ) {
-                                response = ajaxHandleResponses( s, jqXHR, responses );
-                        }
-
-                        // If successful, handle type chaining
-                        if ( status >= 200 && status < 300 || status === 304 ) {
-
-                                // Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
-                                if ( s.ifModified ) {
-
-                                        modified = jqXHR.getResponseHeader("Last-Modified");
-                                        if ( modified ) {
-                                                jQuery.lastModified[ ifModifiedKey ] = modified;
-                                        }
-                                        modified = jqXHR.getResponseHeader("Etag");
-                                        if ( modified ) {
-                                                jQuery.etag[ ifModifiedKey ] = modified;
-                                        }
-                                }
-
-                                // If not modified
-                                if ( status === 304 ) {
-
-                                        statusText = "notmodified";
-                                        isSuccess = true;
-
-                                // If we have data
-                                } else {
-
-                                        isSuccess = ajaxConvert( s, response );
-                                        statusText = isSuccess.state;
-                                        success = isSuccess.data;
-                                        error = isSuccess.error;
-                                        isSuccess = !error;
-                                }
-                        } else {
-                                // We extract error from statusText
-                                // then normalize statusText and status for non-aborts
-                                error = statusText;
-                                if ( !statusText || status ) {
-                                        statusText = "error";
-                                        if ( status < 0 ) {
-                                                status = 0;
-                                        }
-                                }
-                        }
-
-                        // Set data for the fake xhr object
-                        jqXHR.status = status;
-                        jqXHR.statusText = ( nativeStatusText || statusText ) + "";
-
-                        // Success/Error
-                        if ( isSuccess ) {
-                                deferred.resolveWith( callbackContext, [ success, statusText, jqXHR ] );
-                        } else {
-                                deferred.rejectWith( callbackContext, [ jqXHR, statusText, error ] );
-                        }
-
-                        // Status-dependent callbacks
-                        jqXHR.statusCode( statusCode );
-                        statusCode = undefined;
-
-                        if ( fireGlobals ) {
-                                globalEventContext.trigger( "ajax" + ( isSuccess ? "Success" : "Error" ),
-                                                [ jqXHR, s, isSuccess ? success : error ] );
-                        }
-
-                        // Complete
-                        completeDeferred.fireWith( callbackContext, [ jqXHR, statusText ] );
-
-                        if ( fireGlobals ) {
-                                globalEventContext.trigger( "ajaxComplete", [ jqXHR, s ] );
-                                // Handle the global AJAX counter
-                                if ( !( --jQuery.active ) ) {
-                                        jQuery.event.trigger( "ajaxStop" );
-                                }
-                        }
-                }
-
-                // Attach deferreds
-                deferred.promise( jqXHR );
-                jqXHR.success = jqXHR.done;
-                jqXHR.error = jqXHR.fail;
-                jqXHR.complete = completeDeferred.add;
-
-                // Status-dependent callbacks
-                jqXHR.statusCode = function( map ) {
-                        if ( map ) {
-                                var tmp;
-                                if ( state < 2 ) {
-                                        for ( tmp in map ) {
-                                                statusCode[ tmp ] = [ statusCode[tmp], map[tmp] ];
-                                        }
-                                } else {
-                                        tmp = map[ jqXHR.status ];
-                                        jqXHR.always( tmp );
-                                }
-                        }
-                        return this;
-                };
-
-                // Remove hash character (#7531: and string promotion)
-                // Add protocol if not provided (#5866: IE7 issue with protocol-less urls)
-                // We also use the url parameter if available
-                s.url = ( ( url || s.url ) + "" ).replace( rhash, "" ).replace( rprotocol, ajaxLocParts[ 1 ] + "//" );
-
-                // Extract dataTypes list
-                s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().split( core_rspace );
-
-                // A cross-domain request is in order when we have a protocol:host:port mismatch
-                if ( s.crossDomain == null ) {
-                        parts = rurl.exec( s.url.toLowerCase() );
-                        s.crossDomain = !!( parts &&
-                                ( parts[ 1 ] !== ajaxLocParts[ 1 ] || parts[ 2 ] !== ajaxLocParts[ 2 ] ||
-                                        ( parts[ 3 ] || ( parts[ 1 ] === "http:" ? 80 : 443 ) ) !=
-                                                ( ajaxLocParts[ 3 ] || ( ajaxLocParts[ 1 ] === "http:" ? 80 : 443 ) ) )
-                        );
-                }
-
-                // Convert data if not already a string
-                if ( s.data && s.processData && typeof s.data !== "string" ) {
-                        s.data = jQuery.param( s.data, s.traditional );
-                }
-
-                // Apply prefilters
-                inspectPrefiltersOrTransports( prefilters, s, options, jqXHR );
-
-                // If request was aborted inside a prefilter, stop there
-                if ( state === 2 ) {
-                        return jqXHR;
-                }
-
-                // We can fire global events as of now if asked to
-                fireGlobals = s.global;
-
-                // Uppercase the type
-                s.type = s.type.toUpperCase();
-
-                // Determine if request has content
-                s.hasContent = !rnoContent.test( s.type );
-
-                // Watch for a new set of requests
-                if ( fireGlobals && jQuery.active++ === 0 ) {
-                        jQuery.event.trigger( "ajaxStart" );
-                }
-
-                // More options handling for requests with no content
-                if ( !s.hasContent ) {
-
-                        // If data is available, append data to url
-                        if ( s.data ) {
-                                s.url += ( rquery.test( s.url ) ? "&" : "?" ) + s.data;
-                                // #9682: remove data so that it's not used in an eventual retry
-                                delete s.data;
-                        }
-
-                        // Get ifModifiedKey before adding the anti-cache parameter
-                        ifModifiedKey = s.url;
-
-                        // Add anti-cache in url if needed
-                        if ( s.cache === false ) {
-
-                                var ts = jQuery.now(),
-                                        // try replacing _= if it is there
-                                        ret = s.url.replace( rts, "$1_=" + ts );
-
-                                // if nothing was replaced, add timestamp to the end
-                                s.url = ret + ( ( ret === s.url ) ? ( rquery.test( s.url ) ? "&" : "?" ) + "_=" + ts : "" );
-                        }
-                }
-
-                // Set the correct header, if data is being sent
-                if ( s.data && s.hasContent && s.contentType !== false || options.contentType ) {
-                        jqXHR.setRequestHeader( "Content-Type", s.contentType );
-                }
-
-                // Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
-                if ( s.ifModified ) {
-                        ifModifiedKey = ifModifiedKey || s.url;
-                        if ( jQuery.lastModified[ ifModifiedKey ] ) {
-                                jqXHR.setRequestHeader( "If-Modified-Since", jQuery.lastModified[ ifModifiedKey ] );
-                        }
-                        if ( jQuery.etag[ ifModifiedKey ] ) {
-                                jqXHR.setRequestHeader( "If-None-Match", jQuery.etag[ ifModifiedKey ] );
-                        }
-                }
-
-                // Set the Accepts header for the server, depending on the dataType
-                jqXHR.setRequestHeader(
-                        "Accept",
-                        s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[0] ] ?
-                                s.accepts[ s.dataTypes[0] ] + ( s.dataTypes[ 0 ] !== "*" ? ", " + allTypes + "; q=0.01" : "" ) :
-                                s.accepts[ "*" ]
-                );
-
-                // Check for headers option
-                for ( i in s.headers ) {
-                        jqXHR.setRequestHeader( i, s.headers[ i ] );
-                }
-
-                // Allow custom headers/mimetypes and early abort
-                if ( s.beforeSend && ( s.beforeSend.call( callbackContext, jqXHR, s ) === false || state === 2 ) ) {
-                                // Abort if not done already and return
-                                return jqXHR.abort();
-
-                }
-
-                // aborting is no longer a cancellation
-                strAbort = "abort";
-
-                // Install callbacks on deferreds
-                for ( i in { success: 1, error: 1, complete: 1 } ) {
-                        jqXHR[ i ]( s[ i ] );
-                }
-
-                // Get transport
-                transport = inspectPrefiltersOrTransports( transports, s, options, jqXHR );
-
-                // If no transport, we auto-abort
-                if ( !transport ) {
-                        done( -1, "No Transport" );
-                } else {
-                        jqXHR.readyState = 1;
-                        // Send global event
-                        if ( fireGlobals ) {
-                                globalEventContext.trigger( "ajaxSend", [ jqXHR, s ] );
-                        }
-                        // Timeout
-                        if ( s.async && s.timeout > 0 ) {
-                                timeoutTimer = setTimeout( function(){
-                                        jqXHR.abort( "timeout" );
-                                }, s.timeout );
-                        }
-
-                        try {
-                                state = 1;
-                                transport.send( requestHeaders, done );
-                        } catch (e) {
-                                // Propagate exception as error if not done
-                                if ( state < 2 ) {
-                                        done( -1, e );
-                                // Simply rethrow otherwise
-                                } else {
-                                        throw e;
-                                }
-                        }
-                }
-
-                return jqXHR;
-        },
-
-        // Counter for holding the number of active queries
-        active: 0,
-
-        // Last-Modified header cache for next request
-        lastModified: {},
-        etag: {}
-
-});
-
-/* Handles responses to an ajax request:
- * - sets all responseXXX fields accordingly
- * - finds the right dataType (mediates between content-type and expected dataType)
- * - returns the corresponding response
- */
-function ajaxHandleResponses( s, jqXHR, responses ) {
-
-        var ct, type, finalDataType, firstDataType,
-                contents = s.contents,
-                dataTypes = s.dataTypes,
-                responseFields = s.responseFields;
-
-        // Fill responseXXX fields
-        for ( type in responseFields ) {
-                if ( type in responses ) {
-                        jqXHR[ responseFields[type] ] = responses[ type ];
-                }
-        }
-
-        // Remove auto dataType and get content-type in the process
-        while( dataTypes[ 0 ] === "*" ) {
-                dataTypes.shift();
-                if ( ct === undefined ) {
-                        ct = s.mimeType || jqXHR.getResponseHeader( "content-type" );
-                }
-        }
-
-        // Check if we're dealing with a known content-type
-        if ( ct ) {
-                for ( type in contents ) {
-                        if ( contents[ type ] && contents[ type ].test( ct ) ) {
-                                dataTypes.unshift( type );
-                                break;
-                        }
-                }
-        }
-
-        // Check to see if we have a response for the expected dataType
-        if ( dataTypes[ 0 ] in responses ) {
-                finalDataType = dataTypes[ 0 ];
-        } else {
-                // Try convertible dataTypes
-                for ( type in responses ) {
-                        if ( !dataTypes[ 0 ] || s.converters[ type + " " + dataTypes[0] ] ) {
-                                finalDataType = type;
-                                break;
-                        }
-                        if ( !firstDataType ) {
-                                firstDataType = type;
-                        }
-                }
-                // Or just use first one
-                finalDataType = finalDataType || firstDataType;
-        }
-
-        // If we found a dataType
-        // We add the dataType to the list if needed
-        // and return the corresponding response
-        if ( finalDataType ) {
-                if ( finalDataType !== dataTypes[ 0 ] ) {
-                        dataTypes.unshift( finalDataType );
-                }
-                return responses[ finalDataType ];
-        }
-}
-
-// Chain conversions given the request and the original response
-function ajaxConvert( s, response ) {
-
-        var conv, conv2, current, tmp,
-                // Work with a copy of dataTypes in case we need to modify it for conversion
-                dataTypes = s.dataTypes.slice(),
-                prev = dataTypes[ 0 ],
-                converters = {},
-                i = 0;
-
-        // Apply the dataFilter if provided
-        if ( s.dataFilter ) {
-                response = s.dataFilter( response, s.dataType );
-        }
-
-        // Create converters map with lowercased keys
-        if ( dataTypes[ 1 ] ) {
-                for ( conv in s.converters ) {
-                        converters[ conv.toLowerCase() ] = s.converters[ conv ];
-                }
-        }
-
-        // Convert to each sequential dataType, tolerating list modification
-        for ( ; (current = dataTypes[++i]); ) {
-
-                // There's only work to do if current dataType is non-auto
-                if ( current !== "*" ) {
-
-                        // Convert response if prev dataType is non-auto and differs from current
-                        if ( prev !== "*" && prev !== current ) {
-
-                                // Seek a direct converter
-                                conv = converters[ prev + " " + current ] || converters[ "* " + current ];
-
-                                // If none found, seek a pair
-                                if ( !conv ) {
-                                        for ( conv2 in converters ) {
-
-                                                // If conv2 outputs current
-                                                tmp = conv2.split(" ");
-                                                if ( tmp[ 1 ] === current ) {
-
-                                                        // If prev can be converted to accepted input
-                                                        conv = converters[ prev + " " + tmp[ 0 ] ] ||
-                                                                converters[ "* " + tmp[ 0 ] ];
-                                                        if ( conv ) {
-                                                                // Condense equivalence converters
-                                                                if ( conv === true ) {
-                                                                        conv = converters[ conv2 ];
-
-                                                                // Otherwise, insert the intermediate dataType
-                                                                } else if ( converters[ conv2 ] !== true ) {
-                                                                        current = tmp[ 0 ];
-                                                                        dataTypes.splice( i--, 0, current );
-                                                                }
-
-                                                                break;
-                                                        }
-                                                }
-                                        }
-                                }
-
-                                // Apply converter (if not an equivalence)
-                                if ( conv !== true ) {
-
-                                        // Unless errors are allowed to bubble, catch and return them
-                                        if ( conv && s["throws"] ) {
-                                                response = conv( response );
-                                        } else {
-                                                try {
-                                                        response = conv( response );
-                                                } catch ( e ) {
-                                                        return { state: "parsererror", error: conv ? e : "No conversion from " + prev + " to " + current };
-                                                }
-                                        }
-                                }
-                        }
-
-                        // Update prev for next iteration
-                        prev = current;
-                }
-        }
-
-        return { state: "success", data: response };
-}
-var oldCallbacks = [],
-        rquestion = /\?/,
-        rjsonp = /(=)\?(?=&|$)|\?\?/,
-        nonce = jQuery.now();
-
-// Default jsonp settings
-jQuery.ajaxSetup({
-        jsonp: "callback",
-        jsonpCallback: function() {
-                var callback = oldCallbacks.pop() || ( jQuery.expando + "_" + ( nonce++ ) );
-                this[ callback ] = true;
-                return callback;
-        }
-});
-
-// Detect, normalize options and install callbacks for jsonp requests
-jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
-
-        var callbackName, overwritten, responseContainer,
-                data = s.data,
-                url = s.url,
-                hasCallback = s.jsonp !== false,
-                replaceInUrl = hasCallback && rjsonp.test( url ),
-                replaceInData = hasCallback && !replaceInUrl && typeof data === "string" &&
-                        !( s.contentType || "" ).indexOf("application/x-www-form-urlencoded") &&
-                        rjsonp.test( data );
-
-        // Handle iff the expected data type is "jsonp" or we have a parameter to set
-        if ( s.dataTypes[ 0 ] === "jsonp" || replaceInUrl || replaceInData ) {
-
-                // Get callback name, remembering preexisting value associated with it
-                callbackName = s.jsonpCallback = jQuery.isFunction( s.jsonpCallback ) ?
-                        s.jsonpCallback() :
-                        s.jsonpCallback;
-                overwritten = window[ callbackName ];
-
-                // Insert callback into url or form data
-                if ( replaceInUrl ) {
-                        s.url = url.replace( rjsonp, "$1" + callbackName );
-                } else if ( replaceInData ) {
-                        s.data = data.replace( rjsonp, "$1" + callbackName );
-                } else if ( hasCallback ) {
-                        s.url += ( rquestion.test( url ) ? "&" : "?" ) + s.jsonp + "=" + callbackName;
-                }
-
-                // Use data converter to retrieve json after script execution
-                s.converters["script json"] = function() {
-                        if ( !responseContainer ) {
-                                jQuery.error( callbackName + " was not called" );
-                        }
-                        return responseContainer[ 0 ];
-                };
-
-                // force json dataType
-                s.dataTypes[ 0 ] = "json";
-
-                // Install callback
-                window[ callbackName ] = function() {
-                        responseContainer = arguments;
-                };
-
-                // Clean-up function (fires after converters)
-                jqXHR.always(function() {
-                        // Restore preexisting value
-                        window[ callbackName ] = overwritten;
-
-                        // Save back as free
-                        if ( s[ callbackName ] ) {
-                                // make sure that re-using the options doesn't screw things around
-                                s.jsonpCallback = originalSettings.jsonpCallback;
-
-                                // save the callback name for future use
-                                oldCallbacks.push( callbackName );
-                        }
-
-                        // Call if it was a function and we have a response
-                        if ( responseContainer && jQuery.isFunction( overwritten ) ) {
-                                overwritten( responseContainer[ 0 ] );
-                        }
-
-                        responseContainer = overwritten = undefined;
-                });
-
-                // Delegate to script
-                return "script";
-        }
-});
-// Install script dataType
-jQuery.ajaxSetup({
-        accepts: {
-                script: "text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"
-        },
-        contents: {
-                script: /javascript|ecmascript/
-        },
-        converters: {
-                "text script": function( text ) {
-                        jQuery.globalEval( text );
-                        return text;
-                }
-        }
-});
-
-// Handle cache's special case and global
-jQuery.ajaxPrefilter( "script", function( s ) {
-        if ( s.cache === undefined ) {
-                s.cache = false;
-        }
-        if ( s.crossDomain ) {
-                s.type = "GET";
-                s.global = false;
-        }
-});
-
-// Bind script tag hack transport
-jQuery.ajaxTransport( "script", function(s) {
-
-        // This transport only deals with cross domain requests
-        if ( s.crossDomain ) {
-
-                var script,
-                        head = document.head || document.getElementsByTagName( "head" )[0] || document.documentElement;
-
-                return {
-
-                        send: function( _, callback ) {
-
-                                script = document.createElement( "script" );
-
-                                script.async = "async";
-
-                                if ( s.scriptCharset ) {
-                                        script.charset = s.scriptCharset;
-                                }
-
-                                script.src = s.url;
-
-                                // Attach handlers for all browsers
-                                script.onload = script.onreadystatechange = function( _, isAbort ) {
-
-                                        if ( isAbort || !script.readyState || /loaded|complete/.test( script.readyState ) ) {
-
-                                                // Handle memory leak in IE
-                                                script.onload = script.onreadystatechange = null;
-
-                                                // Remove the script
-                                                if ( head && script.parentNode ) {
-                                                        head.removeChild( script );
-                                                }
-
-                                                // Dereference the script
-                                                script = undefined;
-
-                                                // Callback if not abort
-                                                if ( !isAbort ) {
-                                                        callback( 200, "success" );
-                                                }
-                                        }
-                                };
-                                // Use insertBefore instead of appendChild  to circumvent an IE6 bug.
-                                // This arises when a base node is used (#2709 and #4378).
-                                head.insertBefore( script, head.firstChild );
-                        },
-
-                        abort: function() {
-                                if ( script ) {
-                                        script.onload( 0, 1 );
-                                }
-                        }
-                };
-        }
-});
-var xhrCallbacks,
-        // #5280: Internet Explorer will keep connections alive if we don't abort on unload
-        xhrOnUnloadAbort = window.ActiveXObject ? function() {
-                // Abort all pending requests
-                for ( var key in xhrCallbacks ) {
-                        xhrCallbacks[ key ]( 0, 1 );
-                }
-        } : false,
-        xhrId = 0;
-
-// Functions to create xhrs
-function createStandardXHR() {
-        try {
-                return new window.XMLHttpRequest();
-        } catch( e ) {}
-}
-
-function createActiveXHR() {
-        try {
-                return new window.ActiveXObject( "Microsoft.XMLHTTP" );
-        } catch( e ) {}
-}
-
-// Create the request object
-// (This is still attached to ajaxSettings for backward compatibility)
-jQuery.ajaxSettings.xhr = window.ActiveXObject ?
-        /* Microsoft failed to properly
-         * implement the XMLHttpRequest in IE7 (can't request local files),
-         * so we use the ActiveXObject when it is available
-         * Additionally XMLHttpRequest can be disabled in IE7/IE8 so
-         * we need a fallback.
-         */
-        function() {
-                return !this.isLocal && createStandardXHR() || createActiveXHR();
-        } :
-        // For all other browsers, use the standard XMLHttpRequest object
-        createStandardXHR;
-
-// Determine support properties
-(function( xhr ) {
-        jQuery.extend( jQuery.support, {
-                ajax: !!xhr,
-                cors: !!xhr && ( "withCredentials" in xhr )
-        });
-})( jQuery.ajaxSettings.xhr() );
-
-// Create transport if the browser can provide an xhr
-if ( jQuery.support.ajax ) {
-
-        jQuery.ajaxTransport(function( s ) {
-                // Cross domain only allowed if supported through XMLHttpRequest
-                if ( !s.crossDomain || jQuery.support.cors ) {
-
-                        var callback;
-
-                        return {
-                                send: function( headers, complete ) {
-
-                                        // Get a new xhr
-                                        var handle, i,
-                                                xhr = s.xhr();
-
-                                        // Open the socket
-                                        // Passing null username, generates a login popup on Opera (#2865)
-                                        if ( s.username ) {
-                                                xhr.open( s.type, s.url, s.async, s.username, s.password );
-                                        } else {
-                                                xhr.open( s.type, s.url, s.async );
-                                        }
-
-                                        // Apply custom fields if provided
-                                        if ( s.xhrFields ) {
-                                                for ( i in s.xhrFields ) {
-                                                        xhr[ i ] = s.xhrFields[ i ];
-                                                }
-                                        }
-
-                                        // Override mime type if needed
-                                        if ( s.mimeType && xhr.overrideMimeType ) {
-                                                xhr.overrideMimeType( s.mimeType );
-                                        }
-
-                                        // X-Requested-With header
-                                        // For cross-domain requests, seeing as conditions for a preflight are
-                                        // akin to a jigsaw puzzle, we simply never set it to be sure.
-                                        // (it can always be set on a per-request basis or even using ajaxSetup)
-                                        // For same-domain requests, won't change header if already provided.
-                                        if ( !s.crossDomain && !headers["X-Requested-With"] ) {
-                                                headers[ "X-Requested-With" ] = "XMLHttpRequest";
-                                        }
-
-                                        // Need an extra try/catch for cross domain requests in Firefox 3
-                                        try {
-                                                for ( i in headers ) {
-                                                        xhr.setRequestHeader( i, headers[ i ] );
-                                                }
-                                        } catch( _ ) {}
-
-                                        // Do send the request
-                                        // This may raise an exception which is actually
-                                        // handled in jQuery.ajax (so no try/catch here)
-                                        xhr.send( ( s.hasContent && s.data ) || null );
-
-                                        // Listener
-                                        callback = function( _, isAbort ) {
-
-                                                var status,
-                                                        statusText,
-                                                        responseHeaders,
-                                                        responses,
-                                                        xml;
-
-                                                // Firefox throws exceptions when accessing properties
-                                                // of an xhr when a network error occurred
-                                                // http://helpful.knobs-dials.com/index.php/Component_returned_failure_code:_0x80040111_(NS_ERROR_NOT_AVAILABLE)
-                                                try {
-
-                                                        // Was never called and is aborted or complete
-                                                        if ( callback && ( isAbort || xhr.readyState === 4 ) ) {
-
-                                                                // Only called once
-                                                                callback = undefined;
-
-                                                                // Do not keep as active anymore
-                                                                if ( handle ) {
-                                                                        xhr.onreadystatechange = jQuery.noop;
-                                                                        if ( xhrOnUnloadAbort ) {
-                                                                                delete xhrCallbacks[ handle ];
-                                                                        }
-                                                                }
-
-                                                                // If it's an abort
-                                                                if ( isAbort ) {
-                                                                        // Abort it manually if needed
-                                                                        if ( xhr.readyState !== 4 ) {
-                                                                                xhr.abort();
-                                                                        }
-                                                                } else {
-                                                                        status = xhr.status;
-                                                                        responseHeaders = xhr.getAllResponseHeaders();
-                                                                        responses = {};
-                                                                        xml = xhr.responseXML;
-
-                                                                        // Construct response list
-                                                                        if ( xml && xml.documentElement /* #4958 */ ) {
-                                                                                responses.xml = xml;
-                                                                        }
-
-                                                                        // When requesting binary data, IE6-9 will throw an exception
-                                                                        // on any attempt to access responseText (#11426)
-                                                                        try {
-                                                                                responses.text = xhr.responseText;
-                                                                        } catch( e ) {
-                                                                        }
-
-                                                                        // Firefox throws an exception when accessing
-                                                                        // statusText for faulty cross-domain requests
-                                                                        try {
-                                                                                statusText = xhr.statusText;
-                                                                        } catch( e ) {
-                                                                                // We normalize with Webkit giving an empty statusText
-                                                                                statusText = "";
-                                                                        }
-
-                                                                        // Filter status for non standard behaviors
-
-                                                                        // If the request is local and we have data: assume a success
-                                                                        // (success with no data won't get notified, that's the best we
-                                                                        // can do given current implementations)
-                                                                        if ( !status && s.isLocal && !s.crossDomain ) {
-                                                                                status = responses.text ? 200 : 404;
-                                                                        // IE - #1450: sometimes returns 1223 when it should be 204
-                                                                        } else if ( status === 1223 ) {
-                                                                                status = 204;
-                                                                        }
-                                                                }
-                                                        }
-                                                } catch( firefoxAccessException ) {
-                                                        if ( !isAbort ) {
-                                                                complete( -1, firefoxAccessException );
-                                                        }
-                                                }
-
-                                                // Call complete if needed
-                                                if ( responses ) {
-                                                        complete( status, statusText, responses, responseHeaders );
-                                                }
-                                        };
-
-                                        if ( !s.async ) {
-                                                // if we're in sync mode we fire the callback
-                                                callback();
-                                        } else if ( xhr.readyState === 4 ) {
-                                                // (IE6 & IE7) if it's in cache and has been
-                                                // retrieved directly we need to fire the callback
-                                                setTimeout( callback, 0 );
-                                        } else {
-                                                handle = ++xhrId;
-                                                if ( xhrOnUnloadAbort ) {
-                                                        // Create the active xhrs callbacks list if needed
-                                                        // and attach the unload handler
-                                                        if ( !xhrCallbacks ) {
-                                                                xhrCallbacks = {};
-                                                                jQuery( window ).unload( xhrOnUnloadAbort );
-                                                        }
-                                                        // Add to list of active xhrs callbacks
-                                                        xhrCallbacks[ handle ] = callback;
-                                                }
-                                                xhr.onreadystatechange = callback;
-                                        }
-                                },
-
-                                abort: function() {
-                                        if ( callback ) {
-                                                callback(0,1);
-                                        }
-                                }
-                        };
-                }
-        });
-}
-var fxNow, timerId,
-        rfxtypes = /^(?:toggle|show|hide)$/,
-        rfxnum = new RegExp( "^(?:([-+])=|)(" + core_pnum + ")([a-z%]*)$", "i" ),
-        rrun = /queueHooks$/,
-        animationPrefilters = [ defaultPrefilter ],
-        tweeners = {
-                "*": [function( prop, value ) {
-                        var end, unit,
-                                tween = this.createTween( prop, value ),
-                                parts = rfxnum.exec( value ),
-                                target = tween.cur(),
-                                start = +target || 0,
-                                scale = 1,
-                                maxIterations = 20;
-
-                        if ( parts ) {
-                                end = +parts[2];
-                                unit = parts[3] || ( jQuery.cssNumber[ prop ] ? "" : "px" );
-
-                                // We need to compute starting value
-                                if ( unit !== "px" && start ) {
-                                        // Iteratively approximate from a nonzero starting point
-                                        // Prefer the current property, because this process will be trivial if it uses the same units
-                                        // Fallback to end or a simple constant
-                                        start = jQuery.css( tween.elem, prop, true ) || end || 1;
-
-                                        do {
-                                                // If previous iteration zeroed out, double until we get *something*
-                                                // Use a string for doubling factor so we don't accidentally see scale as unchanged below
-                                                scale = scale || ".5";
-
-                                                // Adjust and apply
-                                                start = start / scale;
-                                                jQuery.style( tween.elem, prop, start + unit );
-
-                                        // Update scale, tolerating zero or NaN from tween.cur()
-                                        // And breaking the loop if scale is unchanged or perfect, or if we've just had enough
-                                        } while ( scale !== (scale = tween.cur() / target) && scale !== 1 && --maxIterations );
-                                }
-
-                                tween.unit = unit;
-                                tween.start = start;
-                                // If a +=/-= token was provided, we're doing a relative animation
-                                tween.end = parts[1] ? start + ( parts[1] + 1 ) * end : end;
-                        }
-                        return tween;
-                }]
-        };
-
-// Animations created synchronously will run synchronously
-function createFxNow() {
-        setTimeout(function() {
-                fxNow = undefined;
-        }, 0 );
-        return ( fxNow = jQuery.now() );
-}
-
-function createTweens( animation, props ) {
-        jQuery.each( props, function( prop, value ) {
-                var collection = ( tweeners[ prop ] || [] ).concat( tweeners[ "*" ] ),
-                        index = 0,
-                        length = collection.length;
-                for ( ; index < length; index++ ) {
-                        if ( collection[ index ].call( animation, prop, value ) ) {
-
-                                // we're done with this property
-                                return;
-                        }
-                }
-        });
-}
-
-function Animation( elem, properties, options ) {
-        var result,
-                index = 0,
-                tweenerIndex = 0,
-                length = animationPrefilters.length,
-                deferred = jQuery.Deferred().always( function() {
-                        // don't match elem in the :animated selector
-                        delete tick.elem;
-                }),
-                tick = function() {
-                        var currentTime = fxNow || createFxNow(),
-                                remaining = Math.max( 0, animation.startTime + animation.duration - currentTime ),
-                                // archaic crash bug won't allow us to use 1 - ( 0.5 || 0 ) (#12497)
-                                temp = remaining / animation.duration || 0,
-                                percent = 1 - temp,
-                                index = 0,
-                                length = animation.tweens.length;
-
-                        for ( ; index < length ; index++ ) {
-                                animation.tweens[ index ].run( percent );
-                        }
-
-                        deferred.notifyWith( elem, [ animation, percent, remaining ]);
-
-                        if ( percent < 1 && length ) {
-                                return remaining;
-                        } else {
-                                deferred.resolveWith( elem, [ animation ] );
-                                return false;
-                        }
-                },
-                animation = deferred.promise({
-                        elem: elem,
-                        props: jQuery.extend( {}, properties ),
-                        opts: jQuery.extend( true, { specialEasing: {} }, options ),
-                        originalProperties: properties,
-                        originalOptions: options,
-                        startTime: fxNow || createFxNow(),
-                        duration: options.duration,
-                        tweens: [],
-                        createTween: function( prop, end, easing ) {
-                                var tween = jQuery.Tween( elem, animation.opts, prop, end,
-                                                animation.opts.specialEasing[ prop ] || animation.opts.easing );
-                                animation.tweens.push( tween );
-                                return tween;
-                        },
-                        stop: function( gotoEnd ) {
-                                var index = 0,
-                                        // if we are going to the end, we want to run all the tweens
-                                        // otherwise we skip this part
-                                        length = gotoEnd ? animation.tweens.length : 0;
-
-                                for ( ; index < length ; index++ ) {
-                                        animation.tweens[ index ].run( 1 );
-                                }
-
-                                // resolve when we played the last frame
-                                // otherwise, reject
-                                if ( gotoEnd ) {
-                                        deferred.resolveWith( elem, [ animation, gotoEnd ] );
-                                } else {
-                                        deferred.rejectWith( elem, [ animation, gotoEnd ] );
-                                }
-                                return this;
-                        }
-                }),
-                props = animation.props;
-
-        propFilter( props, animation.opts.specialEasing );
-
-        for ( ; index < length ; index++ ) {
-                result = animationPrefilters[ index ].call( animation, elem, props, animation.opts );
-                if ( result ) {
-                        return result;
-                }
-        }
-
-        createTweens( animation, props );
-
-        if ( jQuery.isFunction( animation.opts.start ) ) {
-                animation.opts.start.call( elem, animation );
-        }
-
-        jQuery.fx.timer(
-                jQuery.extend( tick, {
-                        anim: animation,
-                        queue: animation.opts.queue,
-                        elem: elem
-                })
-        );
-
-        // attach callbacks from options
-        return animation.progress( animation.opts.progress )
-                .done( animation.opts.done, animation.opts.complete )
-                .fail( animation.opts.fail )
-                .always( animation.opts.always );
-}
-
-function propFilter( props, specialEasing ) {
-        var index, name, easing, value, hooks;
-
-        // camelCase, specialEasing and expand cssHook pass
-        for ( index in props ) {
-                name = jQuery.camelCase( index );
-                easing = specialEasing[ name ];
-                value = props[ index ];
-                if ( jQuery.isArray( value ) ) {
-                        easing = value[ 1 ];
-                        value = props[ index ] = value[ 0 ];
-                }
-
-                if ( index !== name ) {
-                        props[ name ] = value;
-                        delete props[ index ];
-                }
-
-                hooks = jQuery.cssHooks[ name ];
-                if ( hooks && "expand" in hooks ) {
-                        value = hooks.expand( value );
-                        delete props[ name ];
-
-                        // not quite $.extend, this wont overwrite keys already present.
-                        // also - reusing 'index' from above because we have the correct "name"
-                        for ( index in value ) {
-                                if ( !( index in props ) ) {
-                                        props[ index ] = value[ index ];
-                                        specialEasing[ index ] = easing;
-                                }
-                        }
-                } else {
-                        specialEasing[ name ] = easing;
-                }
-        }
-}
-
-jQuery.Animation = jQuery.extend( Animation, {
-
-        tweener: function( props, callback ) {
-                if ( jQuery.isFunction( props ) ) {
-                        callback = props;
-                        props = [ "*" ];
-                } else {
-                        props = props.split(" ");
-                }
-
-                var prop,
-                        index = 0,
-                        length = props.length;
-
-                for ( ; index < length ; index++ ) {
-                        prop = props[ index ];
-                        tweeners[ prop ] = tweeners[ prop ] || [];
-                        tweeners[ prop ].unshift( callback );
-                }
-        },
-
-        prefilter: function( callback, prepend ) {
-                if ( prepend ) {
-                        animationPrefilters.unshift( callback );
-                } else {
-                        animationPrefilters.push( callback );
-                }
-        }
-});
-
-function defaultPrefilter( elem, props, opts ) {
-        var index, prop, value, length, dataShow, toggle, tween, hooks, oldfire,
-                anim = this,
-                style = elem.style,
-                orig = {},
-                handled = [],
-                hidden = elem.nodeType && isHidden( elem );
-
-        // handle queue: false promises
-        if ( !opts.queue ) {
-                hooks = jQuery._queueHooks( elem, "fx" );
-                if ( hooks.unqueued == null ) {
-                        hooks.unqueued = 0;
-                        oldfire = hooks.empty.fire;
-                        hooks.empty.fire = function() {
-                                if ( !hooks.unqueued ) {
-                                        oldfire();
-                                }
-                        };
-                }
-                hooks.unqueued++;
-
-                anim.always(function() {
-                        // doing this makes sure that the complete handler will be called
-                        // before this completes
-                        anim.always(function() {
-                                hooks.unqueued--;
-                                if ( !jQuery.queue( elem, "fx" ).length ) {
-                                        hooks.empty.fire();
-                                }
-                        });
-                });
-        }
-
-        // height/width overflow pass
-        if ( elem.nodeType === 1 && ( "height" in props || "width" in props ) ) {
-                // Make sure that nothing sneaks out
-                // Record all 3 overflow attributes because IE does not
-                // change the overflow attribute when overflowX and
-                // overflowY are set to the same value
-                opts.overflow = [ style.overflow, style.overflowX, style.overflowY ];
-
-                // Set display property to inline-block for height/width
-                // animations on inline elements that are having width/height animated
-                if ( jQuery.css( elem, "display" ) === "inline" &&
-                                jQuery.css( elem, "float" ) === "none" ) {
-
-                        // inline-level elements accept inline-block;
-                        // block-level elements need to be inline with layout
-                        if ( !jQuery.support.inlineBlockNeedsLayout || css_defaultDisplay( elem.nodeName ) === "inline" ) {
-                                style.display = "inline-block";
-
-                        } else {
-                                style.zoom = 1;
-                        }
-                }
-        }
-
-        if ( opts.overflow ) {
-                style.overflow = "hidden";
-                if ( !jQuery.support.shrinkWrapBlocks ) {
-                        anim.done(function() {
-                                style.overflow = opts.overflow[ 0 ];
-                                style.overflowX = opts.overflow[ 1 ];
-                                style.overflowY = opts.overflow[ 2 ];
-                        });
-                }
-        }
-
-
-        // show/hide pass
-        for ( index in props ) {
-                value = props[ index ];
-                if ( rfxtypes.exec( value ) ) {
-                        delete props[ index ];
-                        toggle = toggle || value === "toggle";
-                        if ( value === ( hidden ? "hide" : "show" ) ) {
-                                continue;
-                        }
-                        handled.push( index );
-                }
-        }
-
-        length = handled.length;
-        if ( length ) {
-                dataShow = jQuery._data( elem, "fxshow" ) || jQuery._data( elem, "fxshow", {} );
-                if ( "hidden" in dataShow ) {
-                        hidden = dataShow.hidden;
-                }
-
-                // store state if its toggle - enables .stop().toggle() to "reverse"
-                if ( toggle ) {
-                        dataShow.hidden = !hidden;
-                }
-                if ( hidden ) {
-                        jQuery( elem ).show();
-                } else {
-                        anim.done(function() {
-                                jQuery( elem ).hide();
-                        });
-                }
-                anim.done(function() {
-                        var prop;
-                        jQuery.removeData( elem, "fxshow", true );
-                        for ( prop in orig ) {
-                                jQuery.style( elem, prop, orig[ prop ] );
-                        }
-                });
-                for ( index = 0 ; index < length ; index++ ) {
-                        prop = handled[ index ];
-                        tween = anim.createTween( prop, hidden ? dataShow[ prop ] : 0 );
-                        orig[ prop ] = dataShow[ prop ] || jQuery.style( elem, prop );
-
-                        if ( !( prop in dataShow ) ) {
-                                dataShow[ prop ] = tween.start;
-                                if ( hidden ) {
-                                        tween.end = tween.start;
-                                        tween.start = prop === "width" || prop === "height" ? 1 : 0;
-                                }
-                        }
-                }
-        }
-}
-
-function Tween( elem, options, prop, end, easing ) {
-        return new Tween.prototype.init( elem, options, prop, end, easing );
-}
-jQuery.Tween = Tween;
-
-Tween.prototype = {
-        constructor: Tween,
-        init: function( elem, options, prop, end, easing, unit ) {
-                this.elem = elem;
-                this.prop = prop;
-                this.easing = easing || "swing";
-                this.options = options;
-                this.start = this.now = this.cur();
-                this.end = end;
-                this.unit = unit || ( jQuery.cssNumber[ prop ] ? "" : "px" );
-        },
-        cur: function() {
-                var hooks = Tween.propHooks[ this.prop ];
-
-                return hooks && hooks.get ?
-                        hooks.get( this ) :
-                        Tween.propHooks._default.get( this );
-        },
-        run: function( percent ) {
-                var eased,
-                        hooks = Tween.propHooks[ this.prop ];
-
-                if ( this.options.duration ) {
-                        this.pos = eased = jQuery.easing[ this.easing ](
-                                percent, this.options.duration * percent, 0, 1, this.options.duration
-                        );
-                } else {
-                        this.pos = eased = percent;
-                }
-                this.now = ( this.end - this.start ) * eased + this.start;
-
-                if ( this.options.step ) {
-                        this.options.step.call( this.elem, this.now, this );
-                }
-
-                if ( hooks && hooks.set ) {
-                        hooks.set( this );
-                } else {
-                        Tween.propHooks._default.set( this );
-                }
-                return this;
-        }
-};
-
-Tween.prototype.init.prototype = Tween.prototype;
-
-Tween.propHooks = {
-        _default: {
-                get: function( tween ) {
-                        var result;
-
-                        if ( tween.elem[ tween.prop ] != null &&
-                                (!tween.elem.style || tween.elem.style[ tween.prop ] == null) ) {
-                                return tween.elem[ tween.prop ];
-                        }
-
-                        // passing any value as a 4th parameter to .css will automatically
-                        // attempt a parseFloat and fallback to a string if the parse fails
-                        // so, simple values such as "10px" are parsed to Float.
-                        // complex values such as "rotate(1rad)" are returned as is.
-                        result = jQuery.css( tween.elem, tween.prop, false, "" );
-                        // Empty strings, null, undefined and "auto" are converted to 0.
-                        return !result || result === "auto" ? 0 : result;
-                },
-                set: function( tween ) {
-                        // use step hook for back compat - use cssHook if its there - use .style if its
-                        // available and use plain properties where available
-                        if ( jQuery.fx.step[ tween.prop ] ) {
-                                jQuery.fx.step[ tween.prop ]( tween );
-                        } else if ( tween.elem.style && ( tween.elem.style[ jQuery.cssProps[ tween.prop ] ] != null || jQuery.cssHooks[ tween.prop ] ) ) {
-                                jQuery.style( tween.elem, tween.prop, tween.now + tween.unit );
-                        } else {
-                                tween.elem[ tween.prop ] = tween.now;
-                        }
-                }
-        }
-};
-
-// Remove in 2.0 - this supports IE8's panic based approach
-// to setting things on disconnected nodes
-
-Tween.propHooks.scrollTop = Tween.propHooks.scrollLeft = {
-        set: function( tween ) {
-                if ( tween.elem.nodeType && tween.elem.parentNode ) {
-                        tween.elem[ tween.prop ] = tween.now;
-                }
-        }
-};
-
-jQuery.each([ "toggle", "show", "hide" ], function( i, name ) {
-        var cssFn = jQuery.fn[ name ];
-        jQuery.fn[ name ] = function( speed, easing, callback ) {
-                return speed == null || typeof speed === "boolean" ||
-                        // special check for .toggle( handler, handler, ... )
-                        ( !i && jQuery.isFunction( speed ) && jQuery.isFunction( easing ) ) ?
-                        cssFn.apply( this, arguments ) :
-                        this.animate( genFx( name, true ), speed, easing, callback );
-        };
-});
-
-jQuery.fn.extend({
-        fadeTo: function( speed, to, easing, callback ) {
-
-                // show any hidden elements after setting opacity to 0
-                return this.filter( isHidden ).css( "opacity", 0 ).show()
-
-                        // animate to the value specified
-                        .end().animate({ opacity: to }, speed, easing, callback );
-        },
-        animate: function( prop, speed, easing, callback ) {
-                var empty = jQuery.isEmptyObject( prop ),
-                        optall = jQuery.speed( speed, easing, callback ),
-                        doAnimation = function() {
-                                // Operate on a copy of prop so per-property easing won't be lost
-                                var anim = Animation( this, jQuery.extend( {}, prop ), optall );
-
-                                // Empty animations resolve immediately
-                                if ( empty ) {
-                                        anim.stop( true );
-                                }
-                        };
-
-                return empty || optall.queue === false ?
-                        this.each( doAnimation ) :
-                        this.queue( optall.queue, doAnimation );
-        },
-        stop: function( type, clearQueue, gotoEnd ) {
-                var stopQueue = function( hooks ) {
-                        var stop = hooks.stop;
-                        delete hooks.stop;
-                        stop( gotoEnd );
-                };
-
-                if ( typeof type !== "string" ) {
-                        gotoEnd = clearQueue;
-                        clearQueue = type;
-                        type = undefined;
-                }
-                if ( clearQueue && type !== false ) {
-                        this.queue( type || "fx", [] );
-                }
-
-                return this.each(function() {
-                        var dequeue = true,
-                                index = type != null && type + "queueHooks",
-                                timers = jQuery.timers,
-                                data = jQuery._data( this );
-
-                        if ( index ) {
-                                if ( data[ index ] && data[ index ].stop ) {
-                                        stopQueue( data[ index ] );
-                                }
-                        } else {
-                                for ( index in data ) {
-                                        if ( data[ index ] && data[ index ].stop && rrun.test( index ) ) {
-                                                stopQueue( data[ index ] );
-                                        }
-                                }
-                        }
-
-                        for ( index = timers.length; index--; ) {
-                                if ( timers[ index ].elem === this && (type == null || timers[ index ].queue === type) ) {
-                                        timers[ index ].anim.stop( gotoEnd );
-                                        dequeue = false;
-                                        timers.splice( index, 1 );
-                                }
-                        }
-
-                        // start the next in the queue if the last step wasn't forced
-                        // timers currently will call their complete callbacks, which will dequeue
-                        // but only if they were gotoEnd
-                        if ( dequeue || !gotoEnd ) {
-                                jQuery.dequeue( this, type );
-                        }
-                });
-        }
-});
-
-// Generate parameters to create a standard animation
-function genFx( type, includeWidth ) {
-        var which,
-                attrs = { height: type },
-                i = 0;
-
-        // if we include width, step value is 1 to do all cssExpand values,
-        // if we don't include width, step value is 2 to skip over Left and Right
-        includeWidth = includeWidth? 1 : 0;
-        for( ; i < 4 ; i += 2 - includeWidth ) {
-                which = cssExpand[ i ];
-                attrs[ "margin" + which ] = attrs[ "padding" + which ] = type;
-        }
-
-        if ( includeWidth ) {
-                attrs.opacity = attrs.width = type;
-        }
-
-        return attrs;
-}
-
-// Generate shortcuts for custom animations
-jQuery.each({
-        slideDown: genFx("show"),
-        slideUp: genFx("hide"),
-        slideToggle: genFx("toggle"),
-        fadeIn: { opacity: "show" },
-        fadeOut: { opacity: "hide" },
-        fadeToggle: { opacity: "toggle" }
-}, function( name, props ) {
-        jQuery.fn[ name ] = function( speed, easing, callback ) {
-                return this.animate( props, speed, easing, callback );
-        };
-});
-
-jQuery.speed = function( speed, easing, fn ) {
-        var opt = speed && typeof speed === "object" ? jQuery.extend( {}, speed ) : {
-                complete: fn || !fn && easing ||
-                        jQuery.isFunction( speed ) && speed,
-                duration: speed,
-                easing: fn && easing || easing && !jQuery.isFunction( easing ) && easing
-        };
-
-        opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
-                opt.duration in jQuery.fx.speeds ? jQuery.fx.speeds[ opt.duration ] : jQuery.fx.speeds._default;
-
-        // normalize opt.queue - true/undefined/null -> "fx"
-        if ( opt.queue == null || opt.queue === true ) {
-                opt.queue = "fx";
-        }
-
-        // Queueing
-        opt.old = opt.complete;
-
-        opt.complete = function() {
-                if ( jQuery.isFunction( opt.old ) ) {
-                        opt.old.call( this );
-                }
-
-                if ( opt.queue ) {
-                        jQuery.dequeue( this, opt.queue );
-                }
-        };
-
-        return opt;
-};
-
-jQuery.easing = {
-        linear: function( p ) {
-                return p;
-        },
-        swing: function( p ) {
-                return 0.5 - Math.cos( p*Math.PI ) / 2;
-        }
-};
-
-jQuery.timers = [];
-jQuery.fx = Tween.prototype.init;
-jQuery.fx.tick = function() {
-        var timer,
-                timers = jQuery.timers,
-                i = 0;
-
-        fxNow = jQuery.now();
-
-        for ( ; i < timers.length; i++ ) {
-                timer = timers[ i ];
-                // Checks the timer has not already been removed
-                if ( !timer() && timers[ i ] === timer ) {
-                        timers.splice( i--, 1 );
-                }
-        }
-
-        if ( !timers.length ) {
-                jQuery.fx.stop();
-        }
-        fxNow = undefined;
-};
-
-jQuery.fx.timer = function( timer ) {
-        if ( timer() && jQuery.timers.push( timer ) && !timerId ) {
-                timerId = setInterval( jQuery.fx.tick, jQuery.fx.interval );
-        }
-};
-
-jQuery.fx.interval = 13;
-
-jQuery.fx.stop = function() {
-        clearInterval( timerId );
-        timerId = null;
-};
-
-jQuery.fx.speeds = {
-        slow: 600,
-        fast: 200,
-        // Default speed
-        _default: 400
-};
-
-// Back Compat <1.8 extension point
-jQuery.fx.step = {};
-
-if ( jQuery.expr && jQuery.expr.filters ) {
-        jQuery.expr.filters.animated = function( elem ) {
-                return jQuery.grep(jQuery.timers, function( fn ) {
-                        return elem === fn.elem;
-                }).length;
-        };
-}
-var rroot = /^(?:body|html)$/i;
-
-jQuery.fn.offset = function( options ) {
-        if ( arguments.length ) {
-                return options === undefined ?
-                        this :
-                        this.each(function( i ) {
-                                jQuery.offset.setOffset( this, options, i );
-                        });
-        }
-
-        var docElem, body, win, clientTop, clientLeft, scrollTop, scrollLeft,
-                box = { top: 0, left: 0 },
-                elem = this[ 0 ],
-                doc = elem && elem.ownerDocument;
-
-        if ( !doc ) {
-                return;
-        }
-
-        if ( (body = doc.body) === elem ) {
-                return jQuery.offset.bodyOffset( elem );
-        }
-
-        docElem = doc.documentElement;
-
-        // Make sure it's not a disconnected DOM node
-        if ( !jQuery.contains( docElem, elem ) ) {
-                return box;
-        }
-
-        // If we don't have gBCR, just use 0,0 rather than error
-        // BlackBerry 5, iOS 3 (original iPhone)
-        if ( typeof elem.getBoundingClientRect !== "undefined" ) {
-                box = elem.getBoundingClientRect();
-        }
-        win = getWindow( doc );
-        clientTop  = docElem.clientTop  || body.clientTop  || 0;
-        clientLeft = docElem.clientLeft || body.clientLeft || 0;
-        scrollTop  = win.pageYOffset || docElem.scrollTop;
-        scrollLeft = win.pageXOffset || docElem.scrollLeft;
-        return {
-                top: box.top  + scrollTop  - clientTop,
-                left: box.left + scrollLeft - clientLeft
-        };
-};
-
-jQuery.offset = {
-
-        bodyOffset: function( body ) {
-                var top = body.offsetTop,
-                        left = body.offsetLeft;
-
-                if ( jQuery.support.doesNotIncludeMarginInBodyOffset ) {
-                        top  += parseFloat( jQuery.css(body, "marginTop") ) || 0;
-                        left += parseFloat( jQuery.css(body, "marginLeft") ) || 0;
-                }
-
-                return { top: top, left: left };
-        },
-
-        setOffset: function( elem, options, i ) {
-                var position = jQuery.css( elem, "position" );
-
-                // set position first, in-case top/left are set even on static elem
-                if ( position === "static" ) {
-                        elem.style.position = "relative";
-                }
-
-                var curElem = jQuery( elem ),
-                        curOffset = curElem.offset(),
-                        curCSSTop = jQuery.css( elem, "top" ),
-                        curCSSLeft = jQuery.css( elem, "left" ),
-                        calculatePosition = ( position === "absolute" || position === "fixed" ) && jQuery.inArray("auto", [curCSSTop, curCSSLeft]) > -1,
-                        props = {}, curPosition = {}, curTop, curLeft;
-
-                // need to be able to calculate position if either top or left is auto and position is either absolute or fixed
-                if ( calculatePosition ) {
-                        curPosition = curElem.position();
-                        curTop = curPosition.top;
-                        curLeft = curPosition.left;
-                } else {
-                        curTop = parseFloat( curCSSTop ) || 0;
-                        curLeft = parseFloat( curCSSLeft ) || 0;
-                }
-
-                if ( jQuery.isFunction( options ) ) {
-                        options = options.call( elem, i, curOffset );
-                }
-
-                if ( options.top != null ) {
-                        props.top = ( options.top - curOffset.top ) + curTop;
-                }
-                if ( options.left != null ) {
-                        props.left = ( options.left - curOffset.left ) + curLeft;
-                }
-
-                if ( "using" in options ) {
-                        options.using.call( elem, props );
-                } else {
-                        curElem.css( props );
-                }
-        }
-};
-
-
-jQuery.fn.extend({
-
-        position: function() {
-                if ( !this[0] ) {
-                        return;
-                }
-
-                var elem = this[0],
-
-                // Get *real* offsetParent
-                offsetParent = this.offsetParent(),
-
-                // Get correct offsets
-                offset       = this.offset(),
-                parentOffset = rroot.test(offsetParent[0].nodeName) ? { top: 0, left: 0 } : offsetParent.offset();
-
-                // Subtract element margins
-                // note: when an element has margin: auto the offsetLeft and marginLeft
-                // are the same in Safari causing offset.left to incorrectly be 0
-                offset.top  -= parseFloat( jQuery.css(elem, "marginTop") ) || 0;
-                offset.left -= parseFloat( jQuery.css(elem, "marginLeft") ) || 0;
-
-                // Add offsetParent borders
-                parentOffset.top  += parseFloat( jQuery.css(offsetParent[0], "borderTopWidth") ) || 0;
-                parentOffset.left += parseFloat( jQuery.css(offsetParent[0], "borderLeftWidth") ) || 0;
-
-                // Subtract the two offsets
-                return {
-                        top:  offset.top  - parentOffset.top,
-                        left: offset.left - parentOffset.left
-                };
-        },
-
-        offsetParent: function() {
-                return this.map(function() {
-                        var offsetParent = this.offsetParent || document.body;
-                        while ( offsetParent && (!rroot.test(offsetParent.nodeName) && jQuery.css(offsetParent, "position") === "static") ) {
-                                offsetParent = offsetParent.offsetParent;
-                        }
-                        return offsetParent || document.body;
-                });
-        }
-});
-
-
-// Create scrollLeft and scrollTop methods
-jQuery.each( {scrollLeft: "pageXOffset", scrollTop: "pageYOffset"}, function( method, prop ) {
-        var top = /Y/.test( prop );
-
-        jQuery.fn[ method ] = function( val ) {
-                return jQuery.access( this, function( elem, method, val ) {
-                        var win = getWindow( elem );
-
-                        if ( val === undefined ) {
-                                return win ? (prop in win) ? win[ prop ] :
-                                        win.document.documentElement[ method ] :
-                                        elem[ method ];
-                        }
-
-                        if ( win ) {
-                                win.scrollTo(
-                                        !top ? val : jQuery( win ).scrollLeft(),
-                                         top ? val : jQuery( win ).scrollTop()
-                                );
-
-                        } else {
-                                elem[ method ] = val;
-                        }
-                }, method, val, arguments.length, null );
-        };
-});
-
-function getWindow( elem ) {
-        return jQuery.isWindow( elem ) ?
-                elem :
-                elem.nodeType === 9 ?
-                        elem.defaultView || elem.parentWindow :
-                        false;
-}
-// Create innerHeight, innerWidth, height, width, outerHeight and outerWidth methods
-jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
-        jQuery.each( { padding: "inner" + name, content: type, "": "outer" + name }, function( defaultExtra, funcName ) {
-                // margin is only for outerHeight, outerWidth
-                jQuery.fn[ funcName ] = function( margin, value ) {
-                        var chainable = arguments.length && ( defaultExtra || typeof margin !== "boolean" ),
-                                extra = defaultExtra || ( margin === true || value === true ? "margin" : "border" );
-
-                        return jQuery.access( this, function( elem, type, value ) {
-                                var doc;
-
-                                if ( jQuery.isWindow( elem ) ) {
-                                        // As of 5/8/2012 this will yield incorrect results for Mobile Safari, but there
-                                        // isn't a whole lot we can do. See pull request at this URL for discussion:
-                                        // https://github.com/jquery/jquery/pull/764
-                                        return elem.document.documentElement[ "client" + name ];
-                                }
-
-                                // Get document width or height
-                                if ( elem.nodeType === 9 ) {
-                                        doc = elem.documentElement;
-
-                                        // Either scroll[Width/Height] or offset[Width/Height] or client[Width/Height], whichever is greatest
-                                        // unfortunately, this causes bug #3838 in IE6/8 only, but there is currently no good, small way to fix it.
-                                        return Math.max(
-                                                elem.body[ "scroll" + name ], doc[ "scroll" + name ],
-                                                elem.body[ "offset" + name ], doc[ "offset" + name ],
-                                                doc[ "client" + name ]
-                                        );
-                                }
-
-                                return value === undefined ?
-                                        // Get width or height on the element, requesting but not forcing parseFloat
-                                        jQuery.css( elem, type, value, extra ) :
-
-                                        // Set width or height on the element
-                                        jQuery.style( elem, type, value, extra );
-                        }, type, chainable ? margin : undefined, chainable, null );
-                };
-        });
-});
-// Expose jQuery to the global object
-window.jQuery = window.$ = jQuery;
-
-// Expose jQuery as an AMD module, but only for AMD loaders that
-// understand the issues with loading multiple versions of jQuery
-// in a page that all might call define(). The loader will indicate
-// they have special allowances for multiple jQuery versions by
-// specifying define.amd.jQuery = true. Register as a named module,
-// since jQuery can be concatenated with other files that may use define,
-// but not use a proper concatenation script that understands anonymous
-// AMD modules. A named AMD is safest and most robust way to register.
-// Lowercase jquery is used because AMD module names are derived from
-// file names, and jQuery is normally delivered in a lowercase file name.
-// Do this after creating the global so that if an AMD module wants to call
-// noConflict to hide this version of jQuery, it will work.
-if ( typeof define === "function" && define.amd && define.amd.jQuery ) {
-        define( "jquery", [], function () { return jQuery; } );
-}
-
-})( window );
diff --git a/addons/im_livechat/static/ext/static/lib/qweb/qweb2.js b/addons/im_livechat/static/ext/static/lib/qweb/qweb2.js
deleted file mode 100644
index 0c4b59cd377..00000000000
--- a/addons/im_livechat/static/ext/static/lib/qweb/qweb2.js
+++ /dev/null
@@ -1,736 +0,0 @@
-/*
-Copyright (c) 2013, Fabien Meghazi
-
-Released under the MIT license
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
-Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-// TODO: trim support
-// TODO: line number -> https://bugzilla.mozilla.org/show_bug.cgi?id=618650
-// TODO: templates orverwritten could be called by t-call="__super__" ?
-// TODO: t-set + t-value + children node == scoped variable ?
-
-(function() {
-
-var QWeb2 = {
-    expressions_cache: {},
-    RESERVED_WORDS: 'true,false,NaN,null,undefined,debugger,console,window,in,instanceof,new,function,return,this,typeof,eval,void,Math,RegExp,Array,Object,Date'.split(','),
-    ACTIONS_PRECEDENCE: 'foreach,if,call,set,esc,escf,raw,rawf,js,debug,log'.split(','),
-    WORD_REPLACEMENT: {
-        'and': '&&',
-        'or': '||',
-        'gt': '>',
-        'gte': '>=',
-        'lt': '<',
-        'lte': '<='
-    },
-    tools: {
-        exception: function(message, context) {
-            context = context || {};
-            var prefix = 'QWeb2';
-            if (context.template) {
-                prefix += " - template['" + context.template + "']";
-            }
-            throw new Error(prefix + ": " + message);
-        },
-        warning : function(message) {
-            if (typeof(window) !== 'undefined' && window.console) {
-                window.console.warn(message);
-            }
-        },
-        trim: function(s, mode) {
-            switch (mode) {
-                case "left":
-                    return s.replace(/^\s*/, "");
-                case "right":
-                    return s.replace(/\s*$/, "");
-                default:
-                    return s.replace(/^\s*|\s*$/g, "");
-            }
-        },
-        js_escape: function(s, noquotes) {
-            return (noquotes ? '' : "'") + s.replace(/\r?\n/g, "\\n").replace(/'/g, "\\'") + (noquotes ? '' : "'");
-        },
-        html_escape: function(s, attribute) {
-            if (s == null) {
-                return '';
-            }
-            s = String(s).replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
-            if (attribute) {
-                s = s.replace(/"/g, '&quot;');
-            }
-            return s;
-        },
-        gen_attribute: function(o) {
-            if (o !== null && o !== undefined) {
-                if (o.constructor === Array) {
-                    if (o[1] !== null && o[1] !== undefined) {
-                        return this.format_attribute(o[0], o[1]);
-                    }
-                } else if (typeof o === 'object') {
-                    var r = '';
-                    for (var k in o) {
-                        if (o.hasOwnProperty(k)) {
-                            r += this.gen_attribute([k, o[k]]);
-                        }
-                    }
-                    return r;
-                }
-            }
-            return '';
-        },
-        format_attribute: function(name, value) {
-            return ' ' + name + '="' + this.html_escape(value, true) + '"';
-        },
-        extend: function(dst, src, exclude) {
-            for (var p in src) {
-                if (src.hasOwnProperty(p) && !(exclude && this.arrayIndexOf(exclude, p) !== -1)) {
-                    dst[p] = src[p];
-                }
-            }
-            return dst;
-        },
-        arrayIndexOf : function(array, item) {
-            for (var i = 0, ilen = array.length; i < ilen; i++) {
-                if (array[i] === item) {
-                    return i;
-                }
-            }
-            return -1;
-        },
-        xml_node_to_string : function(node, childs_only) {
-            if (childs_only) {
-                var childs = node.childNodes, r = [];
-                for (var i = 0, ilen = childs.length; i < ilen; i++) {
-                    r.push(this.xml_node_to_string(childs[i]));
-                }
-                return r.join('');
-            } else {
-                if (typeof XMLSerializer !== 'undefined') {
-                    return (new XMLSerializer()).serializeToString(node);
-                } else {
-                    switch(node.nodeType) {
-                    case 1: return node.outerHTML;
-                    case 3: return node.data;
-                    case 4: return '<![CDATA[' + node.data + ']]>';
-                    case 8: return '<!-- ' + node.data + '-->';
-                    }
-                    throw new Error('Unknown node type ' + node.nodeType);
-                }
-            }
-        },
-        call: function(context, template, old_dict, _import, callback) {
-            var new_dict = this.extend({}, old_dict);
-            new_dict['__caller__'] = old_dict['__template__'];
-            if (callback) {
-                new_dict['__content__'] = callback(context, new_dict);
-            }
-            var r = context.engine._render(template, new_dict);
-            if (_import) {
-                if (_import === '*') {
-                    this.extend(old_dict, new_dict, ['__caller__', '__template__']);
-                } else {
-                    _import = _import.split(',');
-                    for (var i = 0, ilen = _import.length; i < ilen; i++) {
-                        var v = _import[i];
-                        old_dict[v] = new_dict[v];
-                    }
-                }
-            }
-            return r;
-        },
-        foreach: function(context, enu, as, old_dict, callback) {
-            if (enu != null) {
-                var size, new_dict = this.extend({}, old_dict);
-                new_dict[as + "_all"] = enu;
-                var as_value = as + "_value",
-                    as_index = as + "_index",
-                    as_first = as + "_first",
-                    as_last = as + "_last",
-                    as_parity = as + "_parity";
-                if (size = enu.length) {
-                    new_dict[as + "_size"] = size;
-                    for (var j = 0, jlen = enu.length; j < jlen; j++) {
-                        var cur = enu[j];
-                        new_dict[as_value] = cur;
-                        new_dict[as_index] = j;
-                        new_dict[as_first] = j === 0;
-                        new_dict[as_last] = j + 1 === size;
-                        new_dict[as_parity] = (j % 2 == 1 ? 'odd' : 'even');
-                        if (cur.constructor === Object) {
-                            this.extend(new_dict, cur);
-                        }
-                        new_dict[as] = cur;
-                        callback(context, new_dict);
-                    }
-                } else if (enu.constructor == Number) {
-                    var _enu = [];
-                    for (var i = 0; i < enu; i++) {
-                        _enu.push(i);
-                    }
-                    this.foreach(context, _enu, as, old_dict, callback);
-                } else {
-                    var index = 0;
-                    for (var k in enu) {
-                        if (enu.hasOwnProperty(k)) {
-                            var v = enu[k];
-                            new_dict[as_value] = v;
-                            new_dict[as_index] = index;
-                            new_dict[as_first] = index === 0;
-                            new_dict[as_parity] = (j % 2 == 1 ? 'odd' : 'even');
-                            new_dict[as] = k;
-                            callback(context, new_dict);
-                            index += 1;
-                        }
-                      }
-                }
-            } else {
-                this.exception("No enumerator given to foreach", context);
-            }
-        }
-    }
-};
-
-QWeb2.Engine = (function() {
-    function Engine() {
-        // TODO: handle prefix at template level : t-prefix="x", don't forget to lowercase it
-        this.prefix = 't';
-        this.debug = false;
-        this.templates_resources = []; // TODO: implement this.reload()
-        this.templates = {};
-        this.compiled_templates = {};
-        this.extend_templates = {};
-        this.default_dict = {};
-        this.tools = QWeb2.tools;
-        this.jQuery = window.jQuery;
-        this.reserved_words = QWeb2.RESERVED_WORDS.slice(0);
-        this.actions_precedence = QWeb2.ACTIONS_PRECEDENCE.slice(0);
-        this.word_replacement = QWeb2.tools.extend({}, QWeb2.WORD_REPLACEMENT);
-        this.preprocess_node = null;
-        for (var i = 0; i < arguments.length; i++) {
-            this.add_template(arguments[i]);
-        }
-    }
-
-    QWeb2.tools.extend(Engine.prototype, {
-        add_template : function(template) {
-            this.templates_resources.push(template);
-            if (template.constructor === String) {
-                template = this.load_xml(template);
-            }
-            var ec = (template.documentElement && template.documentElement.childNodes) || template.childNodes || [];
-            for (var i = 0; i < ec.length; i++) {
-                var node = ec[i];
-                if (node.nodeType === 1) {
-                    if (node.nodeName == 'parsererror') {
-                        return this.tools.exception(node.innerText);
-                    }
-                    var name = node.getAttribute(this.prefix + '-name');
-                    var extend = node.getAttribute(this.prefix + '-extend');
-                    if (name && extend) {
-                        // Clone template and extend it
-                        if (!this.templates[extend]) {
-                            return this.tools.exception("Can't clone undefined template " + extend);
-                        }
-                        this.templates[name] = this.templates[extend].cloneNode(true);
-                        extend = name;
-                        name = undefined;
-                    }
-                    if (name) {
-                        this.templates[name] = node;
-                        this.compiled_templates[name] = null;
-                    } else if (extend) {
-                        delete(this.compiled_templates[extend]);
-                        if (this.extend_templates[extend]) {
-                            this.extend_templates[extend].push(node);
-                        } else {
-                            this.extend_templates[extend] = [node];
-                        }
-                    }
-                }
-            }
-            return true;
-        },
-        load_xml : function(s) {
-            s = this.tools.trim(s);
-            if (s.charAt(0) === '<') {
-                return this.load_xml_string(s);
-            } else {
-                var req = this.get_xhr();
-                if (req) {
-                    // TODO: third parameter is async : https://developer.mozilla.org/en/XMLHttpRequest#open()
-                    // do an on_ready in QWeb2{} that could be passed to add_template
-                    if (this.debug) {
-                        s += '?debug=' + (new Date()).getTime(); // TODO fme: do it properly in case there's already url parameters
-                    }
-                    req.open('GET', s, false);
-                    req.send(null);
-                    var xDoc = req.responseXML;
-                    if (xDoc) {
-                        if (!xDoc.documentElement) {
-                            throw new Error("QWeb2: This xml document has no root document : " + xDoc.responseText);
-                        }
-                        if (xDoc.documentElement.nodeName == "parsererror") {
-                            return this.tools.exception(xDoc.documentElement.childNodes[0].nodeValue);
-                        }
-                        return xDoc;
-                    } else {
-                        return this.load_xml_string(req.responseText);
-                    }
-                }
-            }
-        },
-        load_xml_string : function(s) {
-            if (window.DOMParser) {
-                var dp = new DOMParser();
-                var r = dp.parseFromString(s, "text/xml");
-                if (r.body && r.body.firstChild && r.body.firstChild.nodeName == 'parsererror') {
-                    return this.tools.exception(r.body.innerText);
-                }
-                return r;
-            }
-            var xDoc;
-            try {
-                // new ActiveXObject("Msxml2.DOMDocument.4.0");
-                xDoc = new ActiveXObject("MSXML2.DOMDocument");
-            } catch (e) {
-                return this.tools.exception(
-                    "Could not find a DOM Parser: " + e.message);
-            }
-            xDoc.async = false;
-            xDoc.preserveWhiteSpace = true;
-            xDoc.loadXML(s);
-            return xDoc;
-        },
-        has_template : function(template) {
-            return !!this.templates[template];
-        },
-        get_xhr : function() {
-            if (window.XMLHttpRequest) {
-                return new window.XMLHttpRequest();
-            }
-            try {
-                return new ActiveXObject('MSXML2.XMLHTTP.3.0');
-            } catch (e) {
-                return null;
-            }
-        },
-        compile : function(node) {
-            var e = new QWeb2.Element(this, node);
-            var template = node.getAttribute(this.prefix + '-name');
-            return  "   /* 'this' refers to Qweb2.Engine instance */\n" +
-                    "   var context = { engine : this, template : " + (this.tools.js_escape(template)) + " };\n" +
-                    "   dict = dict || {};\n" +
-                    "   dict['__template__'] = '" + template + "';\n" +
-                    "   var r = [];\n" +
-                    "   /* START TEMPLATE */" +
-                    (this.debug ? "" : " try {\n") +
-                    (e.compile()) + "\n" +
-                    "   /* END OF TEMPLATE */" +
-                    (this.debug ? "" : " } catch(error) {\n" +
-                    "       if (console && console.exception) console.exception(error);\n" +
-                    "       context.engine.tools.exception('Runtime Error: ' + error, context);\n") +
-                    (this.debug ? "" : "   }\n") +
-                    "   return r.join('');";
-        },
-        render : function(template, dict) {
-            dict = dict || {};
-            QWeb2.tools.extend(dict, this.default_dict);
-            /*if (this.debug && window['console'] !== undefined) {
-                console.time("QWeb render template " + template);
-            }*/
-            var r = this._render(template, dict);
-            /*if (this.debug && window['console'] !== undefined) {
-                console.timeEnd("QWeb render template " + template);
-            }*/
-            return r;
-        },
-        _render : function(template, dict) {
-            if (this.compiled_templates[template]) {
-                return this.compiled_templates[template].apply(this, [dict || {}]);
-            } else if (this.templates[template]) {
-                var ext;
-                if (ext = this.extend_templates[template]) {
-                    var extend_node;
-                    while (extend_node = ext.shift()) {
-                        this.extend(template, extend_node);
-                    }
-                }
-                var code = this.compile(this.templates[template]), tcompiled;
-                try {
-                    tcompiled = new Function(['dict'], code);
-                } catch (error) {
-                    if (this.debug && window.console) {
-                        console.log(code);
-                    }
-                    this.tools.exception("Error evaluating template: " + error, { template: name });
-                }
-                if (!tcompiled) {
-                    this.tools.exception("Error evaluating template: (IE?)" + error, { template: name });
-                }
-                this.compiled_templates[template] = tcompiled;
-                return this.render(template, dict);
-            } else {
-                return this.tools.exception("Template '" + template + "' not found");
-            }
-        },
-        extend : function(template, extend_node) {
-            if (!this.jQuery) {
-                return this.tools.exception("Can't extend template " + template + " without jQuery");
-            }
-            var template_dest = this.templates[template];
-            for (var i = 0, ilen = extend_node.childNodes.length; i < ilen; i++) {
-                var child = extend_node.childNodes[i];
-                if (child.nodeType === 1) {
-                    var jquery = child.getAttribute(this.prefix + '-jquery'),
-                        operation = child.getAttribute(this.prefix + '-operation'),
-                        target,
-                        error_msg = "Error while extending template '" + template;
-                    if (jquery) {
-                        target = this.jQuery(jquery, template_dest);
-                    } else {
-                        this.tools.exception(error_msg + "No expression given");
-                    }
-                    error_msg += "' (expression='" + jquery + "') : ";
-                    if (operation) {
-                        var allowed_operations = "append,prepend,before,after,replace,inner".split(',');
-                        if (this.tools.arrayIndexOf(allowed_operations, operation) == -1) {
-                            this.tools.exception(error_msg + "Invalid operation : '" + operation + "'");
-                        }
-                        operation = {'replace' : 'replaceWith', 'inner' : 'html'}[operation] || operation;
-                        target[operation](child.cloneNode(true).childNodes);
-                    } else {
-                        try {
-                            var f = new Function(['$', 'document'], this.tools.xml_node_to_string(child, true));
-                        } catch(error) {
-                            return this.tools.exception("Parse " + error_msg + error);
-                        }
-                        try {
-                            f.apply(target, [this.jQuery, template_dest.ownerDocument]);
-                        } catch(error) {
-                            return this.tools.exception("Runtime " + error_msg + error);
-                        }
-                    }
-                }
-            }
-        }
-    });
-    return Engine;
-})();
-
-QWeb2.Element = (function() {
-    function Element(engine, node) {
-        this.engine = engine;
-        this.node = node;
-        this.tag = node.tagName;
-        this.actions = {};
-        this.actions_done = [];
-        this.attributes = {};
-        this.children = [];
-        this._top = [];
-        this._bottom = [];
-        this._indent = 1;
-        this.process_children = true;
-        var childs = this.node.childNodes;
-        if (childs) {
-            for (var i = 0, ilen = childs.length; i < ilen; i++) {
-                this.children.push(new QWeb2.Element(this.engine, childs[i]));
-            }
-        }
-        var attrs = this.node.attributes;
-        if (attrs) {
-            for (var j = 0, jlen = attrs.length; j < jlen; j++) {
-                var attr = attrs[j];
-                var name = attr.name;
-                var m = name.match(new RegExp("^" + this.engine.prefix + "-(.+)"));
-                if (m) {
-                    name = m[1];
-                    if (name === 'name') {
-                        continue;
-                    }
-                    this.actions[name] = attr.value;
-                } else {
-                    this.attributes[name] = attr.value;
-                }
-            }
-        }
-        if (this.engine.preprocess_node) {
-            this.engine.preprocess_node.call(this);
-        }
-    }
-
-    QWeb2.tools.extend(Element.prototype, {
-        compile : function() {
-            var r = [],
-                instring = false,
-                lines = this._compile().split('\n');
-            for (var i = 0, ilen = lines.length; i < ilen; i++) {
-                var m, line = lines[i];
-                if (m = line.match(/^(\s*)\/\/@string=(.*)/)) {
-                    if (instring) {
-                        if (this.engine.debug) {
-                            // Split string lines in indented r.push arguments
-                            r.push((m[2].indexOf("\\n") != -1 ? "',\n\t" + m[1] + "'" : '') + m[2]);
-                        } else {
-                            r.push(m[2]);
-                        }
-                    } else {
-                        r.push(m[1] + "r.push('" + m[2]);
-                        instring = true;
-                    }
-                } else {
-                    if (instring) {
-                        r.push("');\n");
-                    }
-                    instring = false;
-                    r.push(line + '\n');
-                }
-            }
-            return r.join('');
-        },
-        _compile : function() {
-            switch (this.node.nodeType) {
-                case 3:
-                case 4:
-                    this.top_string(this.node.data);
-                break;
-                case 1:
-                    this.compile_element();
-            }
-            var r = this._top.join('');
-            if (this.process_children) {
-                for (var i = 0, ilen = this.children.length; i < ilen; i++) {
-                    var child = this.children[i];
-                    child._indent = this._indent;
-                    r += child._compile();
-                }
-            }
-            r += this._bottom.join('');
-            return r;
-        },
-        format_expression : function(e) {
-            /* Naive format expression builder. Replace reserved words and variables to dict[variable]
-             * Does not handle spaces before dot yet, and causes problems for anonymous functions. Use t-js="" for that */
-            if (QWeb2.expressions_cache[e]) {
-              return QWeb2.expressions_cache[e];
-            }
-            var chars = e.split(''),
-                instring = '',
-                invar = '',
-                invar_pos = 0,
-                r = '';
-            chars.push(' ');
-            for (var i = 0, ilen = chars.length; i < ilen; i++) {
-                var c = chars[i];
-                if (instring.length) {
-                    if (c === instring && chars[i - 1] !== "\\") {
-                        instring = '';
-                    }
-                } else if (c === '"' || c === "'") {
-                    instring = c;
-                } else if (c.match(/[a-zA-Z_\$]/) && !invar.length) {
-                    invar = c;
-                    invar_pos = i;
-                    continue;
-                } else if (c.match(/\W/) && invar.length) {
-                    // TODO: Should check for possible spaces before dot
-                    if (chars[invar_pos - 1] !== '.' && QWeb2.tools.arrayIndexOf(this.engine.reserved_words, invar) < 0) {
-                        invar = this.engine.word_replacement[invar] || ("dict['" + invar + "']");
-                    }
-                    r += invar;
-                    invar = '';
-                } else if (invar.length) {
-                    invar += c;
-                    continue;
-                }
-                r += c;
-            }
-            r = r.slice(0, -1);
-            QWeb2.expressions_cache[e] = r;
-            return r;
-        },
-        string_interpolation : function(s) {
-            if (!s) {
-              return "''";
-            }
-            var regex = /^{(.*)}(.*)/,
-                src = s.split(/#/),
-                r = [];
-            for (var i = 0, ilen = src.length; i < ilen; i++) {
-                var val = src[i],
-                    m = val.match(regex);
-                if (m) {
-                    r.push("(" + this.format_expression(m[1]) + ")");
-                    if (m[2]) {
-                        r.push(this.engine.tools.js_escape(m[2]));
-                    }
-                } else if (!(i === 0 && val === '')) {
-                    r.push(this.engine.tools.js_escape((i === 0 ? '' : '#') + val));
-                }
-            }
-            return r.join(' + ');
-        },
-        indent : function() {
-            return this._indent++;
-        },
-        dedent : function() {
-            if (this._indent !== 0) {
-                return this._indent--;
-            }
-        },
-        get_indent : function() {
-            return new Array(this._indent + 1).join("\t");
-        },
-        top : function(s) {
-            return this._top.push(this.get_indent() + s + '\n');
-        },
-        top_string : function(s) {
-            return this._top.push(this.get_indent() + "//@string=" + this.engine.tools.js_escape(s, true) + '\n');
-        },
-        bottom : function(s) {
-            return this._bottom.unshift(this.get_indent() + s + '\n');
-        },
-        bottom_string : function(s) {
-            return this._bottom.unshift(this.get_indent() + "//@string=" + this.engine.tools.js_escape(s, true) + '\n');
-        },
-        compile_element : function() {
-            for (var i = 0, ilen = this.engine.actions_precedence.length; i < ilen; i++) {
-                var a = this.engine.actions_precedence[i];
-                if (a in this.actions) {
-                    var value = this.actions[a];
-                    var key = 'compile_action_' + a;
-                    if (this[key]) {
-                        this[key](value);
-                    } else if (this.engine[key]) {
-                        this.engine[key].call(this, value);
-                    } else {
-                        this.engine.tools.exception("No handler method for action '" + a + "'");
-                    }
-                }
-            }
-            if (this.tag.toLowerCase() !== this.engine.prefix) {
-                var tag = "<" + this.tag;
-                for (var a in this.attributes) {
-                    tag += this.engine.tools.gen_attribute([a, this.attributes[a]]);
-                }
-                this.top_string(tag);
-                if (this.actions.att) {
-                    this.top("r.push(context.engine.tools.gen_attribute(" + (this.format_expression(this.actions.att)) + "));");
-                }
-                for (var a in this.actions) {
-                    var v = this.actions[a];
-                    var m = a.match(/att-(.+)/);
-                    if (m) {
-                        this.top("r.push(context.engine.tools.gen_attribute(['" + m[1] + "', (" + (this.format_expression(v)) + ")]));");
-                    }
-                    var m = a.match(/attf-(.+)/);
-                    if (m) {
-                        this.top("r.push(context.engine.tools.gen_attribute(['" + m[1] + "', (" + (this.string_interpolation(v)) + ")]));");
-                    }
-                }
-                if (this.children.length || this.actions.opentag === 'true') {
-                    this.top_string(">");
-                    this.bottom_string("</" + this.tag + ">");
-                } else {
-                    this.top_string("/>");
-                }
-            }
-        },
-        compile_action_if : function(value) {
-            this.top("if (" + (this.format_expression(value)) + ") {");
-            this.bottom("}");
-            this.indent();
-        },
-        compile_action_foreach : function(value) {
-            var as = this.actions['as'] || value.replace(/[^a-zA-Z0-9]/g, '_');
-            //TODO: exception if t-as not valid
-            this.top("context.engine.tools.foreach(context, " + (this.format_expression(value)) + ", " + (this.engine.tools.js_escape(as)) + ", dict, function(context, dict) {");
-            this.bottom("});");
-            this.indent();
-        },
-        compile_action_call : function(value) {
-            var _import = this.actions['import'] || '';
-            if (this.children.length === 0) {
-                return this.top("r.push(context.engine.tools.call(context, " + (this.engine.tools.js_escape(value)) + ", dict, " + (this.engine.tools.js_escape(_import)) + "));");
-            } else {
-                this.top("r.push(context.engine.tools.call(context, " + (this.engine.tools.js_escape(value)) + ", dict, " + (this.engine.tools.js_escape(_import)) + ", function(context, dict) {");
-                this.bottom("}));");
-                this.indent();
-                this.top("var r = [];");
-                return this.bottom("return r.join('');");
-            }
-        },
-        compile_action_set : function(value) {
-            var variable = this.format_expression(value);
-            if (this.actions['value']) {
-                if (this.children.length) {
-                    this.engine.tools.warning("@set with @value plus node chidren found. Children are ignored.");
-                }
-                this.top(variable + " = (" + (this.format_expression(this.actions['value'])) + ");");
-                this.process_children = false;
-            } else {
-                if (this.children.length === 0) {
-                    this.top(variable + " = '';");
-                } else if (this.children.length === 1 && this.children[0].node.nodeType === 3) {
-                    this.top(variable + " = " + (this.engine.tools.js_escape(this.children[0].node.data)) + ";");
-                    this.process_children = false;
-                } else {
-                    this.top(variable + " = (function(dict) {");
-                    this.bottom("})(dict);");
-                    this.indent();
-                    this.top("var r = [];");
-                    this.bottom("return r.join('');");
-                }
-            }
-        },
-        compile_action_esc : function(value) {
-            this.top("r.push(context.engine.tools.html_escape(" + (this.format_expression(value)) + "));");
-        },
-        compile_action_escf : function(value) {
-            this.top("r.push(context.engine.tools.html_escape(" + (this.string_interpolation(value)) + "));");
-        },
-        compile_action_raw : function(value) {
-            this.top("r.push(" + (this.format_expression(value)) + ");");
-        },
-        compile_action_rawf : function(value) {
-            this.top("r.push(" + (this.string_interpolation(value)) + ");");
-        },
-        compile_action_js : function(value) {
-            this.top("(function(" + value + ") {");
-            this.bottom("})(dict);");
-            this.indent();
-            var lines = this.engine.tools.xml_node_to_string(this.node, true).split(/\r?\n/);
-            for (var i = 0, ilen = lines.length; i < ilen; i++) {
-                this.top(lines[i]);
-            }
-            this.process_children = false;
-        },
-        compile_action_debug : function(value) {
-            this.top("debugger;");
-        },
-        compile_action_log : function(value) {
-            this.top("console.log(" + this.format_expression(value) + ");");
-        }
-    });
-    return Element;
-})();
-
-window.QWeb2 = QWeb2;
-
-})();
diff --git a/addons/im_livechat/static/ext/static/lib/requirejs/require.js b/addons/im_livechat/static/ext/static/lib/requirejs/require.js
deleted file mode 100644
index 52c2b076b7b..00000000000
--- a/addons/im_livechat/static/ext/static/lib/requirejs/require.js
+++ /dev/null
@@ -1,2053 +0,0 @@
-/** vim: et:ts=4:sw=4:sts=4
- * @license RequireJS 2.1.8 Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved.
- * Available via the MIT or new BSD license.
- * see: http://github.com/jrburke/requirejs for details
- */
-//Not using strict: uneven strict support in browsers, #392, and causes
-//problems with requirejs.exec()/transpiler plugins that may not be strict.
-/*jslint regexp: true, nomen: true, sloppy: true */
-/*global window, navigator, document, importScripts, setTimeout, opera */
-
-var requirejs, require, define;
-(function (global) {
-    var req, s, head, baseElement, dataMain, src,
-        interactiveScript, currentlyAddingScript, mainScript, subPath,
-        version = '2.1.8',
-        commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,
-        cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
-        jsSuffixRegExp = /\.js$/,
-        currDirRegExp = /^\.\//,
-        op = Object.prototype,
-        ostring = op.toString,
-        hasOwn = op.hasOwnProperty,
-        ap = Array.prototype,
-        apsp = ap.splice,
-        isBrowser = !!(typeof window !== 'undefined' && navigator && window.document),
-        isWebWorker = !isBrowser && typeof importScripts !== 'undefined',
-        //PS3 indicates loaded and complete, but need to wait for complete
-        //specifically. Sequence is 'loading', 'loaded', execution,
-        // then 'complete'. The UA check is unfortunate, but not sure how
-        //to feature test w/o causing perf issues.
-        readyRegExp = isBrowser && navigator.platform === 'PLAYSTATION 3' ?
-                      /^complete$/ : /^(complete|loaded)$/,
-        defContextName = '_',
-        //Oh the tragedy, detecting opera. See the usage of isOpera for reason.
-        isOpera = typeof opera !== 'undefined' && opera.toString() === '[object Opera]',
-        contexts = {},
-        cfg = {},
-        globalDefQueue = [],
-        useInteractive = false;
-
-    function isFunction(it) {
-        return ostring.call(it) === '[object Function]';
-    }
-
-    function isArray(it) {
-        return ostring.call(it) === '[object Array]';
-    }
-
-    /**
-     * Helper function for iterating over an array. If the func returns
-     * a true value, it will break out of the loop.
-     */
-    function each(ary, func) {
-        if (ary) {
-            var i;
-            for (i = 0; i < ary.length; i += 1) {
-                if (ary[i] && func(ary[i], i, ary)) {
-                    break;
-                }
-            }
-        }
-    }
-
-    /**
-     * Helper function for iterating over an array backwards. If the func
-     * returns a true value, it will break out of the loop.
-     */
-    function eachReverse(ary, func) {
-        if (ary) {
-            var i;
-            for (i = ary.length - 1; i > -1; i -= 1) {
-                if (ary[i] && func(ary[i], i, ary)) {
-                    break;
-                }
-            }
-        }
-    }
-
-    function hasProp(obj, prop) {
-        return hasOwn.call(obj, prop);
-    }
-
-    function getOwn(obj, prop) {
-        return hasProp(obj, prop) && obj[prop];
-    }
-
-    /**
-     * Cycles over properties in an object and calls a function for each
-     * property value. If the function returns a truthy value, then the
-     * iteration is stopped.
-     */
-    function eachProp(obj, func) {
-        var prop;
-        for (prop in obj) {
-            if (hasProp(obj, prop)) {
-                if (func(obj[prop], prop)) {
-                    break;
-                }
-            }
-        }
-    }
-
-    /**
-     * Simple function to mix in properties from source into target,
-     * but only if target does not already have a property of the same name.
-     */
-    function mixin(target, source, force, deepStringMixin) {
-        if (source) {
-            eachProp(source, function (value, prop) {
-                if (force || !hasProp(target, prop)) {
-                    if (deepStringMixin && typeof value !== 'string') {
-                        if (!target[prop]) {
-                            target[prop] = {};
-                        }
-                        mixin(target[prop], value, force, deepStringMixin);
-                    } else {
-                        target[prop] = value;
-                    }
-                }
-            });
-        }
-        return target;
-    }
-
-    //Similar to Function.prototype.bind, but the 'this' object is specified
-    //first, since it is easier to read/figure out what 'this' will be.
-    function bind(obj, fn) {
-        return function () {
-            return fn.apply(obj, arguments);
-        };
-    }
-
-    function scripts() {
-        return document.getElementsByTagName('script');
-    }
-
-    function defaultOnError(err) {
-        throw err;
-    }
-
-    //Allow getting a global that expressed in
-    //dot notation, like 'a.b.c'.
-    function getGlobal(value) {
-        if (!value) {
-            return value;
-        }
-        var g = global;
-        each(value.split('.'), function (part) {
-            g = g[part];
-        });
-        return g;
-    }
-
-    /**
-     * Constructs an error with a pointer to an URL with more information.
-     * @param {String} id the error ID that maps to an ID on a web page.
-     * @param {String} message human readable error.
-     * @param {Error} [err] the original error, if there is one.
-     *
-     * @returns {Error}
-     */
-    function makeError(id, msg, err, requireModules) {
-        var e = new Error(msg + '\nhttp://requirejs.org/docs/errors.html#' + id);
-        e.requireType = id;
-        e.requireModules = requireModules;
-        if (err) {
-            e.originalError = err;
-        }
-        return e;
-    }
-
-    if (typeof define !== 'undefined') {
-        //If a define is already in play via another AMD loader,
-        //do not overwrite.
-        return;
-    }
-
-    if (typeof requirejs !== 'undefined') {
-        if (isFunction(requirejs)) {
-            //Do not overwrite and existing requirejs instance.
-            return;
-        }
-        cfg = requirejs;
-        requirejs = undefined;
-    }
-
-    //Allow for a require config object
-    if (typeof require !== 'undefined' && !isFunction(require)) {
-        //assume it is a config object.
-        cfg = require;
-        require = undefined;
-    }
-
-    function newContext(contextName) {
-        var inCheckLoaded, Module, context, handlers,
-            checkLoadedTimeoutId,
-            config = {
-                //Defaults. Do not set a default for map
-                //config to speed up normalize(), which
-                //will run faster if there is no default.
-                waitSeconds: 7,
-                baseUrl: './',
-                paths: {},
-                pkgs: {},
-                shim: {},
-                config: {}
-            },
-            registry = {},
-            //registry of just enabled modules, to speed
-            //cycle breaking code when lots of modules
-            //are registered, but not activated.
-            enabledRegistry = {},
-            undefEvents = {},
-            defQueue = [],
-            defined = {},
-            urlFetched = {},
-            requireCounter = 1,
-            unnormalizedCounter = 1;
-
-        /**
-         * Trims the . and .. from an array of path segments.
-         * It will keep a leading path segment if a .. will become
-         * the first path segment, to help with module name lookups,
-         * which act like paths, but can be remapped. But the end result,
-         * all paths that use this function should look normalized.
-         * NOTE: this method MODIFIES the input array.
-         * @param {Array} ary the array of path segments.
-         */
-        function trimDots(ary) {
-            var i, part;
-            for (i = 0; ary[i]; i += 1) {
-                part = ary[i];
-                if (part === '.') {
-                    ary.splice(i, 1);
-                    i -= 1;
-                } else if (part === '..') {
-                    if (i === 1 && (ary[2] === '..' || ary[0] === '..')) {
-                        //End of the line. Keep at least one non-dot
-                        //path segment at the front so it can be mapped
-                        //correctly to disk. Otherwise, there is likely
-                        //no path mapping for a path starting with '..'.
-                        //This can still fail, but catches the most reasonable
-                        //uses of ..
-                        break;
-                    } else if (i > 0) {
-                        ary.splice(i - 1, 2);
-                        i -= 2;
-                    }
-                }
-            }
-        }
-
-        /**
-         * Given a relative module name, like ./something, normalize it to
-         * a real name that can be mapped to a path.
-         * @param {String} name the relative name
-         * @param {String} baseName a real name that the name arg is relative
-         * to.
-         * @param {Boolean} applyMap apply the map config to the value. Should
-         * only be done if this normalization is for a dependency ID.
-         * @returns {String} normalized name
-         */
-        function normalize(name, baseName, applyMap) {
-            var pkgName, pkgConfig, mapValue, nameParts, i, j, nameSegment,
-                foundMap, foundI, foundStarMap, starI,
-                baseParts = baseName && baseName.split('/'),
-                normalizedBaseParts = baseParts,
-                map = config.map,
-                starMap = map && map['*'];
-
-            //Adjust any relative paths.
-            if (name && name.charAt(0) === '.') {
-                //If have a base name, try to normalize against it,
-                //otherwise, assume it is a top-level require that will
-                //be relative to baseUrl in the end.
-                if (baseName) {
-                    if (getOwn(config.pkgs, baseName)) {
-                        //If the baseName is a package name, then just treat it as one
-                        //name to concat the name with.
-                        normalizedBaseParts = baseParts = [baseName];
-                    } else {
-                        //Convert baseName to array, and lop off the last part,
-                        //so that . matches that 'directory' and not name of the baseName's
-                        //module. For instance, baseName of 'one/two/three', maps to
-                        //'one/two/three.js', but we want the directory, 'one/two' for
-                        //this normalization.
-                        normalizedBaseParts = baseParts.slice(0, baseParts.length - 1);
-                    }
-
-                    name = normalizedBaseParts.concat(name.split('/'));
-                    trimDots(name);
-
-                    //Some use of packages may use a . path to reference the
-                    //'main' module name, so normalize for that.
-                    pkgConfig = getOwn(config.pkgs, (pkgName = name[0]));
-                    name = name.join('/');
-                    if (pkgConfig && name === pkgName + '/' + pkgConfig.main) {
-                        name = pkgName;
-                    }
-                } else if (name.indexOf('./') === 0) {
-                    // No baseName, so this is ID is resolved relative
-                    // to baseUrl, pull off the leading dot.
-                    name = name.substring(2);
-                }
-            }
-
-            //Apply map config if available.
-            if (applyMap && map && (baseParts || starMap)) {
-                nameParts = name.split('/');
-
-                for (i = nameParts.length; i > 0; i -= 1) {
-                    nameSegment = nameParts.slice(0, i).join('/');
-
-                    if (baseParts) {
-                        //Find the longest baseName segment match in the config.
-                        //So, do joins on the biggest to smallest lengths of baseParts.
-                        for (j = baseParts.length; j > 0; j -= 1) {
-                            mapValue = getOwn(map, baseParts.slice(0, j).join('/'));
-
-                            //baseName segment has config, find if it has one for
-                            //this name.
-                            if (mapValue) {
-                                mapValue = getOwn(mapValue, nameSegment);
-                                if (mapValue) {
-                                    //Match, update name to the new value.
-                                    foundMap = mapValue;
-                                    foundI = i;
-                                    break;
-                                }
-                            }
-                        }
-                    }
-
-                    if (foundMap) {
-                        break;
-                    }
-
-                    //Check for a star map match, but just hold on to it,
-                    //if there is a shorter segment match later in a matching
-                    //config, then favor over this star map.
-                    if (!foundStarMap && starMap && getOwn(starMap, nameSegment)) {
-                        foundStarMap = getOwn(starMap, nameSegment);
-                        starI = i;
-                    }
-                }
-
-                if (!foundMap && foundStarMap) {
-                    foundMap = foundStarMap;
-                    foundI = starI;
-                }
-
-                if (foundMap) {
-                    nameParts.splice(0, foundI, foundMap);
-                    name = nameParts.join('/');
-                }
-            }
-
-            return name;
-        }
-
-        function removeScript(name) {
-            if (isBrowser) {
-                each(scripts(), function (scriptNode) {
-                    if (scriptNode.getAttribute('data-requiremodule') === name &&
-                            scriptNode.getAttribute('data-requirecontext') === context.contextName) {
-                        scriptNode.parentNode.removeChild(scriptNode);
-                        return true;
-                    }
-                });
-            }
-        }
-
-        function hasPathFallback(id) {
-            var pathConfig = getOwn(config.paths, id);
-            if (pathConfig && isArray(pathConfig) && pathConfig.length > 1) {
-                removeScript(id);
-                //Pop off the first array value, since it failed, and
-                //retry
-                pathConfig.shift();
-                context.require.undef(id);
-                context.require([id]);
-                return true;
-            }
-        }
-
-        //Turns a plugin!resource to [plugin, resource]
-        //with the plugin being undefined if the name
-        //did not have a plugin prefix.
-        function splitPrefix(name) {
-            var prefix,
-                index = name ? name.indexOf('!') : -1;
-            if (index > -1) {
-                prefix = name.substring(0, index);
-                name = name.substring(index + 1, name.length);
-            }
-            return [prefix, name];
-        }
-
-        /**
-         * Creates a module mapping that includes plugin prefix, module
-         * name, and path. If parentModuleMap is provided it will
-         * also normalize the name via require.normalize()
-         *
-         * @param {String} name the module name
-         * @param {String} [parentModuleMap] parent module map
-         * for the module name, used to resolve relative names.
-         * @param {Boolean} isNormalized: is the ID already normalized.
-         * This is true if this call is done for a define() module ID.
-         * @param {Boolean} applyMap: apply the map config to the ID.
-         * Should only be true if this map is for a dependency.
-         *
-         * @returns {Object}
-         */
-        function makeModuleMap(name, parentModuleMap, isNormalized, applyMap) {
-            var url, pluginModule, suffix, nameParts,
-                prefix = null,
-                parentName = parentModuleMap ? parentModuleMap.name : null,
-                originalName = name,
-                isDefine = true,
-                normalizedName = '';
-
-            //If no name, then it means it is a require call, generate an
-            //internal name.
-            if (!name) {
-                isDefine = false;
-                name = '_@r' + (requireCounter += 1);
-            }
-
-            nameParts = splitPrefix(name);
-            prefix = nameParts[0];
-            name = nameParts[1];
-
-            if (prefix) {
-                prefix = normalize(prefix, parentName, applyMap);
-                pluginModule = getOwn(defined, prefix);
-            }
-
-            //Account for relative paths if there is a base name.
-            if (name) {
-                if (prefix) {
-                    if (pluginModule && pluginModule.normalize) {
-                        //Plugin is loaded, use its normalize method.
-                        normalizedName = pluginModule.normalize(name, function (name) {
-                            return normalize(name, parentName, applyMap);
-                        });
-                    } else {
-                        normalizedName = normalize(name, parentName, applyMap);
-                    }
-                } else {
-                    //A regular module.
-                    normalizedName = normalize(name, parentName, applyMap);
-
-                    //Normalized name may be a plugin ID due to map config
-                    //application in normalize. The map config values must
-                    //already be normalized, so do not need to redo that part.
-                    nameParts = splitPrefix(normalizedName);
-                    prefix = nameParts[0];
-                    normalizedName = nameParts[1];
-                    isNormalized = true;
-
-                    url = context.nameToUrl(normalizedName);
-                }
-            }
-
-            //If the id is a plugin id that cannot be determined if it needs
-            //normalization, stamp it with a unique ID so two matching relative
-            //ids that may conflict can be separate.
-            suffix = prefix && !pluginModule && !isNormalized ?
-                     '_unnormalized' + (unnormalizedCounter += 1) :
-                     '';
-
-            return {
-                prefix: prefix,
-                name: normalizedName,
-                parentMap: parentModuleMap,
-                unnormalized: !!suffix,
-                url: url,
-                originalName: originalName,
-                isDefine: isDefine,
-                id: (prefix ?
-                        prefix + '!' + normalizedName :
-                        normalizedName) + suffix
-            };
-        }
-
-        function getModule(depMap) {
-            var id = depMap.id,
-                mod = getOwn(registry, id);
-
-            if (!mod) {
-                mod = registry[id] = new context.Module(depMap);
-            }
-
-            return mod;
-        }
-
-        function on(depMap, name, fn) {
-            var id = depMap.id,
-                mod = getOwn(registry, id);
-
-            if (hasProp(defined, id) &&
-                    (!mod || mod.defineEmitComplete)) {
-                if (name === 'defined') {
-                    fn(defined[id]);
-                }
-            } else {
-                mod = getModule(depMap);
-                if (mod.error && name === 'error') {
-                    fn(mod.error);
-                } else {
-                    mod.on(name, fn);
-                }
-            }
-        }
-
-        function onError(err, errback) {
-            var ids = err.requireModules,
-                notified = false;
-
-            if (errback) {
-                errback(err);
-            } else {
-                each(ids, function (id) {
-                    var mod = getOwn(registry, id);
-                    if (mod) {
-                        //Set error on module, so it skips timeout checks.
-                        mod.error = err;
-                        if (mod.events.error) {
-                            notified = true;
-                            mod.emit('error', err);
-                        }
-                    }
-                });
-
-                if (!notified) {
-                    req.onError(err);
-                }
-            }
-        }
-
-        /**
-         * Internal method to transfer globalQueue items to this context's
-         * defQueue.
-         */
-        function takeGlobalQueue() {
-            //Push all the globalDefQueue items into the context's defQueue
-            if (globalDefQueue.length) {
-                //Array splice in the values since the context code has a
-                //local var ref to defQueue, so cannot just reassign the one
-                //on context.
-                apsp.apply(defQueue,
-                           [defQueue.length - 1, 0].concat(globalDefQueue));
-                globalDefQueue = [];
-            }
-        }
-
-        handlers = {
-            'require': function (mod) {
-                if (mod.require) {
-                    return mod.require;
-                } else {
-                    return (mod.require = context.makeRequire(mod.map));
-                }
-            },
-            'exports': function (mod) {
-                mod.usingExports = true;
-                if (mod.map.isDefine) {
-                    if (mod.exports) {
-                        return mod.exports;
-                    } else {
-                        return (mod.exports = defined[mod.map.id] = {});
-                    }
-                }
-            },
-            'module': function (mod) {
-                if (mod.module) {
-                    return mod.module;
-                } else {
-                    return (mod.module = {
-                        id: mod.map.id,
-                        uri: mod.map.url,
-                        config: function () {
-                            var c,
-                                pkg = getOwn(config.pkgs, mod.map.id);
-                            // For packages, only support config targeted
-                            // at the main module.
-                            c = pkg ? getOwn(config.config, mod.map.id + '/' + pkg.main) :
-                                      getOwn(config.config, mod.map.id);
-                            return  c || {};
-                        },
-                        exports: defined[mod.map.id]
-                    });
-                }
-            }
-        };
-
-        function cleanRegistry(id) {
-            //Clean up machinery used for waiting modules.
-            delete registry[id];
-            delete enabledRegistry[id];
-        }
-
-        function breakCycle(mod, traced, processed) {
-            var id = mod.map.id;
-
-            if (mod.error) {
-                mod.emit('error', mod.error);
-            } else {
-                traced[id] = true;
-                each(mod.depMaps, function (depMap, i) {
-                    var depId = depMap.id,
-                        dep = getOwn(registry, depId);
-
-                    //Only force things that have not completed
-                    //being defined, so still in the registry,
-                    //and only if it has not been matched up
-                    //in the module already.
-                    if (dep && !mod.depMatched[i] && !processed[depId]) {
-                        if (getOwn(traced, depId)) {
-                            mod.defineDep(i, defined[depId]);
-                            mod.check(); //pass false?
-                        } else {
-                            breakCycle(dep, traced, processed);
-                        }
-                    }
-                });
-                processed[id] = true;
-            }
-        }
-
-        function checkLoaded() {
-            var map, modId, err, usingPathFallback,
-                waitInterval = config.waitSeconds * 1000,
-                //It is possible to disable the wait interval by using waitSeconds of 0.
-                expired = waitInterval && (context.startTime + waitInterval) < new Date().getTime(),
-                noLoads = [],
-                reqCalls = [],
-                stillLoading = false,
-                needCycleCheck = true;
-
-            //Do not bother if this call was a result of a cycle break.
-            if (inCheckLoaded) {
-                return;
-            }
-
-            inCheckLoaded = true;
-
-            //Figure out the state of all the modules.
-            eachProp(enabledRegistry, function (mod) {
-                map = mod.map;
-                modId = map.id;
-
-                //Skip things that are not enabled or in error state.
-                if (!mod.enabled) {
-                    return;
-                }
-
-                if (!map.isDefine) {
-                    reqCalls.push(mod);
-                }
-
-                if (!mod.error) {
-                    //If the module should be executed, and it has not
-                    //been inited and time is up, remember it.
-                    if (!mod.inited && expired) {
-                        if (hasPathFallback(modId)) {
-                            usingPathFallback = true;
-                            stillLoading = true;
-                        } else {
-                            noLoads.push(modId);
-                            removeScript(modId);
-                        }
-                    } else if (!mod.inited && mod.fetched && map.isDefine) {
-                        stillLoading = true;
-                        if (!map.prefix) {
-                            //No reason to keep looking for unfinished
-                            //loading. If the only stillLoading is a
-                            //plugin resource though, keep going,
-                            //because it may be that a plugin resource
-                            //is waiting on a non-plugin cycle.
-                            return (needCycleCheck = false);
-                        }
-                    }
-                }
-            });
-
-            if (expired && noLoads.length) {
-                //If wait time expired, throw error of unloaded modules.
-                err = makeError('timeout', 'Load timeout for modules: ' + noLoads, null, noLoads);
-                err.contextName = context.contextName;
-                return onError(err);
-            }
-
-            //Not expired, check for a cycle.
-            if (needCycleCheck) {
-                each(reqCalls, function (mod) {
-                    breakCycle(mod, {}, {});
-                });
-            }
-
-            //If still waiting on loads, and the waiting load is something
-            //other than a plugin resource, or there are still outstanding
-            //scripts, then just try back later.
-            if ((!expired || usingPathFallback) && stillLoading) {
-                //Something is still waiting to load. Wait for it, but only
-                //if a timeout is not already in effect.
-                if ((isBrowser || isWebWorker) && !checkLoadedTimeoutId) {
-                    checkLoadedTimeoutId = setTimeout(function () {
-                        checkLoadedTimeoutId = 0;
-                        checkLoaded();
-                    }, 50);
-                }
-            }
-
-            inCheckLoaded = false;
-        }
-
-        Module = function (map) {
-            this.events = getOwn(undefEvents, map.id) || {};
-            this.map = map;
-            this.shim = getOwn(config.shim, map.id);
-            this.depExports = [];
-            this.depMaps = [];
-            this.depMatched = [];
-            this.pluginMaps = {};
-            this.depCount = 0;
-
-            /* this.exports this.factory
-               this.depMaps = [],
-               this.enabled, this.fetched
-            */
-        };
-
-        Module.prototype = {
-            init: function (depMaps, factory, errback, options) {
-                options = options || {};
-
-                //Do not do more inits if already done. Can happen if there
-                //are multiple define calls for the same module. That is not
-                //a normal, common case, but it is also not unexpected.
-                if (this.inited) {
-                    return;
-                }
-
-                this.factory = factory;
-
-                if (errback) {
-                    //Register for errors on this module.
-                    this.on('error', errback);
-                } else if (this.events.error) {
-                    //If no errback already, but there are error listeners
-                    //on this module, set up an errback to pass to the deps.
-                    errback = bind(this, function (err) {
-                        this.emit('error', err);
-                    });
-                }
-
-                //Do a copy of the dependency array, so that
-                //source inputs are not modified. For example
-                //"shim" deps are passed in here directly, and
-                //doing a direct modification of the depMaps array
-                //would affect that config.
-                this.depMaps = depMaps && depMaps.slice(0);
-
-                this.errback = errback;
-
-                //Indicate this module has be initialized
-                this.inited = true;
-
-                this.ignore = options.ignore;
-
-                //Could have option to init this module in enabled mode,
-                //or could have been previously marked as enabled. However,
-                //the dependencies are not known until init is called. So
-                //if enabled previously, now trigger dependencies as enabled.
-                if (options.enabled || this.enabled) {
-                    //Enable this module and dependencies.
-                    //Will call this.check()
-                    this.enable();
-                } else {
-                    this.check();
-                }
-            },
-
-            defineDep: function (i, depExports) {
-                //Because of cycles, defined callback for a given
-                //export can be called more than once.
-                if (!this.depMatched[i]) {
-                    this.depMatched[i] = true;
-                    this.depCount -= 1;
-                    this.depExports[i] = depExports;
-                }
-            },
-
-            fetch: function () {
-                if (this.fetched) {
-                    return;
-                }
-                this.fetched = true;
-
-                context.startTime = (new Date()).getTime();
-
-                var map = this.map;
-
-                //If the manager is for a plugin managed resource,
-                //ask the plugin to load it now.
-                if (this.shim) {
-                    context.makeRequire(this.map, {
-                        enableBuildCallback: true
-                    })(this.shim.deps || [], bind(this, function () {
-                        return map.prefix ? this.callPlugin() : this.load();
-                    }));
-                } else {
-                    //Regular dependency.
-                    return map.prefix ? this.callPlugin() : this.load();
-                }
-            },
-
-            load: function () {
-                var url = this.map.url;
-
-                //Regular dependency.
-                if (!urlFetched[url]) {
-                    urlFetched[url] = true;
-                    context.load(this.map.id, url);
-                }
-            },
-
-            /**
-             * Checks if the module is ready to define itself, and if so,
-             * define it.
-             */
-            check: function () {
-                if (!this.enabled || this.enabling) {
-                    return;
-                }
-
-                var err, cjsModule,
-                    id = this.map.id,
-                    depExports = this.depExports,
-                    exports = this.exports,
-                    factory = this.factory;
-
-                if (!this.inited) {
-                    this.fetch();
-                } else if (this.error) {
-                    this.emit('error', this.error);
-                } else if (!this.defining) {
-                    //The factory could trigger another require call
-                    //that would result in checking this module to
-                    //define itself again. If already in the process
-                    //of doing that, skip this work.
-                    this.defining = true;
-
-                    if (this.depCount < 1 && !this.defined) {
-                        if (isFunction(factory)) {
-                            //If there is an error listener, favor passing
-                            //to that instead of throwing an error. However,
-                            //only do it for define()'d  modules. require
-                            //errbacks should not be called for failures in
-                            //their callbacks (#699). However if a global
-                            //onError is set, use that.
-                            if ((this.events.error && this.map.isDefine) ||
-                                req.onError !== defaultOnError) {
-                                try {
-                                    exports = context.execCb(id, factory, depExports, exports);
-                                } catch (e) {
-                                    err = e;
-                                }
-                            } else {
-                                exports = context.execCb(id, factory, depExports, exports);
-                            }
-
-                            if (this.map.isDefine) {
-                                //If setting exports via 'module' is in play,
-                                //favor that over return value and exports. After that,
-                                //favor a non-undefined return value over exports use.
-                                cjsModule = this.module;
-                                if (cjsModule &&
-                                        cjsModule.exports !== undefined &&
-                                        //Make sure it is not already the exports value
-                                        cjsModule.exports !== this.exports) {
-                                    exports = cjsModule.exports;
-                                } else if (exports === undefined && this.usingExports) {
-                                    //exports already set the defined value.
-                                    exports = this.exports;
-                                }
-                            }
-
-                            if (err) {
-                                err.requireMap = this.map;
-                                err.requireModules = this.map.isDefine ? [this.map.id] : null;
-                                err.requireType = this.map.isDefine ? 'define' : 'require';
-                                return onError((this.error = err));
-                            }
-
-                        } else {
-                            //Just a literal value
-                            exports = factory;
-                        }
-
-                        this.exports = exports;
-
-                        if (this.map.isDefine && !this.ignore) {
-                            defined[id] = exports;
-
-                            if (req.onResourceLoad) {
-                                req.onResourceLoad(context, this.map, this.depMaps);
-                            }
-                        }
-
-                        //Clean up
-                        cleanRegistry(id);
-
-                        this.defined = true;
-                    }
-
-                    //Finished the define stage. Allow calling check again
-                    //to allow define notifications below in the case of a
-                    //cycle.
-                    this.defining = false;
-
-                    if (this.defined && !this.defineEmitted) {
-                        this.defineEmitted = true;
-                        this.emit('defined', this.exports);
-                        this.defineEmitComplete = true;
-                    }
-
-                }
-            },
-
-            callPlugin: function () {
-                var map = this.map,
-                    id = map.id,
-                    //Map already normalized the prefix.
-                    pluginMap = makeModuleMap(map.prefix);
-
-                //Mark this as a dependency for this plugin, so it
-                //can be traced for cycles.
-                this.depMaps.push(pluginMap);
-
-                on(pluginMap, 'defined', bind(this, function (plugin) {
-                    var load, normalizedMap, normalizedMod,
-                        name = this.map.name,
-                        parentName = this.map.parentMap ? this.map.parentMap.name : null,
-                        localRequire = context.makeRequire(map.parentMap, {
-                            enableBuildCallback: true
-                        });
-
-                    //If current map is not normalized, wait for that
-                    //normalized name to load instead of continuing.
-                    if (this.map.unnormalized) {
-                        //Normalize the ID if the plugin allows it.
-                        if (plugin.normalize) {
-                            name = plugin.normalize(name, function (name) {
-                                return normalize(name, parentName, true);
-                            }) || '';
-                        }
-
-                        //prefix and name should already be normalized, no need
-                        //for applying map config again either.
-                        normalizedMap = makeModuleMap(map.prefix + '!' + name,
-                                                      this.map.parentMap);
-                        on(normalizedMap,
-                            'defined', bind(this, function (value) {
-                                this.init([], function () { return value; }, null, {
-                                    enabled: true,
-                                    ignore: true
-                                });
-                            }));
-
-                        normalizedMod = getOwn(registry, normalizedMap.id);
-                        if (normalizedMod) {
-                            //Mark this as a dependency for this plugin, so it
-                            //can be traced for cycles.
-                            this.depMaps.push(normalizedMap);
-
-                            if (this.events.error) {
-                                normalizedMod.on('error', bind(this, function (err) {
-                                    this.emit('error', err);
-                                }));
-                            }
-                            normalizedMod.enable();
-                        }
-
-                        return;
-                    }
-
-                    load = bind(this, function (value) {
-                        this.init([], function () { return value; }, null, {
-                            enabled: true
-                        });
-                    });
-
-                    load.error = bind(this, function (err) {
-                        this.inited = true;
-                        this.error = err;
-                        err.requireModules = [id];
-
-                        //Remove temp unnormalized modules for this module,
-                        //since they will never be resolved otherwise now.
-                        eachProp(registry, function (mod) {
-                            if (mod.map.id.indexOf(id + '_unnormalized') === 0) {
-                                cleanRegistry(mod.map.id);
-                            }
-                        });
-
-                        onError(err);
-                    });
-
-                    //Allow plugins to load other code without having to know the
-                    //context or how to 'complete' the load.
-                    load.fromText = bind(this, function (text, textAlt) {
-                        /*jslint evil: true */
-                        var moduleName = map.name,
-                            moduleMap = makeModuleMap(moduleName),
-                            hasInteractive = useInteractive;
-
-                        //As of 2.1.0, support just passing the text, to reinforce
-                        //fromText only being called once per resource. Still
-                        //support old style of passing moduleName but discard
-                        //that moduleName in favor of the internal ref.
-                        if (textAlt) {
-                            text = textAlt;
-                        }
-
-                        //Turn off interactive script matching for IE for any define
-                        //calls in the text, then turn it back on at the end.
-                        if (hasInteractive) {
-                            useInteractive = false;
-                        }
-
-                        //Prime the system by creating a module instance for
-                        //it.
-                        getModule(moduleMap);
-
-                        //Transfer any config to this other module.
-                        if (hasProp(config.config, id)) {
-                            config.config[moduleName] = config.config[id];
-                        }
-
-                        try {
-                            req.exec(text);
-                        } catch (e) {
-                            return onError(makeError('fromtexteval',
-                                             'fromText eval for ' + id +
-                                            ' failed: ' + e,
-                                             e,
-                                             [id]));
-                        }
-
-                        if (hasInteractive) {
-                            useInteractive = true;
-                        }
-
-                        //Mark this as a dependency for the plugin
-                        //resource
-                        this.depMaps.push(moduleMap);
-
-                        //Support anonymous modules.
-                        context.completeLoad(moduleName);
-
-                        //Bind the value of that module to the value for this
-                        //resource ID.
-                        localRequire([moduleName], load);
-                    });
-
-                    //Use parentName here since the plugin's name is not reliable,
-                    //could be some weird string with no path that actually wants to
-                    //reference the parentName's path.
-                    plugin.load(map.name, localRequire, load, config);
-                }));
-
-                context.enable(pluginMap, this);
-                this.pluginMaps[pluginMap.id] = pluginMap;
-            },
-
-            enable: function () {
-                enabledRegistry[this.map.id] = this;
-                this.enabled = true;
-
-                //Set flag mentioning that the module is enabling,
-                //so that immediate calls to the defined callbacks
-                //for dependencies do not trigger inadvertent load
-                //with the depCount still being zero.
-                this.enabling = true;
-
-                //Enable each dependency
-                each(this.depMaps, bind(this, function (depMap, i) {
-                    var id, mod, handler;
-
-                    if (typeof depMap === 'string') {
-                        //Dependency needs to be converted to a depMap
-                        //and wired up to this module.
-                        depMap = makeModuleMap(depMap,
-                                               (this.map.isDefine ? this.map : this.map.parentMap),
-                                               false,
-                                               !this.skipMap);
-                        this.depMaps[i] = depMap;
-
-                        handler = getOwn(handlers, depMap.id);
-
-                        if (handler) {
-                            this.depExports[i] = handler(this);
-                            return;
-                        }
-
-                        this.depCount += 1;
-
-                        on(depMap, 'defined', bind(this, function (depExports) {
-                            this.defineDep(i, depExports);
-                            this.check();
-                        }));
-
-                        if (this.errback) {
-                            on(depMap, 'error', bind(this, this.errback));
-                        }
-                    }
-
-                    id = depMap.id;
-                    mod = registry[id];
-
-                    //Skip special modules like 'require', 'exports', 'module'
-                    //Also, don't call enable if it is already enabled,
-                    //important in circular dependency cases.
-                    if (!hasProp(handlers, id) && mod && !mod.enabled) {
-                        context.enable(depMap, this);
-                    }
-                }));
-
-                //Enable each plugin that is used in
-                //a dependency
-                eachProp(this.pluginMaps, bind(this, function (pluginMap) {
-                    var mod = getOwn(registry, pluginMap.id);
-                    if (mod && !mod.enabled) {
-                        context.enable(pluginMap, this);
-                    }
-                }));
-
-                this.enabling = false;
-
-                this.check();
-            },
-
-            on: function (name, cb) {
-                var cbs = this.events[name];
-                if (!cbs) {
-                    cbs = this.events[name] = [];
-                }
-                cbs.push(cb);
-            },
-
-            emit: function (name, evt) {
-                each(this.events[name], function (cb) {
-                    cb(evt);
-                });
-                if (name === 'error') {
-                    //Now that the error handler was triggered, remove
-                    //the listeners, since this broken Module instance
-                    //can stay around for a while in the registry.
-                    delete this.events[name];
-                }
-            }
-        };
-
-        function callGetModule(args) {
-            //Skip modules already defined.
-            if (!hasProp(defined, args[0])) {
-                getModule(makeModuleMap(args[0], null, true)).init(args[1], args[2]);
-            }
-        }
-
-        function removeListener(node, func, name, ieName) {
-            //Favor detachEvent because of IE9
-            //issue, see attachEvent/addEventListener comment elsewhere
-            //in this file.
-            if (node.detachEvent && !isOpera) {
-                //Probably IE. If not it will throw an error, which will be
-                //useful to know.
-                if (ieName) {
-                    node.detachEvent(ieName, func);
-                }
-            } else {
-                node.removeEventListener(name, func, false);
-            }
-        }
-
-        /**
-         * Given an event from a script node, get the requirejs info from it,
-         * and then removes the event listeners on the node.
-         * @param {Event} evt
-         * @returns {Object}
-         */
-        function getScriptData(evt) {
-            //Using currentTarget instead of target for Firefox 2.0's sake. Not
-            //all old browsers will be supported, but this one was easy enough
-            //to support and still makes sense.
-            var node = evt.currentTarget || evt.srcElement;
-
-            //Remove the listeners once here.
-            removeListener(node, context.onScriptLoad, 'load', 'onreadystatechange');
-            removeListener(node, context.onScriptError, 'error');
-
-            return {
-                node: node,
-                id: node && node.getAttribute('data-requiremodule')
-            };
-        }
-
-        function intakeDefines() {
-            var args;
-
-            //Any defined modules in the global queue, intake them now.
-            takeGlobalQueue();
-
-            //Make sure any remaining defQueue items get properly processed.
-            while (defQueue.length) {
-                args = defQueue.shift();
-                if (args[0] === null) {
-                    return onError(makeError('mismatch', 'Mismatched anonymous define() module: ' + args[args.length - 1]));
-                } else {
-                    //args are id, deps, factory. Should be normalized by the
-                    //define() function.
-                    callGetModule(args);
-                }
-            }
-        }
-
-        context = {
-            config: config,
-            contextName: contextName,
-            registry: registry,
-            defined: defined,
-            urlFetched: urlFetched,
-            defQueue: defQueue,
-            Module: Module,
-            makeModuleMap: makeModuleMap,
-            nextTick: req.nextTick,
-            onError: onError,
-
-            /**
-             * Set a configuration for the context.
-             * @param {Object} cfg config object to integrate.
-             */
-            configure: function (cfg) {
-                //Make sure the baseUrl ends in a slash.
-                if (cfg.baseUrl) {
-                    if (cfg.baseUrl.charAt(cfg.baseUrl.length - 1) !== '/') {
-                        cfg.baseUrl += '/';
-                    }
-                }
-
-                //Save off the paths and packages since they require special processing,
-                //they are additive.
-                var pkgs = config.pkgs,
-                    shim = config.shim,
-                    objs = {
-                        paths: true,
-                        config: true,
-                        map: true
-                    };
-
-                eachProp(cfg, function (value, prop) {
-                    if (objs[prop]) {
-                        if (prop === 'map') {
-                            if (!config.map) {
-                                config.map = {};
-                            }
-                            mixin(config[prop], value, true, true);
-                        } else {
-                            mixin(config[prop], value, true);
-                        }
-                    } else {
-                        config[prop] = value;
-                    }
-                });
-
-                //Merge shim
-                if (cfg.shim) {
-                    eachProp(cfg.shim, function (value, id) {
-                        //Normalize the structure
-                        if (isArray(value)) {
-                            value = {
-                                deps: value
-                            };
-                        }
-                        if ((value.exports || value.init) && !value.exportsFn) {
-                            value.exportsFn = context.makeShimExports(value);
-                        }
-                        shim[id] = value;
-                    });
-                    config.shim = shim;
-                }
-
-                //Adjust packages if necessary.
-                if (cfg.packages) {
-                    each(cfg.packages, function (pkgObj) {
-                        var location;
-
-                        pkgObj = typeof pkgObj === 'string' ? { name: pkgObj } : pkgObj;
-                        location = pkgObj.location;
-
-                        //Create a brand new object on pkgs, since currentPackages can
-                        //be passed in again, and config.pkgs is the internal transformed
-                        //state for all package configs.
-                        pkgs[pkgObj.name] = {
-                            name: pkgObj.name,
-                            location: location || pkgObj.name,
-                            //Remove leading dot in main, so main paths are normalized,
-                            //and remove any trailing .js, since different package
-                            //envs have different conventions: some use a module name,
-                            //some use a file name.
-                            main: (pkgObj.main || 'main')
-                                  .replace(currDirRegExp, '')
-                                  .replace(jsSuffixRegExp, '')
-                        };
-                    });
-
-                    //Done with modifications, assing packages back to context config
-                    config.pkgs = pkgs;
-                }
-
-                //If there are any "waiting to execute" modules in the registry,
-                //update the maps for them, since their info, like URLs to load,
-                //may have changed.
-                eachProp(registry, function (mod, id) {
-                    //If module already has init called, since it is too
-                    //late to modify them, and ignore unnormalized ones
-                    //since they are transient.
-                    if (!mod.inited && !mod.map.unnormalized) {
-                        mod.map = makeModuleMap(id);
-                    }
-                });
-
-                //If a deps array or a config callback is specified, then call
-                //require with those args. This is useful when require is defined as a
-                //config object before require.js is loaded.
-                if (cfg.deps || cfg.callback) {
-                    context.require(cfg.deps || [], cfg.callback);
-                }
-            },
-
-            makeShimExports: function (value) {
-                function fn() {
-                    var ret;
-                    if (value.init) {
-                        ret = value.init.apply(global, arguments);
-                    }
-                    return ret || (value.exports && getGlobal(value.exports));
-                }
-                return fn;
-            },
-
-            makeRequire: function (relMap, options) {
-                options = options || {};
-
-                function localRequire(deps, callback, errback) {
-                    var id, map, requireMod;
-
-                    if (options.enableBuildCallback && callback && isFunction(callback)) {
-                        callback.__requireJsBuild = true;
-                    }
-
-                    if (typeof deps === 'string') {
-                        if (isFunction(callback)) {
-                            //Invalid call
-                            return onError(makeError('requireargs', 'Invalid require call'), errback);
-                        }
-
-                        //If require|exports|module are requested, get the
-                        //value for them from the special handlers. Caveat:
-                        //this only works while module is being defined.
-                        if (relMap && hasProp(handlers, deps)) {
-                            return handlers[deps](registry[relMap.id]);
-                        }
-
-                        //Synchronous access to one module. If require.get is
-                        //available (as in the Node adapter), prefer that.
-                        if (req.get) {
-                            return req.get(context, deps, relMap, localRequire);
-                        }
-
-                        //Normalize module name, if it contains . or ..
-                        map = makeModuleMap(deps, relMap, false, true);
-                        id = map.id;
-
-                        if (!hasProp(defined, id)) {
-                            return onError(makeError('notloaded', 'Module name "' +
-                                        id +
-                                        '" has not been loaded yet for context: ' +
-                                        contextName +
-                                        (relMap ? '' : '. Use require([])')));
-                        }
-                        return defined[id];
-                    }
-
-                    //Grab defines waiting in the global queue.
-                    intakeDefines();
-
-                    //Mark all the dependencies as needing to be loaded.
-                    context.nextTick(function () {
-                        //Some defines could have been added since the
-                        //require call, collect them.
-                        intakeDefines();
-
-                        requireMod = getModule(makeModuleMap(null, relMap));
-
-                        //Store if map config should be applied to this require
-                        //call for dependencies.
-                        requireMod.skipMap = options.skipMap;
-
-                        requireMod.init(deps, callback, errback, {
-                            enabled: true
-                        });
-
-                        checkLoaded();
-                    });
-
-                    return localRequire;
-                }
-
-                mixin(localRequire, {
-                    isBrowser: isBrowser,
-
-                    /**
-                     * Converts a module name + .extension into an URL path.
-                     * *Requires* the use of a module name. It does not support using
-                     * plain URLs like nameToUrl.
-                     */
-                    toUrl: function (moduleNamePlusExt) {
-                        var ext,
-                            index = moduleNamePlusExt.lastIndexOf('.'),
-                            segment = moduleNamePlusExt.split('/')[0],
-                            isRelative = segment === '.' || segment === '..';
-
-                        //Have a file extension alias, and it is not the
-                        //dots from a relative path.
-                        if (index !== -1 && (!isRelative || index > 1)) {
-                            ext = moduleNamePlusExt.substring(index, moduleNamePlusExt.length);
-                            moduleNamePlusExt = moduleNamePlusExt.substring(0, index);
-                        }
-
-                        return context.nameToUrl(normalize(moduleNamePlusExt,
-                                                relMap && relMap.id, true), ext,  true);
-                    },
-
-                    defined: function (id) {
-                        return hasProp(defined, makeModuleMap(id, relMap, false, true).id);
-                    },
-
-                    specified: function (id) {
-                        id = makeModuleMap(id, relMap, false, true).id;
-                        return hasProp(defined, id) || hasProp(registry, id);
-                    }
-                });
-
-                //Only allow undef on top level require calls
-                if (!relMap) {
-                    localRequire.undef = function (id) {
-                        //Bind any waiting define() calls to this context,
-                        //fix for #408
-                        takeGlobalQueue();
-
-                        var map = makeModuleMap(id, relMap, true),
-                            mod = getOwn(registry, id);
-
-                        delete defined[id];
-                        delete urlFetched[map.url];
-                        delete undefEvents[id];
-
-                        if (mod) {
-                            //Hold on to listeners in case the
-                            //module will be attempted to be reloaded
-                            //using a different config.
-                            if (mod.events.defined) {
-                                undefEvents[id] = mod.events;
-                            }
-
-                            cleanRegistry(id);
-                        }
-                    };
-                }
-
-                return localRequire;
-            },
-
-            /**
-             * Called to enable a module if it is still in the registry
-             * awaiting enablement. A second arg, parent, the parent module,
-             * is passed in for context, when this method is overriden by
-             * the optimizer. Not shown here to keep code compact.
-             */
-            enable: function (depMap) {
-                var mod = getOwn(registry, depMap.id);
-                if (mod) {
-                    getModule(depMap).enable();
-                }
-            },
-
-            /**
-             * Internal method used by environment adapters to complete a load event.
-             * A load event could be a script load or just a load pass from a synchronous
-             * load call.
-             * @param {String} moduleName the name of the module to potentially complete.
-             */
-            completeLoad: function (moduleName) {
-                var found, args, mod,
-                    shim = getOwn(config.shim, moduleName) || {},
-                    shExports = shim.exports;
-
-                takeGlobalQueue();
-
-                while (defQueue.length) {
-                    args = defQueue.shift();
-                    if (args[0] === null) {
-                        args[0] = moduleName;
-                        //If already found an anonymous module and bound it
-                        //to this name, then this is some other anon module
-                        //waiting for its completeLoad to fire.
-                        if (found) {
-                            break;
-                        }
-                        found = true;
-                    } else if (args[0] === moduleName) {
-                        //Found matching define call for this script!
-                        found = true;
-                    }
-
-                    callGetModule(args);
-                }
-
-                //Do this after the cycle of callGetModule in case the result
-                //of those calls/init calls changes the registry.
-                mod = getOwn(registry, moduleName);
-
-                if (!found && !hasProp(defined, moduleName) && mod && !mod.inited) {
-                    if (config.enforceDefine && (!shExports || !getGlobal(shExports))) {
-                        if (hasPathFallback(moduleName)) {
-                            return;
-                        } else {
-                            return onError(makeError('nodefine',
-                                             'No define call for ' + moduleName,
-                                             null,
-                                             [moduleName]));
-                        }
-                    } else {
-                        //A script that does not call define(), so just simulate
-                        //the call for it.
-                        callGetModule([moduleName, (shim.deps || []), shim.exportsFn]);
-                    }
-                }
-
-                checkLoaded();
-            },
-
-            /**
-             * Converts a module name to a file path. Supports cases where
-             * moduleName may actually be just an URL.
-             * Note that it **does not** call normalize on the moduleName,
-             * it is assumed to have already been normalized. This is an
-             * internal API, not a public one. Use toUrl for the public API.
-             */
-            nameToUrl: function (moduleName, ext, skipExt) {
-                var paths, pkgs, pkg, pkgPath, syms, i, parentModule, url,
-                    parentPath;
-
-                //If a colon is in the URL, it indicates a protocol is used and it is just
-                //an URL to a file, or if it starts with a slash, contains a query arg (i.e. ?)
-                //or ends with .js, then assume the user meant to use an url and not a module id.
-                //The slash is important for protocol-less URLs as well as full paths.
-                if (req.jsExtRegExp.test(moduleName)) {
-                    //Just a plain path, not module name lookup, so just return it.
-                    //Add extension if it is included. This is a bit wonky, only non-.js things pass
-                    //an extension, this method probably needs to be reworked.
-                    url = moduleName + (ext || '');
-                } else {
-                    //A module that needs to be converted to a path.
-                    paths = config.paths;
-                    pkgs = config.pkgs;
-
-                    syms = moduleName.split('/');
-                    //For each module name segment, see if there is a path
-                    //registered for it. Start with most specific name
-                    //and work up from it.
-                    for (i = syms.length; i > 0; i -= 1) {
-                        parentModule = syms.slice(0, i).join('/');
-                        pkg = getOwn(pkgs, parentModule);
-                        parentPath = getOwn(paths, parentModule);
-                        if (parentPath) {
-                            //If an array, it means there are a few choices,
-                            //Choose the one that is desired
-                            if (isArray(parentPath)) {
-                                parentPath = parentPath[0];
-                            }
-                            syms.splice(0, i, parentPath);
-                            break;
-                        } else if (pkg) {
-                            //If module name is just the package name, then looking
-                            //for the main module.
-                            if (moduleName === pkg.name) {
-                                pkgPath = pkg.location + '/' + pkg.main;
-                            } else {
-                                pkgPath = pkg.location;
-                            }
-                            syms.splice(0, i, pkgPath);
-                            break;
-                        }
-                    }
-
-                    //Join the path parts together, then figure out if baseUrl is needed.
-                    url = syms.join('/');
-                    url += (ext || (/\?/.test(url) || skipExt ? '' : '.js'));
-                    url = (url.charAt(0) === '/' || url.match(/^[\w\+\.\-]+:/) ? '' : config.baseUrl) + url;
-                }
-
-                return config.urlArgs ? url +
-                                        ((url.indexOf('?') === -1 ? '?' : '&') +
-                                         config.urlArgs) : url;
-            },
-
-            //Delegates to req.load. Broken out as a separate function to
-            //allow overriding in the optimizer.
-            load: function (id, url) {
-                req.load(context, id, url);
-            },
-
-            /**
-             * Executes a module callback function. Broken out as a separate function
-             * solely to allow the build system to sequence the files in the built
-             * layer in the right sequence.
-             *
-             * @private
-             */
-            execCb: function (name, callback, args, exports) {
-                return callback.apply(exports, args);
-            },
-
-            /**
-             * callback for script loads, used to check status of loading.
-             *
-             * @param {Event} evt the event from the browser for the script
-             * that was loaded.
-             */
-            onScriptLoad: function (evt) {
-                //Using currentTarget instead of target for Firefox 2.0's sake. Not
-                //all old browsers will be supported, but this one was easy enough
-                //to support and still makes sense.
-                if (evt.type === 'load' ||
-                        (readyRegExp.test((evt.currentTarget || evt.srcElement).readyState))) {
-                    //Reset interactive script so a script node is not held onto for
-                    //to long.
-                    interactiveScript = null;
-
-                    //Pull out the name of the module and the context.
-                    var data = getScriptData(evt);
-                    context.completeLoad(data.id);
-                }
-            },
-
-            /**
-             * Callback for script errors.
-             */
-            onScriptError: function (evt) {
-                var data = getScriptData(evt);
-                if (!hasPathFallback(data.id)) {
-                    return onError(makeError('scripterror', 'Script error for: ' + data.id, evt, [data.id]));
-                }
-            }
-        };
-
-        context.require = context.makeRequire();
-        return context;
-    }
-
-    /**
-     * Main entry point.
-     *
-     * If the only argument to require is a string, then the module that
-     * is represented by that string is fetched for the appropriate context.
-     *
-     * If the first argument is an array, then it will be treated as an array
-     * of dependency string names to fetch. An optional function callback can
-     * be specified to execute when all of those dependencies are available.
-     *
-     * Make a local req variable to help Caja compliance (it assumes things
-     * on a require that are not standardized), and to give a short
-     * name for minification/local scope use.
-     */
-    req = requirejs = function (deps, callback, errback, optional) {
-
-        //Find the right context, use default
-        var context, config,
-            contextName = defContextName;
-
-        // Determine if have config object in the call.
-        if (!isArray(deps) && typeof deps !== 'string') {
-            // deps is a config object
-            config = deps;
-            if (isArray(callback)) {
-                // Adjust args if there are dependencies
-                deps = callback;
-                callback = errback;
-                errback = optional;
-            } else {
-                deps = [];
-            }
-        }
-
-        if (config && config.context) {
-            contextName = config.context;
-        }
-
-        context = getOwn(contexts, contextName);
-        if (!context) {
-            context = contexts[contextName] = req.s.newContext(contextName);
-        }
-
-        if (config) {
-            context.configure(config);
-        }
-
-        return context.require(deps, callback, errback);
-    };
-
-    /**
-     * Support require.config() to make it easier to cooperate with other
-     * AMD loaders on globally agreed names.
-     */
-    req.config = function (config) {
-        return req(config);
-    };
-
-    /**
-     * Execute something after the current tick
-     * of the event loop. Override for other envs
-     * that have a better solution than setTimeout.
-     * @param  {Function} fn function to execute later.
-     */
-    req.nextTick = typeof setTimeout !== 'undefined' ? function (fn) {
-        setTimeout(fn, 4);
-    } : function (fn) { fn(); };
-
-    /**
-     * Export require as a global, but only if it does not already exist.
-     */
-    if (!require) {
-        require = req;
-    }
-
-    req.version = version;
-
-    //Used to filter out dependencies that are already paths.
-    req.jsExtRegExp = /^\/|:|\?|\.js$/;
-    req.isBrowser = isBrowser;
-    s = req.s = {
-        contexts: contexts,
-        newContext: newContext
-    };
-
-    //Create default context.
-    req({});
-
-    //Exports some context-sensitive methods on global require.
-    each([
-        'toUrl',
-        'undef',
-        'defined',
-        'specified'
-    ], function (prop) {
-        //Reference from contexts instead of early binding to default context,
-        //so that during builds, the latest instance of the default context
-        //with its config gets used.
-        req[prop] = function () {
-            var ctx = contexts[defContextName];
-            return ctx.require[prop].apply(ctx, arguments);
-        };
-    });
-
-    if (isBrowser) {
-        head = s.head = document.getElementsByTagName('head')[0];
-        //If BASE tag is in play, using appendChild is a problem for IE6.
-        //When that browser dies, this can be removed. Details in this jQuery bug:
-        //http://dev.jquery.com/ticket/2709
-        baseElement = document.getElementsByTagName('base')[0];
-        if (baseElement) {
-            head = s.head = baseElement.parentNode;
-        }
-    }
-
-    /**
-     * Any errors that require explicitly generates will be passed to this
-     * function. Intercept/override it if you want custom error handling.
-     * @param {Error} err the error object.
-     */
-    req.onError = defaultOnError;
-
-    /**
-     * Creates the node for the load command. Only used in browser envs.
-     */
-    req.createNode = function (config, moduleName, url) {
-        var node = config.xhtml ?
-                document.createElementNS('http://www.w3.org/1999/xhtml', 'html:script') :
-                document.createElement('script');
-        node.type = config.scriptType || 'text/javascript';
-        node.charset = 'utf-8';
-        node.async = true;
-        return node;
-    };
-
-    /**
-     * Does the request to load a module for the browser case.
-     * Make this a separate function to allow other environments
-     * to override it.
-     *
-     * @param {Object} context the require context to find state.
-     * @param {String} moduleName the name of the module.
-     * @param {Object} url the URL to the module.
-     */
-    req.load = function (context, moduleName, url) {
-        var config = (context && context.config) || {},
-            node;
-        if (isBrowser) {
-            //In the browser so use a script tag
-            node = req.createNode(config, moduleName, url);
-
-            node.setAttribute('data-requirecontext', context.contextName);
-            node.setAttribute('data-requiremodule', moduleName);
-
-            //Set up load listener. Test attachEvent first because IE9 has
-            //a subtle issue in its addEventListener and script onload firings
-            //that do not match the behavior of all other browsers with
-            //addEventListener support, which fire the onload event for a
-            //script right after the script execution. See:
-            //https://connect.microsoft.com/IE/feedback/details/648057/script-onload-event-is-not-fired-immediately-after-script-execution
-            //UNFORTUNATELY Opera implements attachEvent but does not follow the script
-            //script execution mode.
-            if (node.attachEvent &&
-                    //Check if node.attachEvent is artificially added by custom script or
-                    //natively supported by browser
-                    //read https://github.com/jrburke/requirejs/issues/187
-                    //if we can NOT find [native code] then it must NOT natively supported.
-                    //in IE8, node.attachEvent does not have toString()
-                    //Note the test for "[native code" with no closing brace, see:
-                    //https://github.com/jrburke/requirejs/issues/273
-                    !(node.attachEvent.toString && node.attachEvent.toString().indexOf('[native code') < 0) &&
-                    !isOpera) {
-                //Probably IE. IE (at least 6-8) do not fire
-                //script onload right after executing the script, so
-                //we cannot tie the anonymous define call to a name.
-                //However, IE reports the script as being in 'interactive'
-                //readyState at the time of the define call.
-                useInteractive = true;
-
-                node.attachEvent('onreadystatechange', context.onScriptLoad);
-                //It would be great to add an error handler here to catch
-                //404s in IE9+. However, onreadystatechange will fire before
-                //the error handler, so that does not help. If addEventListener
-                //is used, then IE will fire error before load, but we cannot
-                //use that pathway given the connect.microsoft.com issue
-                //mentioned above about not doing the 'script execute,
-                //then fire the script load event listener before execute
-                //next script' that other browsers do.
-                //Best hope: IE10 fixes the issues,
-                //and then destroys all installs of IE 6-9.
-                //node.attachEvent('onerror', context.onScriptError);
-            } else {
-                node.addEventListener('load', context.onScriptLoad, false);
-                node.addEventListener('error', context.onScriptError, false);
-            }
-            node.src = url;
-
-            //For some cache cases in IE 6-8, the script executes before the end
-            //of the appendChild execution, so to tie an anonymous define
-            //call to the module name (which is stored on the node), hold on
-            //to a reference to this node, but clear after the DOM insertion.
-            currentlyAddingScript = node;
-            if (baseElement) {
-                head.insertBefore(node, baseElement);
-            } else {
-                head.appendChild(node);
-            }
-            currentlyAddingScript = null;
-
-            return node;
-        } else if (isWebWorker) {
-            try {
-                //In a web worker, use importScripts. This is not a very
-                //efficient use of importScripts, importScripts will block until
-                //its script is downloaded and evaluated. However, if web workers
-                //are in play, the expectation that a build has been done so that
-                //only one script needs to be loaded anyway. This may need to be
-                //reevaluated if other use cases become common.
-                importScripts(url);
-
-                //Account for anonymous modules
-                context.completeLoad(moduleName);
-            } catch (e) {
-                context.onError(makeError('importscripts',
-                                'importScripts failed for ' +
-                                    moduleName + ' at ' + url,
-                                e,
-                                [moduleName]));
-            }
-        }
-    };
-
-    function getInteractiveScript() {
-        if (interactiveScript && interactiveScript.readyState === 'interactive') {
-            return interactiveScript;
-        }
-
-        eachReverse(scripts(), function (script) {
-            if (script.readyState === 'interactive') {
-                return (interactiveScript = script);
-            }
-        });
-        return interactiveScript;
-    }
-
-    //Look for a data-main script attribute, which could also adjust the baseUrl.
-    if (isBrowser) {
-        //Figure out baseUrl. Get it from the script tag with require.js in it.
-        eachReverse(scripts(), function (script) {
-            //Set the 'head' where we can append children by
-            //using the script's parent.
-            if (!head) {
-                head = script.parentNode;
-            }
-
-            //Look for a data-main attribute to set main script for the page
-            //to load. If it is there, the path to data main becomes the
-            //baseUrl, if it is not already set.
-            dataMain = script.getAttribute('data-main');
-            if (dataMain) {
-                //Preserve dataMain in case it is a path (i.e. contains '?')
-                mainScript = dataMain;
-
-                //Set final baseUrl if there is not already an explicit one.
-                if (!cfg.baseUrl) {
-                    //Pull off the directory of data-main for use as the
-                    //baseUrl.
-                    src = mainScript.split('/');
-                    mainScript = src.pop();
-                    subPath = src.length ? src.join('/')  + '/' : './';
-
-                    cfg.baseUrl = subPath;
-                }
-
-                //Strip off any trailing .js since mainScript is now
-                //like a module name.
-                mainScript = mainScript.replace(jsSuffixRegExp, '');
-
-                 //If mainScript is still a path, fall back to dataMain
-                if (req.jsExtRegExp.test(mainScript)) {
-                    mainScript = dataMain;
-                }
-
-                //Put the data-main script in the files to load.
-                cfg.deps = cfg.deps ? cfg.deps.concat(mainScript) : [mainScript];
-
-                return true;
-            }
-        });
-    }
-
-    /**
-     * The function that handles definitions of modules. Differs from
-     * require() in that a string for the module should be the first argument,
-     * and the function to execute after dependencies are loaded should
-     * return a value to define the module corresponding to the first argument's
-     * name.
-     */
-    define = function (name, deps, callback) {
-        var node, context;
-
-        //Allow for anonymous modules
-        if (typeof name !== 'string') {
-            //Adjust args appropriately
-            callback = deps;
-            deps = name;
-            name = null;
-        }
-
-        //This module may not have dependencies
-        if (!isArray(deps)) {
-            callback = deps;
-            deps = null;
-        }
-
-        //If no name, and callback is a function, then figure out if it a
-        //CommonJS thing with dependencies.
-        if (!deps && isFunction(callback)) {
-            deps = [];
-            //Remove comments from the callback string,
-            //look for require calls, and pull them into the dependencies,
-            //but only if there are function args.
-            if (callback.length) {
-                callback
-                    .toString()
-                    .replace(commentRegExp, '')
-                    .replace(cjsRequireRegExp, function (match, dep) {
-                        deps.push(dep);
-                    });
-
-                //May be a CommonJS thing even without require calls, but still
-                //could use exports, and module. Avoid doing exports and module
-                //work though if it just needs require.
-                //REQUIRES the function to expect the CommonJS variables in the
-                //order listed below.
-                deps = (callback.length === 1 ? ['require'] : ['require', 'exports', 'module']).concat(deps);
-            }
-        }
-
-        //If in IE 6-8 and hit an anonymous define() call, do the interactive
-        //work.
-        if (useInteractive) {
-            node = currentlyAddingScript || getInteractiveScript();
-            if (node) {
-                if (!name) {
-                    name = node.getAttribute('data-requiremodule');
-                }
-                context = contexts[node.getAttribute('data-requirecontext')];
-            }
-        }
-
-        //Always save off evaluating the def call until the script onload handler.
-        //This allows multiple modules to be in a file without prematurely
-        //tracing dependencies, and allows for anonymous module support,
-        //where the module name is not known until the script onload event
-        //occurs. If no context, use the global queue, and get it processed
-        //in the onscript load callback.
-        (context ? context.defQueue : globalDefQueue).push([name, deps, callback]);
-    };
-
-    define.amd = {
-        jQuery: true
-    };
-
-
-    /**
-     * Executes the text. Normally just uses eval, but can be modified
-     * to use a better, environment-specific call. Only used for transpiling
-     * loader plugins, not for plain JS modules.
-     * @param {String} text the text to execute/evaluate.
-     */
-    req.exec = function (text) {
-        /*jslint evil: true */
-        return eval(text);
-    };
-
-    //Set up with config info.
-    req(cfg);
-}(this));
diff --git a/addons/im_livechat/static/ext/static/lib/underscore/underscore.js b/addons/im_livechat/static/ext/static/lib/underscore/underscore.js
deleted file mode 100644
index 208d4cd890c..00000000000
--- a/addons/im_livechat/static/ext/static/lib/underscore/underscore.js
+++ /dev/null
@@ -1,999 +0,0 @@
-//     Underscore.js 1.3.1
-//     (c) 2009-2012 Jeremy Ashkenas, DocumentCloud Inc.
-//     Underscore is freely distributable under the MIT license.
-//     Portions of Underscore are inspired or borrowed from Prototype,
-//     Oliver Steele's Functional, and John Resig's Micro-Templating.
-//     For all details and documentation:
-//     http://documentcloud.github.com/underscore
-
-(function() {
-
-  // Baseline setup
-  // --------------
-
-  // Establish the root object, `window` in the browser, or `global` on the server.
-  var root = this;
-
-  // Save the previous value of the `_` variable.
-  var previousUnderscore = root._;
-
-  // Establish the object that gets returned to break out of a loop iteration.
-  var breaker = {};
-
-  // Save bytes in the minified (but not gzipped) version:
-  var ArrayProto = Array.prototype, ObjProto = Object.prototype, FuncProto = Function.prototype;
-
-  // Create quick reference variables for speed access to core prototypes.
-  var slice            = ArrayProto.slice,
-      unshift          = ArrayProto.unshift,
-      toString         = ObjProto.toString,
-      hasOwnProperty   = ObjProto.hasOwnProperty;
-
-  // All **ECMAScript 5** native function implementations that we hope to use
-  // are declared here.
-  var
-    nativeForEach      = ArrayProto.forEach,
-    nativeMap          = ArrayProto.map,
-    nativeReduce       = ArrayProto.reduce,
-    nativeReduceRight  = ArrayProto.reduceRight,
-    nativeFilter       = ArrayProto.filter,
-    nativeEvery        = ArrayProto.every,
-    nativeSome         = ArrayProto.some,
-    nativeIndexOf      = ArrayProto.indexOf,
-    nativeLastIndexOf  = ArrayProto.lastIndexOf,
-    nativeIsArray      = Array.isArray,
-    nativeKeys         = Object.keys,
-    nativeBind         = FuncProto.bind;
-
-  // Create a safe reference to the Underscore object for use below.
-  var _ = function(obj) { return new wrapper(obj); };
-
-  // Export the Underscore object for **Node.js**, with
-  // backwards-compatibility for the old `require()` API. If we're in
-  // the browser, add `_` as a global object via a string identifier,
-  // for Closure Compiler "advanced" mode.
-  if (typeof exports !== 'undefined') {
-    if (typeof module !== 'undefined' && module.exports) {
-      exports = module.exports = _;
-    }
-    exports._ = _;
-  } else {
-    root['_'] = _;
-  }
-
-  // Current version.
-  _.VERSION = '1.3.1';
-
-  // Collection Functions
-  // --------------------
-
-  // The cornerstone, an `each` implementation, aka `forEach`.
-  // Handles objects with the built-in `forEach`, arrays, and raw objects.
-  // Delegates to **ECMAScript 5**'s native `forEach` if available.
-  var each = _.each = _.forEach = function(obj, iterator, context) {
-    if (obj == null) return;
-    if (nativeForEach && obj.forEach === nativeForEach) {
-      obj.forEach(iterator, context);
-    } else if (obj.length === +obj.length) {
-      for (var i = 0, l = obj.length; i < l; i++) {
-        if (i in obj && iterator.call(context, obj[i], i, obj) === breaker) return;
-      }
-    } else {
-      for (var key in obj) {
-        if (_.has(obj, key)) {
-          if (iterator.call(context, obj[key], key, obj) === breaker) return;
-        }
-      }
-    }
-  };
-
-  // Return the results of applying the iterator to each element.
-  // Delegates to **ECMAScript 5**'s native `map` if available.
-  _.map = _.collect = function(obj, iterator, context) {
-    var results = [];
-    if (obj == null) return results;
-    if (nativeMap && obj.map === nativeMap) return obj.map(iterator, context);
-    each(obj, function(value, index, list) {
-      results[results.length] = iterator.call(context, value, index, list);
-    });
-    if (obj.length === +obj.length) results.length = obj.length;
-    return results;
-  };
-
-  // **Reduce** builds up a single result from a list of values, aka `inject`,
-  // or `foldl`. Delegates to **ECMAScript 5**'s native `reduce` if available.
-  _.reduce = _.foldl = _.inject = function(obj, iterator, memo, context) {
-    var initial = arguments.length > 2;
-    if (obj == null) obj = [];
-    if (nativeReduce && obj.reduce === nativeReduce) {
-      if (context) iterator = _.bind(iterator, context);
-      return initial ? obj.reduce(iterator, memo) : obj.reduce(iterator);
-    }
-    each(obj, function(value, index, list) {
-      if (!initial) {
-        memo = value;
-        initial = true;
-      } else {
-        memo = iterator.call(context, memo, value, index, list);
-      }
-    });
-    if (!initial) throw new TypeError('Reduce of empty array with no initial value');
-    return memo;
-  };
-
-  // The right-associative version of reduce, also known as `foldr`.
-  // Delegates to **ECMAScript 5**'s native `reduceRight` if available.
-  _.reduceRight = _.foldr = function(obj, iterator, memo, context) {
-    var initial = arguments.length > 2;
-    if (obj == null) obj = [];
-    if (nativeReduceRight && obj.reduceRight === nativeReduceRight) {
-      if (context) iterator = _.bind(iterator, context);
-      return initial ? obj.reduceRight(iterator, memo) : obj.reduceRight(iterator);
-    }
-    var reversed = _.toArray(obj).reverse();
-    if (context && !initial) iterator = _.bind(iterator, context);
-    return initial ? _.reduce(reversed, iterator, memo, context) : _.reduce(reversed, iterator);
-  };
-
-  // Return the first value which passes a truth test. Aliased as `detect`.
-  _.find = _.detect = function(obj, iterator, context) {
-    var result;
-    any(obj, function(value, index, list) {
-      if (iterator.call(context, value, index, list)) {
-        result = value;
-        return true;
-      }
-    });
-    return result;
-  };
-
-  // Return all the elements that pass a truth test.
-  // Delegates to **ECMAScript 5**'s native `filter` if available.
-  // Aliased as `select`.
-  _.filter = _.select = function(obj, iterator, context) {
-    var results = [];
-    if (obj == null) return results;
-    if (nativeFilter && obj.filter === nativeFilter) return obj.filter(iterator, context);
-    each(obj, function(value, index, list) {
-      if (iterator.call(context, value, index, list)) results[results.length] = value;
-    });
-    return results;
-  };
-
-  // Return all the elements for which a truth test fails.
-  _.reject = function(obj, iterator, context) {
-    var results = [];
-    if (obj == null) return results;
-    each(obj, function(value, index, list) {
-      if (!iterator.call(context, value, index, list)) results[results.length] = value;
-    });
-    return results;
-  };
-
-  // Determine whether all of the elements match a truth test.
-  // Delegates to **ECMAScript 5**'s native `every` if available.
-  // Aliased as `all`.
-  _.every = _.all = function(obj, iterator, context) {
-    var result = true;
-    if (obj == null) return result;
-    if (nativeEvery && obj.every === nativeEvery) return obj.every(iterator, context);
-    each(obj, function(value, index, list) {
-      if (!(result = result && iterator.call(context, value, index, list))) return breaker;
-    });
-    return result;
-  };
-
-  // Determine if at least one element in the object matches a truth test.
-  // Delegates to **ECMAScript 5**'s native `some` if available.
-  // Aliased as `any`.
-  var any = _.some = _.any = function(obj, iterator, context) {
-    iterator || (iterator = _.identity);
-    var result = false;
-    if (obj == null) return result;
-    if (nativeSome && obj.some === nativeSome) return obj.some(iterator, context);
-    each(obj, function(value, index, list) {
-      if (result || (result = iterator.call(context, value, index, list))) return breaker;
-    });
-    return !!result;
-  };
-
-  // Determine if a given value is included in the array or object using `===`.
-  // Aliased as `contains`.
-  _.include = _.contains = function(obj, target) {
-    var found = false;
-    if (obj == null) return found;
-    if (nativeIndexOf && obj.indexOf === nativeIndexOf) return obj.indexOf(target) != -1;
-    found = any(obj, function(value) {
-      return value === target;
-    });
-    return found;
-  };
-
-  // Invoke a method (with arguments) on every item in a collection.
-  _.invoke = function(obj, method) {
-    var args = slice.call(arguments, 2);
-    return _.map(obj, function(value) {
-      return (_.isFunction(method) ? method || value : value[method]).apply(value, args);
-    });
-  };
-
-  // Convenience version of a common use case of `map`: fetching a property.
-  _.pluck = function(obj, key) {
-    return _.map(obj, function(value){ return value[key]; });
-  };
-
-  // Return the maximum element or (element-based computation).
-  _.max = function(obj, iterator, context) {
-    if (!iterator && _.isArray(obj)) return Math.max.apply(Math, obj);
-    if (!iterator && _.isEmpty(obj)) return -Infinity;
-    var result = {computed : -Infinity};
-    each(obj, function(value, index, list) {
-      var computed = iterator ? iterator.call(context, value, index, list) : value;
-      computed >= result.computed && (result = {value : value, computed : computed});
-    });
-    return result.value;
-  };
-
-  // Return the minimum element (or element-based computation).
-  _.min = function(obj, iterator, context) {
-    if (!iterator && _.isArray(obj)) return Math.min.apply(Math, obj);
-    if (!iterator && _.isEmpty(obj)) return Infinity;
-    var result = {computed : Infinity};
-    each(obj, function(value, index, list) {
-      var computed = iterator ? iterator.call(context, value, index, list) : value;
-      computed < result.computed && (result = {value : value, computed : computed});
-    });
-    return result.value;
-  };
-
-  // Shuffle an array.
-  _.shuffle = function(obj) {
-    var shuffled = [], rand;
-    each(obj, function(value, index, list) {
-      if (index == 0) {
-        shuffled[0] = value;
-      } else {
-        rand = Math.floor(Math.random() * (index + 1));
-        shuffled[index] = shuffled[rand];
-        shuffled[rand] = value;
-      }
-    });
-    return shuffled;
-  };
-
-  // Sort the object's values by a criterion produced by an iterator.
-  _.sortBy = function(obj, iterator, context) {
-    return _.pluck(_.map(obj, function(value, index, list) {
-      return {
-        value : value,
-        criteria : iterator.call(context, value, index, list)
-      };
-    }).sort(function(left, right) {
-      var a = left.criteria, b = right.criteria;
-      return a < b ? -1 : a > b ? 1 : 0;
-    }), 'value');
-  };
-
-  // Groups the object's values by a criterion. Pass either a string attribute
-  // to group by, or a function that returns the criterion.
-  _.groupBy = function(obj, val) {
-    var result = {};
-    var iterator = _.isFunction(val) ? val : function(obj) { return obj[val]; };
-    each(obj, function(value, index) {
-      var key = iterator(value, index);
-      (result[key] || (result[key] = [])).push(value);
-    });
-    return result;
-  };
-
-  // Use a comparator function to figure out at what index an object should
-  // be inserted so as to maintain order. Uses binary search.
-  _.sortedIndex = function(array, obj, iterator) {
-    iterator || (iterator = _.identity);
-    var low = 0, high = array.length;
-    while (low < high) {
-      var mid = (low + high) >> 1;
-      iterator(array[mid]) < iterator(obj) ? low = mid + 1 : high = mid;
-    }
-    return low;
-  };
-
-  // Safely convert anything iterable into a real, live array.
-  _.toArray = function(iterable) {
-    if (!iterable)                return [];
-    if (iterable.toArray)         return iterable.toArray();
-    if (_.isArray(iterable))      return slice.call(iterable);
-    if (_.isArguments(iterable))  return slice.call(iterable);
-    return _.values(iterable);
-  };
-
-  // Return the number of elements in an object.
-  _.size = function(obj) {
-    return _.toArray(obj).length;
-  };
-
-  // Array Functions
-  // ---------------
-
-  // Get the first element of an array. Passing **n** will return the first N
-  // values in the array. Aliased as `head`. The **guard** check allows it to work
-  // with `_.map`.
-  _.first = _.head = function(array, n, guard) {
-    return (n != null) && !guard ? slice.call(array, 0, n) : array[0];
-  };
-
-  // Returns everything but the last entry of the array. Especcialy useful on
-  // the arguments object. Passing **n** will return all the values in
-  // the array, excluding the last N. The **guard** check allows it to work with
-  // `_.map`.
-  _.initial = function(array, n, guard) {
-    return slice.call(array, 0, array.length - ((n == null) || guard ? 1 : n));
-  };
-
-  // Get the last element of an array. Passing **n** will return the last N
-  // values in the array. The **guard** check allows it to work with `_.map`.
-  _.last = function(array, n, guard) {
-    if ((n != null) && !guard) {
-      return slice.call(array, Math.max(array.length - n, 0));
-    } else {
-      return array[array.length - 1];
-    }
-  };
-
-  // Returns everything but the first entry of the array. Aliased as `tail`.
-  // Especially useful on the arguments object. Passing an **index** will return
-  // the rest of the values in the array from that index onward. The **guard**
-  // check allows it to work with `_.map`.
-  _.rest = _.tail = function(array, index, guard) {
-    return slice.call(array, (index == null) || guard ? 1 : index);
-  };
-
-  // Trim out all falsy values from an array.
-  _.compact = function(array) {
-    return _.filter(array, function(value){ return !!value; });
-  };
-
-  // Return a completely flattened version of an array.
-  _.flatten = function(array, shallow) {
-    return _.reduce(array, function(memo, value) {
-      if (_.isArray(value)) return memo.concat(shallow ? value : _.flatten(value));
-      memo[memo.length] = value;
-      return memo;
-    }, []);
-  };
-
-  // Return a version of the array that does not contain the specified value(s).
-  _.without = function(array) {
-    return _.difference(array, slice.call(arguments, 1));
-  };
-
-  // Produce a duplicate-free version of the array. If the array has already
-  // been sorted, you have the option of using a faster algorithm.
-  // Aliased as `unique`.
-  _.uniq = _.unique = function(array, isSorted, iterator) {
-    var initial = iterator ? _.map(array, iterator) : array;
-    var result = [];
-    _.reduce(initial, function(memo, el, i) {
-      if (0 == i || (isSorted === true ? _.last(memo) != el : !_.include(memo, el))) {
-        memo[memo.length] = el;
-        result[result.length] = array[i];
-      }
-      return memo;
-    }, []);
-    return result;
-  };
-
-  // Produce an array that contains the union: each distinct element from all of
-  // the passed-in arrays.
-  _.union = function() {
-    return _.uniq(_.flatten(arguments, true));
-  };
-
-  // Produce an array that contains every item shared between all the
-  // passed-in arrays. (Aliased as "intersect" for back-compat.)
-  _.intersection = _.intersect = function(array) {
-    var rest = slice.call(arguments, 1);
-    return _.filter(_.uniq(array), function(item) {
-      return _.every(rest, function(other) {
-        return _.indexOf(other, item) >= 0;
-      });
-    });
-  };
-
-  // Take the difference between one array and a number of other arrays.
-  // Only the elements present in just the first array will remain.
-  _.difference = function(array) {
-    var rest = _.flatten(slice.call(arguments, 1));
-    return _.filter(array, function(value){ return !_.include(rest, value); });
-  };
-
-  // Zip together multiple lists into a single array -- elements that share
-  // an index go together.
-  _.zip = function() {
-    var args = slice.call(arguments);
-    var length = _.max(_.pluck(args, 'length'));
-    var results = new Array(length);
-    for (var i = 0; i < length; i++) results[i] = _.pluck(args, "" + i);
-    return results;
-  };
-
-  // If the browser doesn't supply us with indexOf (I'm looking at you, **MSIE**),
-  // we need this function. Return the position of the first occurrence of an
-  // item in an array, or -1 if the item is not included in the array.
-  // Delegates to **ECMAScript 5**'s native `indexOf` if available.
-  // If the array is large and already in sort order, pass `true`
-  // for **isSorted** to use binary search.
-  _.indexOf = function(array, item, isSorted) {
-    if (array == null) return -1;
-    var i, l;
-    if (isSorted) {
-      i = _.sortedIndex(array, item);
-      return array[i] === item ? i : -1;
-    }
-    if (nativeIndexOf && array.indexOf === nativeIndexOf) return array.indexOf(item);
-    for (i = 0, l = array.length; i < l; i++) if (i in array && array[i] === item) return i;
-    return -1;
-  };
-
-  // Delegates to **ECMAScript 5**'s native `lastIndexOf` if available.
-  _.lastIndexOf = function(array, item) {
-    if (array == null) return -1;
-    if (nativeLastIndexOf && array.lastIndexOf === nativeLastIndexOf) return array.lastIndexOf(item);
-    var i = array.length;
-    while (i--) if (i in array && array[i] === item) return i;
-    return -1;
-  };
-
-  // Generate an integer Array containing an arithmetic progression. A port of
-  // the native Python `range()` function. See
-  // [the Python documentation](http://docs.python.org/library/functions.html#range).
-  _.range = function(start, stop, step) {
-    if (arguments.length <= 1) {
-      stop = start || 0;
-      start = 0;
-    }
-    step = arguments[2] || 1;
-
-    var len = Math.max(Math.ceil((stop - start) / step), 0);
-    var idx = 0;
-    var range = new Array(len);
-
-    while(idx < len) {
-      range[idx++] = start;
-      start += step;
-    }
-
-    return range;
-  };
-
-  // Function (ahem) Functions
-  // ------------------
-
-  // Reusable constructor function for prototype setting.
-  var ctor = function(){};
-
-  // Create a function bound to a given object (assigning `this`, and arguments,
-  // optionally). Binding with arguments is also known as `curry`.
-  // Delegates to **ECMAScript 5**'s native `Function.bind` if available.
-  // We check for `func.bind` first, to fail fast when `func` is undefined.
-  _.bind = function bind(func, context) {
-    var bound, args;
-    if (func.bind === nativeBind && nativeBind) return nativeBind.apply(func, slice.call(arguments, 1));
-    if (!_.isFunction(func)) throw new TypeError;
-    args = slice.call(arguments, 2);
-    return bound = function() {
-      if (!(this instanceof bound)) return func.apply(context, args.concat(slice.call(arguments)));
-      ctor.prototype = func.prototype;
-      var self = new ctor;
-      var result = func.apply(self, args.concat(slice.call(arguments)));
-      if (Object(result) === result) return result;
-      return self;
-    };
-  };
-
-  // Bind all of an object's methods to that object. Useful for ensuring that
-  // all callbacks defined on an object belong to it.
-  _.bindAll = function(obj) {
-    var funcs = slice.call(arguments, 1);
-    if (funcs.length == 0) funcs = _.functions(obj);
-    each(funcs, function(f) { obj[f] = _.bind(obj[f], obj); });
-    return obj;
-  };
-
-  // Memoize an expensive function by storing its results.
-  _.memoize = function(func, hasher) {
-    var memo = {};
-    hasher || (hasher = _.identity);
-    return function() {
-      var key = hasher.apply(this, arguments);
-      return _.has(memo, key) ? memo[key] : (memo[key] = func.apply(this, arguments));
-    };
-  };
-
-  // Delays a function for the given number of milliseconds, and then calls
-  // it with the arguments supplied.
-  _.delay = function(func, wait) {
-    var args = slice.call(arguments, 2);
-    return setTimeout(function(){ return func.apply(func, args); }, wait);
-  };
-
-  // Defers a function, scheduling it to run after the current call stack has
-  // cleared.
-  _.defer = function(func) {
-    return _.delay.apply(_, [func, 1].concat(slice.call(arguments, 1)));
-  };
-
-  // Returns a function, that, when invoked, will only be triggered at most once
-  // during a given window of time.
-  _.throttle = function(func, wait) {
-    var context, args, timeout, throttling, more;
-    var whenDone = _.debounce(function(){ more = throttling = false; }, wait);
-    return function() {
-      context = this; args = arguments;
-      var later = function() {
-        timeout = null;
-        if (more) func.apply(context, args);
-        whenDone();
-      };
-      if (!timeout) timeout = setTimeout(later, wait);
-      if (throttling) {
-        more = true;
-      } else {
-        func.apply(context, args);
-      }
-      whenDone();
-      throttling = true;
-    };
-  };
-
-  // Returns a function, that, as long as it continues to be invoked, will not
-  // be triggered. The function will be called after it stops being called for
-  // N milliseconds.
-  _.debounce = function(func, wait) {
-    var timeout;
-    return function() {
-      var context = this, args = arguments;
-      var later = function() {
-        timeout = null;
-        func.apply(context, args);
-      };
-      clearTimeout(timeout);
-      timeout = setTimeout(later, wait);
-    };
-  };
-
-  // Returns a function that will be executed at most one time, no matter how
-  // often you call it. Useful for lazy initialization.
-  _.once = function(func) {
-    var ran = false, memo;
-    return function() {
-      if (ran) return memo;
-      ran = true;
-      return memo = func.apply(this, arguments);
-    };
-  };
-
-  // Returns the first function passed as an argument to the second,
-  // allowing you to adjust arguments, run code before and after, and
-  // conditionally execute the original function.
-  _.wrap = function(func, wrapper) {
-    return function() {
-      var args = [func].concat(slice.call(arguments, 0));
-      return wrapper.apply(this, args);
-    };
-  };
-
-  // Returns a function that is the composition of a list of functions, each
-  // consuming the return value of the function that follows.
-  _.compose = function() {
-    var funcs = arguments;
-    return function() {
-      var args = arguments;
-      for (var i = funcs.length - 1; i >= 0; i--) {
-        args = [funcs[i].apply(this, args)];
-      }
-      return args[0];
-    };
-  };
-
-  // Returns a function that will only be executed after being called N times.
-  _.after = function(times, func) {
-    if (times <= 0) return func();
-    return function() {
-      if (--times < 1) { return func.apply(this, arguments); }
-    };
-  };
-
-  // Object Functions
-  // ----------------
-
-  // Retrieve the names of an object's properties.
-  // Delegates to **ECMAScript 5**'s native `Object.keys`
-  _.keys = nativeKeys || function(obj) {
-    if (obj !== Object(obj)) throw new TypeError('Invalid object');
-    var keys = [];
-    for (var key in obj) if (_.has(obj, key)) keys[keys.length] = key;
-    return keys;
-  };
-
-  // Retrieve the values of an object's properties.
-  _.values = function(obj) {
-    return _.map(obj, _.identity);
-  };
-
-  // Return a sorted list of the function names available on the object.
-  // Aliased as `methods`
-  _.functions = _.methods = function(obj) {
-    var names = [];
-    for (var key in obj) {
-      if (_.isFunction(obj[key])) names.push(key);
-    }
-    return names.sort();
-  };
-
-  // Extend a given object with all the properties in passed-in object(s).
-  _.extend = function(obj) {
-    each(slice.call(arguments, 1), function(source) {
-      for (var prop in source) {
-        obj[prop] = source[prop];
-      }
-    });
-    return obj;
-  };
-
-  // Fill in a given object with default properties.
-  _.defaults = function(obj) {
-    each(slice.call(arguments, 1), function(source) {
-      for (var prop in source) {
-        if (obj[prop] == null) obj[prop] = source[prop];
-      }
-    });
-    return obj;
-  };
-
-  // Create a (shallow-cloned) duplicate of an object.
-  _.clone = function(obj) {
-    if (!_.isObject(obj)) return obj;
-    return _.isArray(obj) ? obj.slice() : _.extend({}, obj);
-  };
-
-  // Invokes interceptor with the obj, and then returns obj.
-  // The primary purpose of this method is to "tap into" a method chain, in
-  // order to perform operations on intermediate results within the chain.
-  _.tap = function(obj, interceptor) {
-    interceptor(obj);
-    return obj;
-  };
-
-  // Internal recursive comparison function.
-  function eq(a, b, stack) {
-    // Identical objects are equal. `0 === -0`, but they aren't identical.
-    // See the Harmony `egal` proposal: http://wiki.ecmascript.org/doku.php?id=harmony:egal.
-    if (a === b) return a !== 0 || 1 / a == 1 / b;
-    // A strict comparison is necessary because `null == undefined`.
-    if (a == null || b == null) return a === b;
-    // Unwrap any wrapped objects.
-    if (a._chain) a = a._wrapped;
-    if (b._chain) b = b._wrapped;
-    // Invoke a custom `isEqual` method if one is provided.
-    if (a.isEqual && _.isFunction(a.isEqual)) return a.isEqual(b);
-    if (b.isEqual && _.isFunction(b.isEqual)) return b.isEqual(a);
-    // Compare `[[Class]]` names.
-    var className = toString.call(a);
-    if (className != toString.call(b)) return false;
-    switch (className) {
-      // Strings, numbers, dates, and booleans are compared by value.
-      case '[object String]':
-        // Primitives and their corresponding object wrappers are equivalent; thus, `"5"` is
-        // equivalent to `new String("5")`.
-        return a == String(b);
-      case '[object Number]':
-        // `NaN`s are equivalent, but non-reflexive. An `egal` comparison is performed for
-        // other numeric values.
-        return a != +a ? b != +b : (a == 0 ? 1 / a == 1 / b : a == +b);
-      case '[object Date]':
-      case '[object Boolean]':
-        // Coerce dates and booleans to numeric primitive values. Dates are compared by their
-        // millisecond representations. Note that invalid dates with millisecond representations
-        // of `NaN` are not equivalent.
-        return +a == +b;
-      // RegExps are compared by their source patterns and flags.
-      case '[object RegExp]':
-        return a.source == b.source &&
-               a.global == b.global &&
-               a.multiline == b.multiline &&
-               a.ignoreCase == b.ignoreCase;
-    }
-    if (typeof a != 'object' || typeof b != 'object') return false;
-    // Assume equality for cyclic structures. The algorithm for detecting cyclic
-    // structures is adapted from ES 5.1 section 15.12.3, abstract operation `JO`.
-    var length = stack.length;
-    while (length--) {
-      // Linear search. Performance is inversely proportional to the number of
-      // unique nested structures.
-      if (stack[length] == a) return true;
-    }
-    // Add the first object to the stack of traversed objects.
-    stack.push(a);
-    var size = 0, result = true;
-    // Recursively compare objects and arrays.
-    if (className == '[object Array]') {
-      // Compare array lengths to determine if a deep comparison is necessary.
-      size = a.length;
-      result = size == b.length;
-      if (result) {
-        // Deep compare the contents, ignoring non-numeric properties.
-        while (size--) {
-          // Ensure commutative equality for sparse arrays.
-          if (!(result = size in a == size in b && eq(a[size], b[size], stack))) break;
-        }
-      }
-    } else {
-      // Objects with different constructors are not equivalent.
-      if ('constructor' in a != 'constructor' in b || a.constructor != b.constructor) return false;
-      // Deep compare objects.
-      for (var key in a) {
-        if (_.has(a, key)) {
-          // Count the expected number of properties.
-          size++;
-          // Deep compare each member.
-          if (!(result = _.has(b, key) && eq(a[key], b[key], stack))) break;
-        }
-      }
-      // Ensure that both objects contain the same number of properties.
-      if (result) {
-        for (key in b) {
-          if (_.has(b, key) && !(size--)) break;
-        }
-        result = !size;
-      }
-    }
-    // Remove the first object from the stack of traversed objects.
-    stack.pop();
-    return result;
-  }
-
-  // Perform a deep comparison to check if two objects are equal.
-  _.isEqual = function(a, b) {
-    return eq(a, b, []);
-  };
-
-  // Is a given array, string, or object empty?
-  // An "empty" object has no enumerable own-properties.
-  _.isEmpty = function(obj) {
-    if (_.isArray(obj) || _.isString(obj)) return obj.length === 0;
-    for (var key in obj) if (_.has(obj, key)) return false;
-    return true;
-  };
-
-  // Is a given value a DOM element?
-  _.isElement = function(obj) {
-    return !!(obj && obj.nodeType == 1);
-  };
-
-  // Is a given value an array?
-  // Delegates to ECMA5's native Array.isArray
-  _.isArray = nativeIsArray || function(obj) {
-    return toString.call(obj) == '[object Array]';
-  };
-
-  // Is a given variable an object?
-  _.isObject = function(obj) {
-    return obj === Object(obj);
-  };
-
-  // Is a given variable an arguments object?
-  _.isArguments = function(obj) {
-    return toString.call(obj) == '[object Arguments]';
-  };
-  if (!_.isArguments(arguments)) {
-    _.isArguments = function(obj) {
-      return !!(obj && _.has(obj, 'callee'));
-    };
-  }
-
-  // Is a given value a function?
-  _.isFunction = function(obj) {
-    return toString.call(obj) == '[object Function]';
-  };
-
-  // Is a given value a string?
-  _.isString = function(obj) {
-    return toString.call(obj) == '[object String]';
-  };
-
-  // Is a given value a number?
-  _.isNumber = function(obj) {
-    return toString.call(obj) == '[object Number]';
-  };
-
-  // Is the given value `NaN`?
-  _.isNaN = function(obj) {
-    // `NaN` is the only value for which `===` is not reflexive.
-    return obj !== obj;
-  };
-
-  // Is a given value a boolean?
-  _.isBoolean = function(obj) {
-    return obj === true || obj === false || toString.call(obj) == '[object Boolean]';
-  };
-
-  // Is a given value a date?
-  _.isDate = function(obj) {
-    return toString.call(obj) == '[object Date]';
-  };
-
-  // Is the given value a regular expression?
-  _.isRegExp = function(obj) {
-    return toString.call(obj) == '[object RegExp]';
-  };
-
-  // Is a given value equal to null?
-  _.isNull = function(obj) {
-    return obj === null;
-  };
-
-  // Is a given variable undefined?
-  _.isUndefined = function(obj) {
-    return obj === void 0;
-  };
-
-  // Has own property?
-  _.has = function(obj, key) {
-    return hasOwnProperty.call(obj, key);
-  };
-
-  // Utility Functions
-  // -----------------
-
-  // Run Underscore.js in *noConflict* mode, returning the `_` variable to its
-  // previous owner. Returns a reference to the Underscore object.
-  _.noConflict = function() {
-    root._ = previousUnderscore;
-    return this;
-  };
-
-  // Keep the identity function around for default iterators.
-  _.identity = function(value) {
-    return value;
-  };
-
-  // Run a function **n** times.
-  _.times = function (n, iterator, context) {
-    for (var i = 0; i < n; i++) iterator.call(context, i);
-  };
-
-  // Escape a string for HTML interpolation.
-  _.escape = function(string) {
-    return (''+string).replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;').replace(/'/g, '&#x27;').replace(/\//g,'&#x2F;');
-  };
-
-  // Add your own custom functions to the Underscore object, ensuring that
-  // they're correctly added to the OOP wrapper as well.
-  _.mixin = function(obj) {
-    each(_.functions(obj), function(name){
-      addToWrapper(name, _[name] = obj[name]);
-    });
-  };
-
-  // Generate a unique integer id (unique within the entire client session).
-  // Useful for temporary DOM ids.
-  var idCounter = 0;
-  _.uniqueId = function(prefix) {
-    var id = idCounter++;
-    return prefix ? prefix + id : id;
-  };
-
-  // By default, Underscore uses ERB-style template delimiters, change the
-  // following template settings to use alternative delimiters.
-  _.templateSettings = {
-    evaluate    : /<%([\s\S]+?)%>/g,
-    interpolate : /<%=([\s\S]+?)%>/g,
-    escape      : /<%-([\s\S]+?)%>/g
-  };
-
-  // When customizing `templateSettings`, if you don't want to define an
-  // interpolation, evaluation or escaping regex, we need one that is
-  // guaranteed not to match.
-  var noMatch = /.^/;
-
-  // Within an interpolation, evaluation, or escaping, remove HTML escaping
-  // that had been previously added.
-  var unescape = function(code) {
-    return code.replace(/\\\\/g, '\\').replace(/\\'/g, "'");
-  };
-
-  // JavaScript micro-templating, similar to John Resig's implementation.
-  // Underscore templating handles arbitrary delimiters, preserves whitespace,
-  // and correctly escapes quotes within interpolated code.
-  _.template = function(str, data) {
-    var c  = _.templateSettings;
-    var tmpl = 'var __p=[],print=function(){__p.push.apply(__p,arguments);};' +
-      'with(obj||{}){__p.push(\'' +
-      str.replace(/\\/g, '\\\\')
-         .replace(/'/g, "\\'")
-         .replace(c.escape || noMatch, function(match, code) {
-           return "',_.escape(" + unescape(code) + "),'";
-         })
-         .replace(c.interpolate || noMatch, function(match, code) {
-           return "'," + unescape(code) + ",'";
-         })
-         .replace(c.evaluate || noMatch, function(match, code) {
-           return "');" + unescape(code).replace(/[\r\n\t]/g, ' ') + ";__p.push('";
-         })
-         .replace(/\r/g, '\\r')
-         .replace(/\n/g, '\\n')
-         .replace(/\t/g, '\\t')
-         + "');}return __p.join('');";
-    var func = new Function('obj', '_', tmpl);
-    if (data) return func(data, _);
-    return function(data) {
-      return func.call(this, data, _);
-    };
-  };
-
-  // Add a "chain" function, which will delegate to the wrapper.
-  _.chain = function(obj) {
-    return _(obj).chain();
-  };
-
-  // The OOP Wrapper
-  // ---------------
-
-  // If Underscore is called as a function, it returns a wrapped object that
-  // can be used OO-style. This wrapper holds altered versions of all the
-  // underscore functions. Wrapped objects may be chained.
-  var wrapper = function(obj) { this._wrapped = obj; };
-
-  // Expose `wrapper.prototype` as `_.prototype`
-  _.prototype = wrapper.prototype;
-
-  // Helper function to continue chaining intermediate results.
-  var result = function(obj, chain) {
-    return chain ? _(obj).chain() : obj;
-  };
-
-  // A method to easily add functions to the OOP wrapper.
-  var addToWrapper = function(name, func) {
-    wrapper.prototype[name] = function() {
-      var args = slice.call(arguments);
-      unshift.call(args, this._wrapped);
-      return result(func.apply(_, args), this._chain);
-    };
-  };
-
-  // Add all of the Underscore functions to the wrapper object.
-  _.mixin(_);
-
-  // Add all mutator Array functions to the wrapper.
-  each(['pop', 'push', 'reverse', 'shift', 'sort', 'splice', 'unshift'], function(name) {
-    var method = ArrayProto[name];
-    wrapper.prototype[name] = function() {
-      var wrapped = this._wrapped;
-      method.apply(wrapped, arguments);
-      var length = wrapped.length;
-      if ((name == 'shift' || name == 'splice') && length === 0) delete wrapped[0];
-      return result(wrapped, this._chain);
-    };
-  });
-
-  // Add all accessor Array functions to the wrapper.
-  each(['concat', 'join', 'slice'], function(name) {
-    var method = ArrayProto[name];
-    wrapper.prototype[name] = function() {
-      return result(method.apply(this._wrapped, arguments), this._chain);
-    };
-  });
-
-  // Start chaining a wrapped Underscore object.
-  wrapper.prototype.chain = function() {
-    this._chain = true;
-    return this;
-  };
-
-  // Extracts the result from a wrapped and chained object.
-  wrapper.prototype.value = function() {
-    return this._wrapped;
-  };
-
-}).call(this);
diff --git a/addons/im_livechat/static/ext/test.html b/addons/im_livechat/static/ext/test.html
deleted file mode 100644
index 22d33261227..00000000000
--- a/addons/im_livechat/static/ext/test.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <script type="text/javascript" src="http://localhost/im_livechat/static/ext/static/lib/requirejs/require.js"></script>
-    <script type="text/javascript" src='http://localhost/im_livechat/loader?p={"db":"testtrunk","channel":1}'></script>
-</head>
-<body style="height:100%; margin:0; padding:0;">
-    <iframe src="http://openerp.com" height="100%" width=100%"></iframe>
-</body>
-</html>
\ No newline at end of file
diff --git a/addons/im_livechat/static/src/js/im_livechat.js b/addons/im_livechat/static/src/js/im_livechat.js
new file mode 100644
index 00000000000..ba091c32db8
--- /dev/null
+++ b/addons/im_livechat/static/src/js/im_livechat.js
@@ -0,0 +1,146 @@
+/*
+    This file must compile in EcmaScript 3 and work in IE7.
+*/
+
+(function() {
+
+    "use strict";
+
+    var _t = openerp._t;
+
+    var im_livechat = {};
+    openerp.im_livechat = im_livechat;
+
+    /*
+    The state of anonymous session is hold by the client and not the server.
+    Override the method managing the state of normal conversation.
+    */
+    openerp.im_chat.Conversation.include({
+        init: function(){
+            this._super.apply(this, arguments);
+            this.shown = true;
+            this.loading_history = false; // unactivate the loading history
+        },
+        show: function(){
+            this._super.apply(this, arguments);
+            this.shown = true;
+        },
+        hide: function(){
+            this._super.apply(this, arguments);
+            this.shown = false;
+        },
+        update_fold_state: function(state){
+            if(state === 'closed'){
+                this.destroy();
+            }else{
+                if(state === 'open'){
+                    this.show();
+                }else{
+                    if(this.shown){
+                        state = 'fold';
+                        this.hide();
+                    }else{
+                        state = 'open';
+                        this.show();
+                    }
+                }
+            }
+            var session = this.get('session');
+            session.state = state;
+            this.set('session', session);
+        },
+    });
+
+    im_livechat.LiveSupport = openerp.Widget.extend({
+        init: function(server_url, db, channel, options) {
+            options = options || {};
+            _.defaults(options, {
+                buttonText: _t("Chat with one of our collaborators"),
+                inputPlaceholder: null,
+                defaultMessage: _t("How may I help you?"),
+                defaultUsername: _t("Anonymous"),
+            });
+            openerp.session = new openerp.Session();
+
+            // load the qweb templates
+            var defs = [];
+            var templates = ['/im_livechat/static/src/xml/im_livechat.xml','/im_chat/static/src/xml/im_chat.xml'];
+            _.each(templates, function(tmpl){
+                defs.push(openerp.session.rpc('/web/proxy/load', {path: tmpl}).then(function(xml) {
+                    openerp.qweb.add_template(xml);
+                }));
+            });
+            return $.when.apply($, defs).then(function() {
+                return openerp.session.rpc("/im_livechat/available", {db: db, channel: channel}).then(function(activated) {
+                    if(activated){
+                        var button = new im_livechat.ChatButton(null, channel, options);
+                        button.appendTo($("body"));
+                        if (options.auto){
+                            button.click();
+                        }
+                    }
+                });
+            });
+        },
+    });
+
+    im_livechat.ChatButton = openerp.Widget.extend({
+        className: "openerp_style oe_chat_button",
+        events: {
+            "click": "click"
+        },
+        init: function(parent, channel, options) {
+            this._super(parent);
+            this.channel = channel;
+            this.options = options;
+            this.text = options.buttonText;
+        },
+        start: function() {
+            this.$().append(openerp.qweb.render("chatButton", {widget: this}));
+        },
+        click: function() {
+            if (! this.manager) {
+                this.manager = new openerp.im_chat.ConversationManager(this, this.options);
+                this.manager.set("bottom_offset", $('.oe_chat_button').outerHeight()); // TODO correct the value (no hardcode damned !)
+                // override the notification default function
+                this.manager.notification = function(notif){
+                }
+            }
+            return this.chat();
+        },
+        chat: function() {
+            var self = this;
+            if (_.keys(this.manager.sessions).length > 0)
+                return;
+
+            openerp.session.rpc("/im_livechat/get_session", {"channel_id" : self.channel, "anonymous_name" : this.options["defaultUsername"]}, {shadow: true}).then(function(session) {
+                if (! session) {
+                    self.manager.notification(_t("None of our collaborators seems to be available, please try again later."));
+                    return;
+                }
+                var conv = self.manager.activate_session(session, [], true);
+                // start the polling
+                openerp.bus.bus.add_channel(session.uuid);
+                openerp.bus.bus.start_polling();
+                // add the automatic welcome message
+                if(session.users.length > 0){
+                    if (self.options.defaultMessage) {
+                        setTimeout(function(){
+                            conv.received_message({
+                                id : 1,
+                                type: "message",
+                                message: self.options.defaultMessage,
+                                create_date: openerp.datetime_to_str(new Date()),
+                                from_id: [session.users[0].id, session.users[0].name],
+                                to_id: [0, session.uuid]
+                            });
+                        }, 1000);
+                    }
+                }
+            });
+        }
+    });
+
+    return im_livechat;
+
+})();
diff --git a/addons/im_livechat/static/ext/static/js/livechat.xml b/addons/im_livechat/static/src/xml/im_livechat.xml
similarity index 100%
rename from addons/im_livechat/static/ext/static/js/livechat.xml
rename to addons/im_livechat/static/src/xml/im_livechat.xml
diff --git a/addons/im_livechat/views/im_livechat.xml b/addons/im_livechat/views/im_livechat.xml
new file mode 100644
index 00000000000..d2473571656
--- /dev/null
+++ b/addons/im_livechat/views/im_livechat.xml
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- vim:fdn=3:
+-->
+<openerp>
+    <data>
+
+        <!-- Template rendering the external HTML support page -->
+        <template id="support_page" name="Livechat Support Page">
+            &lt;!DOCTYPE html&gt;
+            <html style="height: 100%">
+                <head>
+                    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
+                    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+                    <title><t t-esc="channel_name"/> Livechat Support Page</title>
+
+                    <!-- Call the external Bundle to render the css, js, and js loader tags -->
+                    <t t-call="im_livechat.external_loader"/>
+
+                    <style type="text/css">
+                        body {
+                            height: 100%;
+                            font-size: 16px;
+                            font-weight: 400;
+                            font-family: "Lato", "Lucida Grande", "Helvetica neue", "Helvetica", "Verdana", "Arial", sans-serif;
+                            overflow: hidden;
+                            overflow-y: auto;
+                            display: block;
+                            margin: 0;
+                            padding: 0;
+                            border: none;
+                            width: 100%;
+                            height: 100%;
+                            background: #C9C8E0;
+                            background-image: -webkit-linear-gradient(top, #7c7bad, #ddddee);
+                            background-image: -moz-linear-gradient(top, #7c7bad, #ddddee);
+                            background-image: -ms-linear-gradient(top, #7c7bad, #ddddee);
+                            background-image: -o-linear-gradient(top, #7c7bad, #ddddee);
+                            background-image: linear-gradient(to bottom, #7c7bad, #ddddee);
+                            filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#7c7bad', endColorstr='#ddddee',GradientType=0 );
+                            -webkit-background-size: cover;
+                            -moz-background-size: cover;
+                            -o-background-size: cover;
+                            background-size: cover;
+                            background-repeat: no-repeat;
+                            background-attachment: fixed;
+                        }
+                        .main {
+                            position: absolute;
+                            opacity: 0;
+                            top: 50%;
+                            width: 100%;
+                            margin-top: -150px;
+                            color: white;
+                            text-shadow: 0 1px 0 rgba(34, 52, 72, 0.2);
+                            text-align: center;
+                        }
+                        .main h1 {
+                            font-size: 54px;
+                        }
+                        .main div {
+                            font-style: italic;
+                        }
+                    </style>
+                </head>
+
+                <body>
+                     <div class="main" style="opacity: 1;">
+                        <h1 class="channel_name"><t t-esc="channel_name"/></h1>
+                        <div>Live Chat Powered by <strong>Odoo</strong>.</div>
+                    </div>
+                </body>
+            </html>
+        </template>
+
+
+        <!-- Template rendering all the scripts required to execute the Livechat from an external page (which not contain Odoo) -->
+        <template id="external_loader" name="All the scripts to launch the LiveSupport from an external Web Page">
+            <!-- css style -->
+            <link t-att-href="'%s/web/css/im_livechat.external_lib' % (url)" rel="stylesheet"/>
+            <!-- js of all the required lib (internal and external) -->
+            <script t-att-src="'%s/web/js/im_livechat.external_lib' % (url)" type="text/javascript" />
+            <!-- the loader -->
+            <script t-att-src="'%s/im_livechat/loader/%s/%i' % (url, dbname, channel)" type="text/javascript" />
+        </template>
+
+        <!-- Template rendering all the scripts required to execute the Livechat from a page containing Odoo -->
+        <template id="internal_loader" name="All the scripts to launch the LiveSupport from an internal Web Page">
+            <!-- css style -->
+            <link t-att-href="'%s/web/css/im_livechat.internal_lib' % (url)" rel="stylesheet"/>
+            <!-- js of all the required lib (internal and external) -->
+            <script t-att-src="'%s/web/js/im_livechat.internal_lib' % (url)" type="text/javascript" />
+            <!-- the loader -->
+            <script t-att-src="'%s/im_livechat/loader/%s/%i' % (url, dbname, channel)" type="text/javascript" />
+        </template>
+
+        <!-- Bundle of External Librairies of the Livechat -->
+        <template id="external_lib" name="External Librairies of the Livechat, required to make it work">
+            <!-- OpenERP minimal lib -->
+            <script type="text/javascript" src="/web/static/lib/underscore/underscore.js"></script>
+            <script type="text/javascript" src="/web/static/lib/underscore.string/lib/underscore.string.js"></script>
+            <script type="text/javascript" src="/web/static/lib/jquery/jquery.js"></script>
+            <script type="text/javascript" src="/web/static/lib/qweb/qweb2.js"></script>
+            <script type="text/javascript" src="/web/static/src/js/openerpframework.js"></script>
+            <!-- add the internal lib -->
+            <t t-call="im_livechat.internal_lib"/>
+        </template>
+
+        <!-- Bundle of Librairies of the Bus, Chat, Livechat -->
+        <template id="internal_lib" name="Librairies of the Livechat">
+            <!-- Datejs -->
+            <script type="text/javascript" src="/web/static/lib/datejs/globalization/en-US.js"></script>
+            <script type="text/javascript" src="/web/static/lib/datejs/core.js"></script>
+            <script type="text/javascript" src="/web/static/lib/datejs/parser.js"></script>
+            <script type="text/javascript" src="/web/static/lib/datejs/sugarpak.js"></script>
+            <script type="text/javascript" src="/web/static/lib/datejs/extras.js"></script>
+            <!-- IM module -->
+            <script type="text/javascript" src="/bus/static/src/js/bus.js"></script>
+            <script type="text/javascript" src="/im_chat/static/src/js/im_chat.js"></script>
+            <script type="text/javascript" src="/im_livechat/static/lib/jquery-achtung/src/ui.achtung.js"></script>
+            <script type="text/javascript" src="/im_livechat/static/src/js/im_livechat.js"></script>
+            <!-- CSS -->
+            <link rel="stylesheet" href="/im_chat/static/src/css/im_common.css"></link>
+            <link rel="stylesheet" href="/im_livechat/static/lib/jquery-achtung/src/ui.achtung.css"></link>
+        </template>
+
+        <!-- the js code to initialize the LiveSupport object -->
+        <template id="loader" name="Javascript initializing the LiveSupport">
+            (function() {
+                window.livesupport = new openerp.im_livechat.LiveSupport(
+                    "<t t-esc="url"/>",
+                    "<t t-esc="dbname"/>",
+                    <t t-esc="channel"/>,
+                    {
+                        buttonText: "<t t-esc="buttonText"/>",
+                        inputPlaceholder: "<t t-esc="inputPlaceholder"/>",
+                        defaultMessage: "<t t-esc="defaultMessage"/>" || '',
+                        auto: window.oe_im_livechat_auto || false,
+                        defaultUsername: "<t t-esc="username"/>" || undefined,
+                    });
+            })();
+        </template>
+
+    </data>
+</openerp>
diff --git a/addons/im_livechat/im_livechat_view.xml b/addons/im_livechat/views/im_livechat_view.xml
similarity index 85%
rename from addons/im_livechat/im_livechat_view.xml
rename to addons/im_livechat/views/im_livechat_view.xml
index 1be26e23294..8f14a81efc7 100644
--- a/addons/im_livechat/im_livechat_view.xml
+++ b/addons/im_livechat/views/im_livechat_view.xml
@@ -60,7 +60,7 @@
             <field name="name">support_channel.form</field>
             <field name="model">im_livechat.channel</field>
             <field name="arch" type="xml">
-                <form string="Support Channels">
+                <form string="Support Channels" version="7.0">
                 <sheet>
                     <field name="image" widget='image' class="oe_avatar oe_left" options='{"preview_image": "image_medium"}'/>
                     <div class="oe_title">
@@ -108,11 +108,12 @@
                         <p>
                             Copy and paste this code into your website, within the &amp;lt;head&amp;gt; tag:
                         </p>
-                        <field name="script" readonly="1" class="oe_tag"/>
+                        <field name="script_external" readonly="1" class="oe_tag"/>
                         <p>
                             or copy this url and send it by email to your customers or suppliers:
                         </p>
                         <field name="web_page" readonly="1" class="oe_tag"/>
+                        <p>For website built with Odoo CMS, please install the website_livechat module. Then go to Settings > Website Settings and select the Live Chat Channel you want to add on your website.</p>
                     </div>
 
                 </sheet>
@@ -122,20 +123,20 @@
 
         <record model="ir.actions.act_window" id="action_history">
             <field name="name">History</field>
-            <field name="res_model">im.message</field>
+            <field name="res_model">im_chat.message</field>
             <field name="view_mode">list</field>
-            <field name="domain">[('session_id.channel_id', '!=', None)]</field>
-            <field name="context">{'search_default_group_by_session_id': 1, 'search_default_group_by_date': 1, 'search_default_session_id': 1}</field>
+            <field name="domain">[('to_id.channel_id', '!=', None)]</field>
+            <field name="context">{'search_default_group_by_to_id': 1}</field>
         </record>
         <menuitem name="History" parent="im_livechat" id="history" action="action_history" groups="group_im_livechat_manager"/>
 
         <record id="im_message_form" model="ir.ui.view">
-            <field name="name">im.message.tree</field>
-            <field name="model">im.message</field>
+            <field name="name">im.chat.message.tree</field>
+            <field name="model">im_chat.message</field>
             <field name="arch" type="xml">
                 <tree string="History" create="false">
-                    <field name="session_id"/>
-                    <field name="date"/>
+                    <field name="to_id"/>
+                    <field name="create_date"/>
                     <field name="from_id"/>
                     <field name="message"/>
                 </tree>
@@ -143,16 +144,16 @@
         </record>
 
         <record id="im_message_search" model="ir.ui.view">
-            <field name="name">im.message.search</field>
-            <field name="model">im.message</field>
+            <field name="name">im.chat.message.search</field>
+            <field name="model">im_chat.message</field>
             <field name="arch" type="xml">
                 <search string="Search history">
-                    <filter name="session_id" string="My Sessions" domain="[('session_id.user_ids','in', uid)]"/>
+                    <filter name="to_id" string="My Sessions" domain="[('to_id.user_ids','in', uid)]"/>
                     <field name="from_id"/>
                     <field name="to_id"/>
-                    <group expand="0" string="Group By">
-                        <filter name="group_by_session_id" string="Session" domain="[]" context="{'group_by':'session_id'}"/>
-                        <filter name="group_by_date" string="Date" domain="[]" context="{'group_by':'date'}"/>
+                    <group expand="0" string="Group By...">
+                        <filter name="group_by_to_id" string="Session" domain="[]" context="{'group_by':'to_id'}"/>
+                        <filter name="group_by_date" string="Date" domain="[]" context="{'group_by':'create_date'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/im_livechat/web_page.html b/addons/im_livechat/web_page.html
deleted file mode 100644
index 2e1ea609126..00000000000
--- a/addons/im_livechat/web_page.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <script type="text/javascript">
-        window.oe_im_livechat_auto = true;
-    </script>
-    {{script}}
-    <style type="text/css">
-        body {
-            height: 100%;
-            font-size: 16px;
-            font-weight: 400;
-            font-family: "Lato", "Lucida Grande", "Helvetica neue", "Helvetica", "Verdana", "Arial", sans-serif;
-            overflow: hidden;
-            overflow-y: auto;
-            display: block;
-            margin: 0;
-            padding: 0;
-            border: none;
-            width: 100%;
-            height: 100%;
-            background: #C9C8E0;
-            background-image: -webkit-linear-gradient(top, #7c7bad, #ddddee);
-            background-image: -moz-linear-gradient(top, #7c7bad, #ddddee);
-            background-image: -ms-linear-gradient(top, #7c7bad, #ddddee);
-            background-image: -o-linear-gradient(top, #7c7bad, #ddddee);
-            background-image: linear-gradient(to bottom, #7c7bad, #ddddee);
-            filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#7c7bad', endColorstr='#ddddee',GradientType=0 );
-            -webkit-background-size: cover;
-            -moz-background-size: cover;
-            -o-background-size: cover;
-            background-size: cover;
-            background-repeat: no-repeat;
-            background-attachment: fixed;
-        }
-        .main {
-            position: absolute;
-            opacity: 0;
-            top: 50%;
-            width: 100%;
-            margin-top: -150px;
-            color: white;
-            text-shadow: 0 1px 0 rgba(34, 52, 72, 0.2);
-            z-index: 10;
-            text-align: center;
-        }
-        .main h1 {
-            font-size: 54px;
-        }
-        .main div {
-            font-style: italic;
-        }
-    </style>
-</head>
-<body>
-    <div class="main" style="opacity: 1;">
-        <h1 class="channel_name">{{channelName | escape}}</h1>
-        <div>Live Chat Powered by <strong>OpenERP</strong>.</div>
-    </div>
-</body>
-</html>
diff --git a/addons/website_livechat/__openerp__.py b/addons/website_livechat/__openerp__.py
index 5220fc47bb6..e41f2072a42 100644
--- a/addons/website_livechat/__openerp__.py
+++ b/addons/website_livechat/__openerp__.py
@@ -1,12 +1,12 @@
 {
-    'name': 'LiveChat',
+    'name': 'Website Live Support',
     'category': 'Website',
     'summary': 'Chat With Your Website Visitors',
     'version': '1.0',
     'description': """
-OpenERP Website LiveChat
+Odoo Website LiveChat
 ========================
-
+For website built with Odoo CMS, this module include a chat button on your Website, and allow your visitors to chat with your collabarators.
         """,
     'author': 'OpenERP SA',
     'depends': ['website', 'im_livechat'],
diff --git a/addons/website_livechat/views/website_livechat.xml b/addons/website_livechat/views/website_livechat.xml
index 374e0d5dd16..4f2931e5ad1 100644
--- a/addons/website_livechat/views/website_livechat.xml
+++ b/addons/website_livechat/views/website_livechat.xml
@@ -2,10 +2,10 @@
 <openerp>
     <data>
 
-<template id="header" inherit_id="website.layout" name="LiveChat Snippet">
-    <xpath expr="//body" position="inside">
+<template id="header" inherit_id="website.layout" name="LiveChat Import (internal) Scripts">
+    <xpath expr="//head" position="inside">
         <t t-if="website.channel_id">
-            <t t-raw="website.channel_id.script"/>
+            <t t-raw="website.channel_id.script_internal"/>
         </t>
     </xpath>
 </template>

From 4bc43e6ac28e783885db04d634d2bf3cca2048fc Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sun, 29 Jun 2014 03:48:32 +0200
Subject: [PATCH 5/6] [FIX] website snippet editor initialisation

---
 addons/website/static/src/js/website.snippets.editor.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index 64854442af7..61a60b2b0c5 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -1565,7 +1565,9 @@
         */
         _readXMLData: function() {
             var self = this;
-            this.$el = this.BuildingBlock.$snippets.filter(function () { return $(this).data("snippet-id") == self.snippet_id; }).clone();
+            if(this && this.BuildingBlock && this.BuildingBlock.$snippets) {
+                this.$el = this.BuildingBlock.$snippets.filter(function () { return $(this).data("snippet-id") == self.snippet_id; }).clone();
+            }
             var $options = this.$overlay.find(".oe_overlay_options");
             if ($options.find(".oe_options ul li").length) {
                 $options.find(".oe_options").removeClass("hidden");

From 67a2106e3a7110292b4e5717cc87dff17496e6b5 Mon Sep 17 00:00:00 2001
From: "jeff@osbzr.com" <jeff@osbzr.com>
Date: Fri, 27 Jun 2014 16:33:17 +0800
Subject: [PATCH 6/6] [IMP] l10n_cn: upgrade to 1.8, including small business
 chart

Also removed empty translation files.

This is a manual rebase of PR #802
---
 addons/l10n_cn/__init__.py                    |    2 +-
 addons/l10n_cn/__openerp__.py                 |   30 +-
 .../account_chart_small_business_template.xml |  641 ++++++
 ...t_chart.xml => account_chart_template.xml} | 1865 ++++++++---------
 addons/l10n_cn/account_chart_type.xml         |  309 +++
 addons/l10n_cn/account_tax.xml                |   17 +
 addons/l10n_cn/base_data.xml                  |   39 +-
 addons/l10n_cn/i18n/ar.po                     |   62 -
 addons/l10n_cn/i18n/ca.po                     |   82 -
 addons/l10n_cn/i18n/da.po                     |   48 -
 addons/l10n_cn/i18n/es.po                     |   82 -
 addons/l10n_cn/i18n/es_CR.po                  |   83 -
 addons/l10n_cn/i18n/es_MX.po                  |   58 -
 addons/l10n_cn/i18n/es_PY.po                  |   82 -
 addons/l10n_cn/i18n/es_VE.po                  |   58 -
 addons/l10n_cn/i18n/gl.po                     |   81 -
 addons/l10n_cn/i18n/it.po                     |   66 -
 addons/l10n_cn/i18n/l10n_cn.pot               |   47 -
 addons/l10n_cn/i18n/nb.po                     |   64 -
 addons/l10n_cn/i18n/pt_BR.po                  |   79 -
 addons/l10n_cn/i18n/sr@latin.po               |   76 -
 addons/l10n_cn/i18n/tr.po                     |   79 -
 addons/l10n_cn/i18n/zh_CN.po                  |   48 -
 addons/l10n_cn/l10n_chart_cn_wizard.xml       |    8 +
 24 files changed, 1911 insertions(+), 2095 deletions(-)
 create mode 100644 addons/l10n_cn/account_chart_small_business_template.xml
 rename addons/l10n_cn/{account_chart.xml => account_chart_template.xml} (73%)
 create mode 100644 addons/l10n_cn/account_chart_type.xml
 create mode 100644 addons/l10n_cn/account_tax.xml
 delete mode 100644 addons/l10n_cn/i18n/ar.po
 delete mode 100644 addons/l10n_cn/i18n/ca.po
 delete mode 100644 addons/l10n_cn/i18n/da.po
 delete mode 100644 addons/l10n_cn/i18n/es.po
 delete mode 100644 addons/l10n_cn/i18n/es_CR.po
 delete mode 100644 addons/l10n_cn/i18n/es_MX.po
 delete mode 100644 addons/l10n_cn/i18n/es_PY.po
 delete mode 100644 addons/l10n_cn/i18n/es_VE.po
 delete mode 100644 addons/l10n_cn/i18n/gl.po
 delete mode 100644 addons/l10n_cn/i18n/it.po
 delete mode 100644 addons/l10n_cn/i18n/l10n_cn.pot
 delete mode 100644 addons/l10n_cn/i18n/nb.po
 delete mode 100644 addons/l10n_cn/i18n/pt_BR.po
 delete mode 100644 addons/l10n_cn/i18n/sr@latin.po
 delete mode 100644 addons/l10n_cn/i18n/tr.po
 delete mode 100644 addons/l10n_cn/i18n/zh_CN.po

diff --git a/addons/l10n_cn/__init__.py b/addons/l10n_cn/__init__.py
index 0d29405d526..b026f2fe713 100644
--- a/addons/l10n_cn/__init__.py
+++ b/addons/l10n_cn/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2007-2014 Jeff Wang(<http://jeff@osbzr.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
diff --git a/addons/l10n_cn/__openerp__.py b/addons/l10n_cn/__openerp__.py
index 3dd702a2d67..472462f2c72 100644
--- a/addons/l10n_cn/__openerp__.py
+++ b/addons/l10n_cn/__openerp__.py
@@ -1,7 +1,10 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
-#    Copyright (C) 2009 Gábor Dukai
+#    Copyright (C) 2008-2008 凯源吕鑫 lvxin@gmail.com   <basic chart data>
+#                            维智众源 oldrev@gmail.com  <states data>
+#    Copyright (C) 2012-2012 南京盈通 ccdos@intoerp.com <small business chart>
+#    Copyright (C) 2008-now  开阖软件 jeff@osbzr.com    < PM and LTS >
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -18,22 +21,28 @@
 #
 ##############################################################################
 {
-    'name': '中国会计科目表 - Accounting',
-    'version': '1.0',
+    'name': '中国会计科目表',
+    'version': '1.8',
     'category': 'Localization/Account Charts',
-    'author': 'openerp-china.org',
-    'maintainer':'openerp-china.org',
+    'author': 'www.openerp-china.org',
+    'maintainer':'jeff@osbzr.com',
     'website':'http://openerp-china.org',
-    'url': 'http://code.google.com/p/openerp-china/source/browse/#svn/trunk/l10n_cn',
     'description': """
-添加中文省份数据
-科目类型\会计科目表模板\增值税\辅助核算类别\管理会计凭证簿\财务会计凭证簿
-============================================================
+
+    科目类型\会计科目表模板\增值税\辅助核算类别\管理会计凭证簿\财务会计凭证簿
+
+    添加中文省份数据
+
+    增加小企业会计科目表
+    
     """,
     'depends': ['base','account'],
     'demo': [],
     'data': [
-        'account_chart.xml',
+        'account_tax.xml',
+        'account_chart_type.xml',
+        'account_chart_template.xml',
+        'account_chart_small_business_template.xml',
         'l10n_chart_cn_wizard.xml',
         'base_data.xml',
     ],
@@ -44,4 +53,3 @@
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/l10n_cn/account_chart_small_business_template.xml b/addons/l10n_cn/account_chart_small_business_template.xml
new file mode 100644
index 00000000000..810191cccd5
--- /dev/null
+++ b/addons/l10n_cn/account_chart_small_business_template.xml
@@ -0,0 +1,641 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+
+<!--
+
+     Copyright (C) 2012-2012 南京盈通 ccdos@intoerp.com <small business chart>
+     
+会计科目表模板( 小企业会计准则2011)
+
+科目表依据：
+关于印发《小企业会计准则》的通知
+http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
+
+-->
+    <data noupdate="True">
+      
+        <!-- 科目表模板-->
+        <record id="cn_small_business_root" model="account.account.template">
+            <field name="name">会计科目</field>
+            <field name="code">0</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="user_type_all"/>
+        </record>
+
+        <!-- 资产类 -->
+        <record id="small_business_chart1001" model="account.account.template">
+            <field name="code">1001</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">liquidity</field>
+            <field name="name">现金</field>
+            <field name="user_type" ref="user_type_bs1"/>
+        </record>
+        <record id="small_business_chart1002" model="account.account.template">
+            <field name="code">1002</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="name">银行存款</field>
+            <field name="user_type" ref="user_type_bs1"/>
+        </record>
+        <record id="small_business_chart1012" model="account.account.template">
+            <field name="code">1012</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">其他货币资金</field>
+            <field name="user_type" ref="user_type_bs1"/>
+        </record>
+
+        <record id="small_business_chart1101" model="account.account.template">
+            <field name="code">1101</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">短期投资</field>
+            <field name="user_type" ref="user_type_bs2"/>
+        </record>
+
+        <record id="small_business_chart1121" model="account.account.template">
+            <field name="code">1121</field>
+            <field eval="True" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">应收票据</field>
+            <field name="user_type" ref="user_type_bs3"/>
+        </record>
+        <record id="small_business_chart1122" model="account.account.template">
+            <field name="code">1122</field>
+            <field eval="True" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">receivable</field>
+            <field name="name">应收账款</field>
+            <field name="user_type" ref="user_type_bs6"/>
+        </record>
+        <record id="small_business_chart1123" model="account.account.template">
+            <field name="code">1123</field>
+            <field eval="True" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">payable</field>
+            <field name="name">预付账款</field>
+            <field name="user_type" ref="user_type_bs6"/>
+        </record>
+        <record id="small_business_chart1131" model="account.account.template">
+            <field name="code">1131</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">应收股利</field>
+            <field name="user_type" ref="user_type_bs4"/>
+        </record>
+        <record id="small_business_chart1132" model="account.account.template">
+            <field name="code">1132</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">应收利息</field>
+            <field name="user_type" ref="user_type_bs5"/>
+        </record>
+        <record id="small_business_chart1221" model="account.account.template">
+            <field name="code">1221</field>
+            <field eval="True" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">其他应收款</field>
+            <field name="user_type" ref="user_type_bs7"/>
+        </record>
+
+        <record id="small_business_chart1401" model="account.account.template">
+            <field name="code">1401</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">材料采购</field>
+            <field name="user_type" ref="user_type_bs10"/>
+        </record>
+        <record id="small_business_chart1402" model="account.account.template">
+            <field name="code">1402</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">在途物资</field>
+            <field name="user_type" ref="user_type_bs10"/>
+        </record>
+        <record id="small_business_chart1403" model="account.account.template">
+            <field name="code">1403</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">原材料</field>
+            <field name="user_type" ref="user_type_bs10"/>
+        </record>
+        <record id="small_business_chart1404" model="account.account.template">
+            <field name="code">1404</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">材料成本差异</field>
+            <field name="user_type" ref="user_type_bs10"/>
+        </record>
+        <record id="small_business_chart1405" model="account.account.template">
+            <field name="code">1405</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">库存商品</field>
+            <field name="user_type" ref="user_type_bs10"/>
+        </record>
+
+        <record id="small_business_chart1407" model="account.account.template">
+            <field name="code">1407</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">商品进销差价</field>
+            <field name="user_type" ref="user_type_bs10"/>
+        </record>
+        <record id="small_business_chart1408" model="account.account.template">
+            <field name="code">1408</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">委托加工物资</field>
+            <field name="user_type" ref="user_type_bs10"/>
+        </record>
+
+        <record id="small_business_chart1411" model="account.account.template">
+            <field name="code">1411</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">周转材料</field>
+            <field name="user_type" ref="user_type_bs10"/>
+        </record>
+
+        <record id="small_business_chart1421" model="account.account.template">
+            <field name="code">1421</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">消耗性生物资产</field>
+            <field name="user_type" ref="user_type_bs10"/>
+        </record>
+
+        <record id="small_business_chart1501" model="account.account.template">
+            <field name="code">1501</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">长期债券投资</field>
+            <field name="user_type" ref="user_type_bs34"/>
+        </record>
+
+        <record id="small_business_chart1511" model="account.account.template">
+            <field name="code">1511</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">长期股权投资</field>
+            <field name="user_type" ref="user_type_bs32"/>
+        </record>
+
+        <record id="small_business_chart1601" model="account.account.template">
+            <field name="code">1601</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">固定资产</field>
+            <field name="user_type" ref="user_type_bs39"/>
+        </record>
+        <record id="small_business_chart1602" model="account.account.template">
+            <field name="code">1602</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">累计折旧</field>
+            <field name="user_type" ref="user_type_bs40"/>
+        </record>
+
+        <record id="small_business_chart1604" model="account.account.template">
+            <field name="code">1604</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">在建工程</field>
+            <field name="user_type" ref="user_type_bs45"/>
+        </record>
+        <record id="small_business_chart1605" model="account.account.template">
+            <field name="code">1605</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">工程物资</field>
+            <field name="user_type" ref="user_type_bs44"/>
+        </record>
+
+        <record id="small_business_chart1606" model="account.account.template">
+            <field name="code">1606</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">固定资产清理</field>
+            <field name="user_type" ref="user_type_bs39"/>
+        </record>
+
+        <record id="small_business_chart1621" model="account.account.template">
+            <field name="code">1621</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">生产性生物资产</field>
+            <field name="user_type" ref="user_type_bs39"/>
+        </record>
+
+        <record id="small_business_chart1602" model="account.account.template">
+            <field name="code">1622</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">生产性生物资产累计折旧</field>
+            <field name="user_type" ref="user_type_bs40"/>
+        </record>
+
+        <record id="small_business_chart1701" model="account.account.template">
+            <field name="code">1701</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">无形资产</field>
+            <field name="user_type" ref="user_type_bs51"/>
+        </record>
+
+        <record id="small_business_chart1702" model="account.account.template">
+            <field name="code">1702</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">累计摊销</field>
+            <field name="user_type" ref="user_type_bs51"/>
+        </record>
+
+        <record id="small_business_chart1801" model="account.account.template">
+            <field name="code">1801</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">长期待摊费用</field>
+            <field name="user_type" ref="user_type_bs52"/>
+        </record>
+
+
+        <record id="small_business_chart1901" model="account.account.template">
+            <field name="code">1901</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">待处理财产损溢</field>
+            <field name="user_type" ref="user_type_bs44"/>
+        </record>
+        
+        
+        <!-- 二、负债类 -->
+        <record id="small_business_chart2001" model="account.account.template">
+            <field name="code">2001</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">短期借款</field>
+            <field name="user_type" ref="user_type_bs68"/>
+        </record>
+
+        <record id="small_business_chart2201" model="account.account.template">
+            <field name="code">2201</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">应付票据</field>
+            <field name="user_type" ref="user_type_bs69"/>
+        </record>
+        <record id="small_business_chart2202" model="account.account.template">
+            <field name="code">2202</field>
+            <field eval="True" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">payable</field>
+            <field name="name">应付账款</field>
+            <field name="user_type" ref="user_type_bs70"/>
+        </record>
+        <record id="small_business_chart2203" model="account.account.template">
+            <field name="code">2203</field>
+            <field eval="True" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">receivable</field>
+            <field name="name">预收账款</field>
+            <field name="user_type" ref="user_type_bs71"/>
+        </record>
+        <record id="small_business_chart2211" model="account.account.template">
+            <field name="code">2211</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">应付职工薪酬</field>
+            <field name="user_type" ref="user_type_bs72"/>
+        </record>
+        <record id="small_business_chart2221" model="account.account.template">
+            <field name="code">2221</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>            
+            <field name="type">other</field>
+            <field name="name">应交税费</field>
+            <field name="user_type" ref="user_type_bs75"/>
+        </record>
+
+        <record id="small_business_chart2231" model="account.account.template">
+            <field name="code">2231</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">应付利息</field>
+            <field name="user_type" ref="user_type_bs74"/>
+        </record>
+        <record id="small_business_chart2232" model="account.account.template">
+            <field name="code">2232</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">应付利润</field>
+            <field name="user_type" ref="user_type_bs74"/>
+        </record>
+
+        <record id="small_business_chart2241" model="account.account.template">
+            <field name="code">2241</field>
+            <field eval="True" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">payable</field>
+            <field name="name">其他应付款</field>
+            <field name="user_type" ref="user_type_bs70"/>
+        </record>
+
+        <record id="small_business_chart2401" model="account.account.template">
+            <field name="code">2401</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">递延收益</field>
+            <field name="user_type" ref="user_type_all"/>
+        </record>
+        <record id="small_business_chart2501" model="account.account.template">
+            <field name="code">2501</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">长期借款</field>
+            <field name="user_type" ref="user_type_bs101"/>
+        </record>
+
+        <record id="small_business_chart2701" model="account.account.template">
+            <field name="code">2701</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">长期应付款</field>
+            <field name="user_type" ref="user_type_bs103"/>
+        </record>
+
+
+        <!-- 所有者权益类 -->
+        <record id="small_business_chart3001" model="account.account.template">
+            <field name="code">3001</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">实收资本</field>
+            <field name="user_type" ref="user_type_bs115"/>
+        </record>
+        <record id="small_business_chart3002" model="account.account.template">
+            <field name="code">3002</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">资本公积</field>
+            <field name="user_type" ref="user_type_bs118"/>
+        </record>
+        <record id="small_business_chart3101" model="account.account.template">
+            <field name="code">3101</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">盈余公积</field>
+            <field name="user_type" ref="user_type_bs119"/>
+        </record>
+        <record id="small_business_chart3103" model="account.account.template">
+            <field name="code">3103</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">本年利润</field>
+            <field name="user_type" ref="user_type_bs121"/>
+        </record>
+        <record id="small_business_chart3104" model="account.account.template">
+            <field name="code">3104</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">利润分配</field>
+            <field name="user_type" ref="user_type_bs121"/>
+        </record>
+
+        <!-- 成本类 -->
+        <record id="small_business_chart4001" model="account.account.template">
+            <field name="code">4001</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">生产成本</field>
+            <field name="user_type" ref="user_type_all"/>
+        </record>
+        <record id="small_business_chart4101" model="account.account.template">
+            <field name="code">4101</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">制造费用</field>
+            <field name="user_type" ref="user_type_all"/>
+        </record>
+
+        <record id="small_business_chart4301" model="account.account.template">
+            <field name="code">4301</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">研发支出</field>
+            <field name="user_type" ref="user_type_all"/>
+        </record>
+
+        <record id="small_business_chart4401" model="account.account.template">
+            <field name="code">4401</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">工程施工</field>
+            <field name="user_type" ref="user_type_all"/>
+        </record>
+
+        <record id="small_business_chart4403" model="account.account.template">
+            <field name="code">4403</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">机械作业</field>
+            <field name="user_type" ref="user_type_all"/>
+        </record>
+
+
+       <!-- 损益类 -->
+        <record id="small_business_chart5001" model="account.account.template">
+            <field name="code">5001</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">主营业务收入</field>
+            <field name="user_type" ref="user_type_pl1"/>
+        </record>
+        <record id="small_business_chart5051" model="account.account.template">
+            <field name="code">5051</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">其他业务收入</field>
+            <field name="user_type" ref="user_type_pl23"/>
+        </record>
+
+        <record id="small_business_chart5111" model="account.account.template">
+            <field name="code">5111</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">投资收益</field>
+            <field name="user_type" ref="user_type_pl19"/>
+        </record>
+        <record id="small_business_chart5301" model="account.account.template">
+            <field name="code">5301</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">营业外收入</field>
+            <field name="user_type" ref="user_type_pl23"/>
+        </record>
+
+        <record id="small_business_chart5401" model="account.account.template">
+            <field name="code">5401</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">主营业务成本</field>
+            <field name="user_type" ref="user_type_pl3"/>
+        </record>
+        <record id="small_business_chart5402" model="account.account.template">
+            <field name="code">5402</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">其他业务成本</field>
+            <field name="user_type" ref="user_type_pl3"/>
+        </record>
+
+        <record id="small_business_chart5403" model="account.account.template">
+            <field name="code">5403</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">营业税金及附加</field>
+            <field name="user_type" ref="user_type_pl5"/>
+        </record>
+        <record id="small_business_chart5601" model="account.account.template">
+            <field name="code">5601</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">销售费用</field>
+            <field name="user_type" ref="user_type_pl11"/>
+        </record>
+        <record id="small_business_chart5602" model="account.account.template">
+            <field name="code">5602</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">管理费用</field>
+            <field name="user_type" ref="user_type_pl13"/>
+        </record>
+        <record id="small_business_chart5603" model="account.account.template">
+            <field name="code">5603</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">财务费用</field>
+            <field name="user_type" ref="user_type_pl15"/>
+        </record>
+
+        <record id="small_business_chart5711" model="account.account.template">
+            <field name="code">5711</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">营业外支出</field>
+            <field name="user_type" ref="user_type_pl25"/>
+        </record>
+        <record id="small_business_chart5801" model="account.account.template">
+            <field name="code">5801</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_small_business_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">所得税</field>
+            <field name="user_type" ref="user_type_pl29"/>
+        </record>
+
+
+        <!-- Chart template -->
+        <record id="l10n_chart_china_small_business" model="account.chart.template">
+            <field name="name">小企业会计科目表（财会[2011]17号《小企业会计准则》）</field>
+            <field name="account_root_id" ref="cn_small_business_root"/>
+            <field name="code_digits" eval="4"/>
+            <field name="tax_code_root_id" ref="vat_cn_chart_root"/>
+            <field name="bank_account_view_id" ref="small_business_chart1002"/>
+            <field name="property_account_receivable" ref="small_business_chart1122"/>
+            <field name="property_account_payable" ref="small_business_chart2202"/>
+            <field name="property_account_expense_categ" ref="small_business_chart1401"/>
+            <field name="property_account_income_categ" ref="small_business_chart5001"/>
+        </record>
+
+        <record id="l10n_chart_china_small_business_value" model="ir.values">
+            <field name="name">小企业会计科目表（财会[2011]17号《小企业会计准则》）</field>
+            <field name="model">account.chart.template</field>
+            <field name="key">default</field>
+            <field name="res_id" ref="l10n_chart_china_small_business"/>
+            <field name="value" ref="base.CNY"/>
+        </record>
+
+        <!-- 增值税 -->
+        <record id="vats_small_business" model="account.tax.template">
+            <field name="chart_template_id" ref="l10n_chart_china_small_business"/>
+            <field name="name">增值税17%销项税</field>
+            <field eval="0.17" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="small_business_chart2221"/>
+            <field name="account_paid_id" ref="small_business_chart2221"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+        <record id="vatp_small_business" model="account.tax.template">
+            <field name="chart_template_id" ref="l10n_chart_china_small_business"/>
+            <field name="name">增值税17%进项税</field>
+            <field eval="0.17" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="small_business_chart2221"/>
+            <field name="account_paid_id" ref="small_business_chart2221"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+
+
+    </data>
+</openerp>
diff --git a/addons/l10n_cn/account_chart.xml b/addons/l10n_cn/account_chart_template.xml
similarity index 73%
rename from addons/l10n_cn/account_chart.xml
rename to addons/l10n_cn/account_chart_template.xml
index fe4690e306c..a09ea67f0d0 100644
--- a/addons/l10n_cn/account_chart.xml
+++ b/addons/l10n_cn/account_chart_template.xml
@@ -1,982 +1,883 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp><!--
-科目类型
-会计科目表模板
-增值税
-辅助核算类别
-管理会计账簿
-财务会计账簿
--->
-    <data noupdate="True">
-        <!-- 科目类型 -->
-        <record id="user_type_capital" model="account.account.type">
-            <field name="name">资产类</field>
-            <field name="code">1</field>
-            <field name="close_method">unreconciled</field>
-            <field name="report_type">asset</field>
-        </record>
-        <record id="user_type_debt" model="account.account.type">
-            <field name="name">负债类</field>
-            <field name="code">2</field>
-            <field name="close_method">unreconciled</field>
-            <field name="report_type">liability</field>
-        </record>
-        <record id="user_type_all" model="account.account.type">
-            <field name="name">所有科目</field>
-            <field name="code">0</field>
-            <field name="close_method">none</field>
-        </record>
-        <record id="user_type_equity" model="account.account.type">
-            <field name="name">所有者权益类</field>
-            <field name="code">4</field>
-            <field name="close_method">balance</field>
-            <field name="report_type">liability</field>
-        </record>
-        <record id="user_type_cost" model="account.account.type">
-            <field name="name">成本类</field>
-            <field name="code">5</field>
-            <field name="close_method">none</field>
-            <field name="report_type">expense</field>
-        </record>
-        <record id="user_type_profit_and_loss" model="account.account.type">
-            <field name="name">损益类</field>
-            <field name="code">6</field>
-            <field name="close_method">none</field>
-            <field name="report_type">income</field>
-        </record>
-        <!-- 科目表模板-->
-        <record id="cn_root" model="account.account.template">
-            <field name="name">会计科目</field>
-            <field name="code">0</field>
-            <field name="type">view</field>
-            <field name="user_type" ref="user_type_all"/>
-        </record>
-        <!-- 资产类 -->
-        <record id="chart1001" model="account.account.template">
-            <field name="code">1001</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">现金</field>
-            <field name="user_type" ref="user_type_capital"/>
-        </record>
-        <record id="chart1002" model="account.account.template">
-            <field name="code">1002</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">银行存款</field>
-            <field name="user_type" ref="user_type_capital"/>
-        </record>
-        <record id="chart1015" model="account.account.template">
-            <field name="code">1015</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">其他货币资金</field>
-            <field name="user_type" ref="user_type_capital"/>
-        </record>
-        <record id="chart1101" model="account.account.template">
-            <field name="code">1101</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">交易性金融资产</field>
-            <field name="user_type" ref="user_type_capital"/>
-        </record>
-        <record id="chart1121" model="account.account.template">
-            <field name="code">1121</field>
-            <field eval="True" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">应收票据</field>
-            <field name="user_type" ref="user_type_capital"/>
-        </record>
-        <record id="chart1122" model="account.account.template">
-            <field name="code">1122</field>
-            <field eval="True" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">receivable</field>
-            <field name="name">应收账款</field>
-            <field name="user_type" ref="user_type_capital"/>
-        </record>
-        <record id="chart1123" model="account.account.template">
-            <field name="code">1123</field>
-            <field eval="True" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">payable</field>
-            <field name="name">预付账款</field>
-            <field name="user_type" ref="user_type_capital"/>
-        </record>
-        <record id="chart1131" model="account.account.template">
-            <field name="code">1131</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">应收股利</field>
-            <field name="user_type" ref="user_type_capital"/>
-        </record>
-        <record id="chart1132" model="account.account.template">
-            <field name="code">1132</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">应收利息</field>
-            <field name="user_type" ref="user_type_capital"/>
-        </record>
-        <record id="chart1231" model="account.account.template">
-            <field name="code">1231</field>
-            <field eval="True" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">其他应收款</field>
-            <field name="user_type" ref="user_type_capital"/>
-        </record>
-        <record id="chart1241" model="account.account.template">
-            <field name="code">1241</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">坏账准备</field>
-            <field name="user_type" ref="user_type_capital"/>
-        </record>
-        <record id="chart1321" model="account.account.template">
-            <field name="code">1321</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">代理业务资产</field>
-            <field name="user_type" ref="user_type_capital"/>
-        </record>
-        <record id="chart1401" model="account.account.template">
-            <field name="code">1401</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">材料采购</field>
-            <field name="user_type" ref="user_type_capital"/>
-        </record>
-        <record id="chart1402" model="account.account.template">
-            <field name="code">1402</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">在途物资</field>
-            <field name="user_type" ref="user_type_capital"/>
-        </record>
-        <record id="chart1403" model="account.account.template">
-            <field name="code">1403</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">原材料</field>
-            <field name="user_type" ref="user_type_capital"/>
-        </record>
-        <record id="chart1404" model="account.account.template">
-            <field name="code">1404</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">材料成本差异</field>
-            <field name="user_type" ref="user_type_capital"/>
-        </record>
-        <record id="chart1406" model="account.account.template">
-            <field name="code">1406</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">库存商品</field>
-            <field name="user_type" ref="user_type_capital"/>
-        </record>
-        <record id="chart1407" model="account.account.template">
-            <field name="code">1407</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">发出商品</field>
-            <field name="user_type" ref="user_type_capital"/>
-        </record>
-        <record id="chart1410" model="account.account.template">
-            <field name="code">1410</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">商品进销差价</field>
-            <field name="user_type" ref="user_type_capital"/>
-        </record>
-        <record id="chart1411" model="account.account.template">
-            <field name="code">1411</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">委托加工物资</field>
-            <field name="user_type" ref="user_type_capital"/>
-        </record>
-        <record id="chart1412" model="account.account.template">
-            <field name="code">1412</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">包装物及低值易耗品</field>
-            <field name="user_type" ref="user_type_capital"/>
-        </record>
-        <record id="chart1461" model="account.account.template">
-            <field name="code">1461</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">存货跌价准备</field>
-            <field name="user_type" ref="user_type_capital"/>
-        </record>
-        <record id="chart1501" model="account.account.template">
-            <field name="code">1501</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">待摊费用</field>
-            <field name="user_type" ref="user_type_capital"/>
-        </record>
-        <record id="chart1521" model="account.account.template">
-            <field name="code">1521</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">持有至到期投资</field>
-            <field name="user_type" ref="user_type_capital"/>
-        </record>
-        <record id="chart1522" model="account.account.template">
-            <field name="code">1522</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">持有至到期投资减值准备</field>
-            <field name="user_type" ref="user_type_capital"/>
-        </record>
-        <record id="chart1523" model="account.account.template">
-            <field name="code">1523</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">可供出售金融资产</field>
-            <field name="user_type" ref="user_type_capital"/>
-        </record>
-        <record id="chart1524" model="account.account.template">
-            <field name="code">1524</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">长期股权投资</field>
-            <field name="user_type" ref="user_type_capital"/>
-        </record>
-        <record id="chart1525" model="account.account.template">
-            <field name="code">1525</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">长期投资减值准备</field>
-            <field name="user_type" ref="user_type_capital"/>
-        </record>
-        <record id="chart1526" model="account.account.template">
-            <field name="code">1526</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">投资性房地产</field>
-            <field name="user_type" ref="user_type_capital"/>
-        </record>
-        <record id="chart1421" model="account.account.template">
-            <field name="code">1531</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">长期应收款</field>
-            <field name="user_type" ref="user_type_capital"/>
-        </record>
-        <record id="chart1541" model="account.account.template">
-            <field name="code">1541</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">未实现融资收益</field>
-            <field name="user_type" ref="user_type_capital"/>
-        </record>
-        <record id="chart1601" model="account.account.template">
-            <field name="code">1601</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">固定资产</field>
-            <field name="user_type" ref="user_type_capital"/>
-        </record>
-        <record id="chart1602" model="account.account.template">
-            <field name="code">1602</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">累计折旧</field>
-            <field name="user_type" ref="user_type_capital"/>
-        </record>
-        <record id="chart1603" model="account.account.template">
-            <field name="code">1603</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">固定资产减值准备</field>
-            <field name="user_type" ref="user_type_capital"/>
-        </record>
-        <record id="chart1604" model="account.account.template">
-            <field name="code">1604</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">在建工程</field>
-            <field name="user_type" ref="user_type_capital"/>
-        </record>
-        <record id="chart1605" model="account.account.template">
-            <field name="code">1605</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">工程物资</field>
-            <field name="user_type" ref="user_type_capital"/>
-        </record>
-        <record id="chart1606" model="account.account.template">
-            <field name="code">1606</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">固定资产清理</field>
-            <field name="user_type" ref="user_type_capital"/>
-        </record>
-        <record id="chart1701" model="account.account.template">
-            <field name="code">1701</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">无形资产</field>
-            <field name="user_type" ref="user_type_capital"/>
-        </record>
-        <record id="chart1702" model="account.account.template">
-            <field name="code">1702</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">累计摊销</field>
-            <field name="user_type" ref="user_type_capital"/>
-        </record>
-        <record id="chart1703" model="account.account.template">
-            <field name="code">1703</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">无形资产减值准备</field>
-            <field name="user_type" ref="user_type_capital"/>
-        </record>
-        <record id="chart1711" model="account.account.template">
-            <field name="code">1711</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">商誉</field>
-            <field name="user_type" ref="user_type_capital"/>
-        </record>
-        <record id="chart1801" model="account.account.template">
-            <field name="code">1801</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">长期待摊费用</field>
-            <field name="user_type" ref="user_type_capital"/>
-        </record>
-        <record id="chart1811" model="account.account.template">
-            <field name="code">1811</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">递延所得税资产</field>
-            <field name="user_type" ref="user_type_capital"/>
-        </record>
-        <record id="chart1901" model="account.account.template">
-            <field name="code">1901</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">待处理财产损溢</field>
-            <field name="user_type" ref="user_type_capital"/>
-        </record><!-- 负债类 -->
-        <record id="chart2001" model="account.account.template">
-            <field name="code">2001</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">短期借款</field>
-            <field name="user_type" ref="user_type_debt"/>
-        </record>
-        <record id="chart2101" model="account.account.template">
-            <field name="code">2101</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">交易性金融负债</field>
-            <field name="user_type" ref="user_type_debt"/>
-        </record>
-        <record id="chart2201" model="account.account.template">
-            <field name="code">2201</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">应付票据</field>
-            <field name="user_type" ref="user_type_debt"/>
-        </record>
-        <record id="chart2202" model="account.account.template">
-            <field name="code">2202</field>
-            <field eval="True" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">payable</field>
-            <field name="name">应付账款</field>
-            <field name="user_type" ref="user_type_debt"/>
-        </record>
-        <record id="chart2205" model="account.account.template">
-            <field name="code">2205</field>
-            <field eval="True" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">receivable</field>
-            <field name="name">预收账款</field>
-            <field name="user_type" ref="user_type_debt"/>
-        </record>
-        <record id="chart2211" model="account.account.template">
-            <field name="code">2211</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">应付职工薪酬</field>
-            <field name="user_type" ref="user_type_debt"/>
-        </record>
-        <record id="chart2221" model="account.account.template">
-            <field name="code">2221</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>            
-            <field name="type">view</field>
-            <field name="name">应交税费</field>
-            <field name="user_type" ref="user_type_debt"/>
-        </record>
-        <record id="chart222101" model="account.account.template">
-            <field name="code">222101</field>
-            <field eval="False" name="reconcile"/>
-            <field name="parent_id" ref="chart2221"/>
-            <field name="type">view</field>
-            <field name="name">应交增值税</field>
-            <field name="user_type" ref="user_type_debt"/>
-        </record>
-        <record id="chart22210101" model="account.account.template">
-            <field name="code">22210101</field>
-            <field eval="False" name="reconcile"/>
-            <field name="parent_id" ref="chart222101"/>
-            <field name="type">other</field>
-            <field name="name">进项税额</field>
-            <field name="user_type" ref="user_type_debt"/>
-        </record>
-        <record id="chart22210102" model="account.account.template">
-            <field name="code">22210102</field>
-            <field eval="False" name="reconcile"/>
-            <field name="parent_id" ref="chart222101"/>
-            <field name="type">other</field>
-            <field name="name">已交税金</field>
-            <field name="user_type" ref="user_type_debt"/>
-        </record>
-        <record id="chart22210103" model="account.account.template">
-            <field name="code">22210103</field>
-            <field eval="False" name="reconcile"/>
-            <field name="parent_id" ref="chart222101"/>
-            <field name="type">other</field>
-            <field name="name">转出未交增值税</field>
-            <field name="user_type" ref="user_type_debt"/>
-        </record>
-        <record id="chart22210104" model="account.account.template">
-            <field name="code">22210104</field>
-            <field eval="False" name="reconcile"/>
-            <field name="parent_id" ref="chart222101"/>
-            <field name="type">other</field>
-            <field name="name">减免税款</field>
-            <field name="user_type" ref="user_type_debt"/>
-        </record>
-        <record id="chart22210105" model="account.account.template">
-            <field name="code">22210105</field>
-            <field eval="False" name="reconcile"/>
-            <field name="parent_id" ref="chart222101"/>
-            <field name="type">other</field>
-            <field name="name">销项税额</field>
-            <field name="user_type" ref="user_type_debt"/>
-        </record>
-        <record id="chart22210106" model="account.account.template">
-            <field name="code">22210106</field>
-            <field eval="False" name="reconcile"/>
-            <field name="parent_id" ref="chart222101"/>
-            <field name="type">other</field>
-            <field name="name">出口退税</field>
-            <field name="user_type" ref="user_type_debt"/>
-        </record>
-        <record id="chart22210107" model="account.account.template">
-            <field name="code">22210107</field>
-            <field eval="False" name="reconcile"/>
-            <field name="parent_id" ref="chart222101"/>
-            <field name="type">other</field>
-            <field name="name">进项税额转出</field>
-            <field name="user_type" ref="user_type_debt"/>
-        </record>
-        <record id="chart22210108" model="account.account.template">
-            <field name="code">22210108</field>
-            <field eval="False" name="reconcile"/>
-            <field name="parent_id" ref="chart222101"/>
-            <field name="type">other</field>
-            <field name="name">出口抵减内销产品应纳税额</field>
-            <field name="user_type" ref="user_type_debt"/>
-        </record>
-        <record id="chart22210109" model="account.account.template">
-            <field name="code">22210109</field>
-            <field eval="False" name="reconcile"/>
-            <field name="parent_id" ref="chart222101"/>
-            <field name="type">other</field>
-            <field name="name">转出多交增值税</field>
-            <field name="user_type" ref="user_type_debt"/>
-        </record>
-        <record id="chart22210110" model="account.account.template">
-            <field name="code">22210110</field>
-            <field eval="False" name="reconcile"/>
-            <field name="parent_id" ref="chart222101"/>
-            <field name="type">other</field>
-            <field name="name">未交增值税</field>
-            <field name="user_type" ref="user_type_debt"/>
-        </record>
-        <record id="chart222102" model="account.account.template">
-            <field name="code">222102</field>
-            <field eval="False" name="reconcile"/>
-            <field name="parent_id" ref="chart2221"/>
-            <field name="type">other</field>
-            <field name="name">应交营业税</field>
-            <field name="user_type" ref="user_type_debt"/>
-        </record>
-        <record id="chart222103" model="account.account.template">
-            <field name="code">222103</field>
-            <field eval="False" name="reconcile"/>
-            <field name="parent_id" ref="chart2221"/>
-            <field name="type">other</field>
-            <field name="name">应交消费税</field>
-            <field name="user_type" ref="user_type_debt"/>
-        </record>
-        <record id="chart222104" model="account.account.template">
-            <field name="code">222104</field>
-            <field eval="False" name="reconcile"/>
-            <field name="parent_id" ref="chart2221"/>
-            <field name="type">other</field>
-            <field name="name">应交资源税</field>
-            <field name="user_type" ref="user_type_debt"/>
-        </record>
-        <record id="chart222105" model="account.account.template">
-            <field name="code">222105</field>
-            <field eval="False" name="reconcile"/>
-            <field name="parent_id" ref="chart2221"/>
-            <field name="type">other</field>
-            <field name="name">应交所得税</field>
-            <field name="user_type" ref="user_type_debt"/>
-        </record>
-        <record id="chart222106" model="account.account.template">
-            <field name="code">222106</field>
-            <field eval="False" name="reconcile"/>
-            <field name="parent_id" ref="chart2221"/>
-            <field name="type">other</field>
-            <field name="name">应交土地增值税</field>
-            <field name="user_type" ref="user_type_debt"/>
-        </record>
-        <record id="chart222107" model="account.account.template">
-            <field name="code">222107</field>
-            <field eval="False" name="reconcile"/>
-            <field name="parent_id" ref="chart2221"/>
-            <field name="type">other</field>
-            <field name="name">应交城市维护建设税</field>
-            <field name="user_type" ref="user_type_debt"/>
-        </record>
-        <record id="chart222108" model="account.account.template">
-            <field name="code">222108</field>
-            <field eval="False" name="reconcile"/>
-            <field name="parent_id" ref="chart2221"/>
-            <field name="type">other</field>
-            <field name="name">应交房产税</field>
-            <field name="user_type" ref="user_type_debt"/>
-        </record>
-        <record id="chart222109" model="account.account.template">
-            <field name="code">222109</field>
-            <field eval="False" name="reconcile"/>
-            <field name="parent_id" ref="chart2221"/>
-            <field name="type">other</field>
-            <field name="name">应交土地使用税</field>
-            <field name="user_type" ref="user_type_debt"/>
-        </record>
-        <record id="chart222110" model="account.account.template">
-            <field name="code">222110</field>
-            <field eval="False" name="reconcile"/>
-            <field name="parent_id" ref="chart2221"/>
-            <field name="type">other</field>
-            <field name="name">应交车船使用税</field>
-            <field name="user_type" ref="user_type_debt"/>
-        </record>
-        <record id="chart222111" model="account.account.template">
-            <field name="code">222111</field>
-            <field eval="False" name="reconcile"/>
-            <field name="parent_id" ref="chart2221"/>
-            <field name="type">other</field>
-            <field name="name">应交个人所得税</field>
-            <field name="user_type" ref="user_type_debt"/>
-        </record>
-        <record id="chart2231" model="account.account.template">
-            <field name="code">2231</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">应付股利</field>
-            <field name="user_type" ref="user_type_debt"/>
-        </record>
-        <record id="chart2232" model="account.account.template">
-            <field name="code">2232</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">应付利息</field>
-            <field name="user_type" ref="user_type_debt"/>
-        </record>
-        <record id="chart2314" model="account.account.template">
-            <field name="code">2314</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">代理业务负债</field>
-            <field name="user_type" ref="user_type_debt"/>
-        </record>
-        <record id="chart2401" model="account.account.template">
-            <field name="code">2401</field>
-            <field eval="True" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">预提费用</field>
-            <field name="user_type" ref="user_type_debt"/>
-        </record>
-        <record id="chart2411" model="account.account.template">
-            <field name="code">2411</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">预计负债</field>
-            <field name="user_type" ref="user_type_debt"/>
-        </record>
-        <record id="chart2501" model="account.account.template">
-            <field name="code">2501</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">递延收益</field>
-            <field name="user_type" ref="user_type_debt"/>
-        </record>
-        <record id="chart2601" model="account.account.template">
-            <field name="code">2601</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">长期借款</field>
-            <field name="user_type" ref="user_type_debt"/>
-        </record>
-        <record id="chart2602" model="account.account.template">
-            <field name="code">2602</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">长期债券</field>
-            <field name="user_type" ref="user_type_debt"/>
-        </record>
-        <record id="chart2801" model="account.account.template">
-            <field name="code">2801</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">长期应付款</field>
-            <field name="user_type" ref="user_type_debt"/>
-        </record>
-        <record id="chart2802" model="account.account.template">
-            <field name="code">2802</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">未确认融资费用</field>
-            <field name="user_type" ref="user_type_debt"/>
-        </record>
-        <record id="chart2901" model="account.account.template">
-            <field name="code">2901</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">递延所得税负债</field>
-            <field name="user_type" ref="user_type_debt"/>
-        </record><!-- 共同类 -->
-        <record id="chart3101" model="account.account.template">
-            <field name="code">3101</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">衍生工具</field>
-            <field name="user_type" ref="user_type_equity"/>
-        </record>
-        <record id="chart3102" model="account.account.template">
-            <field name="code">3102</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">套期工具</field>
-            <field name="user_type" ref="user_type_equity"/>
-        </record>
-        <record id="chart3202" model="account.account.template">
-            <field name="code">3202</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">被套期项目</field>
-            <field name="user_type" ref="user_type_equity"/>
-        </record><!-- 所有者权益类 -->
-        <record id="chart4001" model="account.account.template">
-            <field name="code">4001</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">实收资本</field>
-            <field name="user_type" ref="user_type_equity"/>
-        </record>
-        <record id="chart4002" model="account.account.template">
-            <field name="code">4002</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">资本公积</field>
-            <field name="user_type" ref="user_type_equity"/>
-        </record>
-        <record id="chart4101" model="account.account.template">
-            <field name="code">4101</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">盈余公积</field>
-            <field name="user_type" ref="user_type_equity"/>
-        </record>
-        <record id="chart4103" model="account.account.template">
-            <field name="code">4103</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">本年利润</field>
-            <field name="user_type" ref="user_type_equity"/>
-        </record>
-        <record id="chart4104" model="account.account.template">
-            <field name="code">4104</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">利润分配</field>
-            <field name="user_type" ref="user_type_equity"/>
-        </record>
-        <record id="chart4201" model="account.account.template">
-            <field name="code">4201</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">库存股</field>
-            <field name="user_type" ref="user_type_equity"/>
-        </record>
-        <!-- 成本类 -->
-        <record id="chart5001" model="account.account.template">
-            <field name="code">5001</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">生产成本</field>
-            <field name="user_type" ref="user_type_cost"/>
-        </record>
-        <record id="chart5101" model="account.account.template">
-            <field name="code">5101</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">制造费用</field>
-            <field name="user_type" ref="user_type_cost"/>
-        </record>
-        <record id="chart5201" model="account.account.template">
-            <field name="code">5201</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">劳务成本</field>
-            <field name="user_type" ref="user_type_cost"/>
-        </record>
-        <record id="chart5301" model="account.account.template">
-            <field name="code">5301</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">研发支出</field>
-            <field name="user_type" ref="user_type_cost"/>
-        </record>
-       <!-- 损益类 -->
-        <record id="chart6001" model="account.account.template">
-            <field name="code">6001</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">主营业务收入</field>
-            <field name="user_type" ref="user_type_profit_and_loss"/>
-        </record>
-        <record id="chart6051" model="account.account.template">
-            <field name="code">6051</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">其他业务收入</field>
-            <field name="user_type" ref="user_type_profit_and_loss"/>
-        </record>
-        <record id="chart6101" model="account.account.template">
-            <field name="code">6101</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">公允价值变动损益</field>
-            <field name="user_type" ref="user_type_profit_and_loss"/>
-        </record>
-        <record id="chart6111" model="account.account.template">
-            <field name="code">6111</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">投资收益</field>
-            <field name="user_type" ref="user_type_profit_and_loss"/>
-        </record>
-        <record id="chart6301" model="account.account.template">
-            <field name="code">6301</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">营业外收入</field>
-            <field name="user_type" ref="user_type_profit_and_loss"/>
-        </record>
-        <record id="chart6401" model="account.account.template">
-            <field name="code">6401</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">主营业务成本</field>
-            <field name="user_type" ref="user_type_cost"/>
-        </record>
-        <record id="chart6402" model="account.account.template">
-            <field name="code">6402</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">其他业务支出</field>
-            <field name="user_type" ref="user_type_cost"/>
-        </record>
-        <record id="chart6405" model="account.account.template">
-            <field name="code">6405</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">营业税金及附加</field>
-            <field name="user_type" ref="user_type_cost"/>
-        </record>
-        <record id="chart6601" model="account.account.template">
-            <field name="code">6601</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">销售费用</field>
-            <field name="user_type" ref="user_type_cost"/>
-        </record>
-        <record id="chart6602" model="account.account.template">
-            <field name="code">6602</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">管理费用</field>
-            <field name="user_type" ref="user_type_cost"/>
-        </record>
-        <record id="chart6603" model="account.account.template">
-            <field name="code">6603</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">财务费用</field>
-            <field name="user_type" ref="user_type_cost"/>
-        </record>
-        <record id="chart6701" model="account.account.template">
-            <field name="code">6701</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">资产减值损失</field>
-            <field name="user_type" ref="user_type_cost"/>
-        </record>
-        <record id="chart6711" model="account.account.template">
-            <field name="code">6711</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">营业外支出</field>
-            <field name="user_type" ref="user_type_cost"/>
-        </record>
-        <record id="chart6801" model="account.account.template">
-            <field name="code">6801</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">所得税</field>
-            <field name="user_type" ref="user_type_cost"/>
-        </record>
-        <record id="chart6901" model="account.account.template">
-            <field name="code">6901</field>
-            <field eval="False" name="reconcile"/>
-            <field ref="cn_root" name="parent_id"/>
-            <field name="type">other</field>
-            <field name="name">以前年度损益调整</field>
-            <field name="user_type" ref="user_type_profit_and_loss"/>
-        </record>
-        <!-- Tax Code Configuration -->
-        <record id="vat_cn_chart_root" model="account.tax.code.template">
-            <field name="name">中国税务报表</field>
-            <field name="parent_id" eval="False"/>
-        </record>
-        <!-- Chart template -->
-        <record id="l10n_chart_china" model="account.chart.template">
-            <field name="name">中国会计科目表</field>
-            <field name="account_root_id" ref="cn_root"/>
-            <field name="tax_code_root_id" ref="vat_cn_chart_root"/>
-            <field name="bank_account_view_id" ref="chart1002"/>
-            <field name="property_account_receivable" ref="chart1122"/>
-            <field name="property_account_payable" ref="chart2202"/>
-            <field name="property_account_expense_categ" ref="chart1401"/>
-            <field name="property_account_income_categ" ref="chart6001"/>
-            <field name="currency_id" ref="base.CNY"/>
-        </record>
-        <!-- 增值税 -->
-        <record id="vats" model="account.tax.template">
-            <field name="chart_template_id" ref="l10n_chart_china"/>
-            <field name="name">增值税17%销项税</field>
-            <field eval="0.17" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_collected_id" ref="chart22210105"/>
-            <field name="account_paid_id" ref="chart22210105"/>
-            <field name="type_tax_use">sale</field>
-        </record>
-        <record id="vatp" model="account.tax.template">
-            <field name="chart_template_id" ref="l10n_chart_china"/>
-            <field name="name">增值税17%进项税</field>
-            <field eval="0.17" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_collected_id" ref="chart22210101"/>
-            <field name="account_paid_id" ref="chart22210101"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-    </data>
-</openerp>
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+
+<!--
+
+    Copyright (C) 2008-2008 凯源吕鑫 lvxin@gmail.com   <basic chart data>
+    Copyright (C) 2008-now  开阖软件 jeff@osbzr.com    < PM and LTS >
+
+会计科目表模板
+-->
+    <data noupdate="True">
+
+
+        <!-- 科目表模板-->
+        <record id="cn_root" model="account.account.template">
+            <field name="name">会计科目</field>
+            <field name="code">0</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="user_type_all"/>
+        </record>
+        <!-- 资产类 -->
+        <record id="chart1001" model="account.account.template">
+            <field name="code">1001</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">liquidity</field>
+            <field name="name">现金</field>
+            <field name="user_type" ref="user_type_bs1"/>
+        </record>
+        <record id="chart1002" model="account.account.template">
+            <field name="code">1002</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="name">银行存款</field>
+            <field name="user_type" ref="user_type_bs1"/>
+        </record>
+        <record id="chart1015" model="account.account.template">
+            <field name="code">1015</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">其他货币资金</field>
+            <field name="user_type" ref="user_type_bs1"/>
+        </record>
+        <record id="chart1101" model="account.account.template">
+            <field name="code">1101</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">交易性金融资产</field>
+            <field name="user_type" ref="user_type_bs2"/>
+        </record>
+        <record id="chart1121" model="account.account.template">
+            <field name="code">1121</field>
+            <field eval="True" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">应收票据</field>
+            <field name="user_type" ref="user_type_bs3"/>
+        </record>
+        <record id="chart1122" model="account.account.template">
+            <field name="code">1122</field>
+            <field eval="True" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">receivable</field>
+            <field name="name">应收账款</field>
+            <field name="user_type" ref="user_type_bs6"/>
+        </record>
+        <record id="chart1123" model="account.account.template">
+            <field name="code">1123</field>
+            <field eval="True" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">payable</field>
+            <field name="name">预付账款</field>
+            <field name="user_type" ref="user_type_bs6"/>
+        </record>
+        <record id="chart1131" model="account.account.template">
+            <field name="code">1131</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">应收股利</field>
+            <field name="user_type" ref="user_type_bs4"/>
+        </record>
+        <record id="chart1132" model="account.account.template">
+            <field name="code">1132</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">应收利息</field>
+            <field name="user_type" ref="user_type_bs5"/>
+        </record>
+        <record id="chart1231" model="account.account.template">
+            <field name="code">1231</field>
+            <field eval="True" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">其他应收款</field>
+            <field name="user_type" ref="user_type_bs7"/>
+        </record>
+        <record id="chart1241" model="account.account.template">
+            <field name="code">1241</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">坏账准备</field>
+            <field name="user_type" ref="user_type_bs6"/>
+        </record>
+        <record id="chart1401" model="account.account.template">
+            <field name="code">1401</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">材料采购</field>
+            <field name="user_type" ref="user_type_bs10"/>
+        </record>
+        <record id="chart1402" model="account.account.template">
+            <field name="code">1402</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">在途物资</field>
+            <field name="user_type" ref="user_type_bs10"/>
+        </record>
+        <record id="chart1403" model="account.account.template">
+            <field name="code">1403</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">原材料</field>
+            <field name="user_type" ref="user_type_bs10"/>
+        </record>
+        <record id="chart1404" model="account.account.template">
+            <field name="code">1404</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">材料成本差异</field>
+            <field name="user_type" ref="user_type_bs10"/>
+        </record>
+        <record id="chart1406" model="account.account.template">
+            <field name="code">1406</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">库存商品</field>
+            <field name="user_type" ref="user_type_bs10"/>
+        </record>
+        <record id="chart1407" model="account.account.template">
+            <field name="code">1407</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">发出商品</field>
+            <field name="user_type" ref="user_type_bs10"/>
+        </record>
+        <record id="chart1410" model="account.account.template">
+            <field name="code">1410</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">商品进销差价</field>
+            <field name="user_type" ref="user_type_bs10"/>
+        </record>
+        <record id="chart1411" model="account.account.template">
+            <field name="code">1411</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">委托加工物资</field>
+            <field name="user_type" ref="user_type_bs10"/>
+        </record>
+        <record id="chart1412" model="account.account.template">
+            <field name="code">1412</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">包装物及低值易耗品</field>
+            <field name="user_type" ref="user_type_bs10"/>
+        </record>
+        <record id="chart1461" model="account.account.template">
+            <field name="code">1461</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">存货跌价准备</field>
+            <field name="user_type" ref="user_type_bs10"/>
+        </record>
+        <record id="chart1501" model="account.account.template">
+            <field name="code">1501</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">待摊费用</field>
+            <field name="user_type" ref="user_type_bs11"/>
+        </record>
+        <record id="chart1521" model="account.account.template">
+            <field name="code">1521</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">持有至到期投资</field>
+            <field name="user_type" ref="user_type_bs21"/>
+        </record>
+        <record id="chart1522" model="account.account.template">
+            <field name="code">1522</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">持有至到期投资减值准备</field>
+            <field name="user_type" ref="user_type_bs21"/>
+        </record>
+        <record id="chart1524" model="account.account.template">
+            <field name="code">1524</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">长期股权投资</field>
+            <field name="user_type" ref="user_type_bs32"/>
+        </record>
+        <record id="chart1525" model="account.account.template">
+            <field name="code">1525</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">长期投资减值准备</field>
+            <field name="user_type" ref="user_type_bs32"/>
+        </record>
+        <record id="chart1421" model="account.account.template">
+            <field name="code">1531</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">长期应收款</field>
+            <field name="user_type" ref="user_type_bs34"/>
+        </record>
+        <record id="chart1601" model="account.account.template">
+            <field name="code">1601</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">固定资产</field>
+            <field name="user_type" ref="user_type_bs39"/>
+        </record>
+        <record id="chart1602" model="account.account.template">
+            <field name="code">1602</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">累计折旧</field>
+            <field name="user_type" ref="user_type_bs40"/>
+        </record>
+        <record id="chart1603" model="account.account.template">
+            <field name="code">1603</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">固定资产减值准备</field>
+            <field name="user_type" ref="user_type_bs42"/>
+        </record>
+        <record id="chart1604" model="account.account.template">
+            <field name="code">1604</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">在建工程</field>
+            <field name="user_type" ref="user_type_bs45"/>
+        </record>
+        <record id="chart1605" model="account.account.template">
+            <field name="code">1605</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">工程物资</field>
+            <field name="user_type" ref="user_type_bs44"/>
+        </record>
+        <record id="chart1606" model="account.account.template">
+            <field name="code">1606</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">固定资产清理</field>
+            <field name="user_type" ref="user_type_bs46"/>
+        </record>
+        <record id="chart1701" model="account.account.template">
+            <field name="code">1701</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">无形资产</field>
+            <field name="user_type" ref="user_type_bs51"/>
+        </record>
+        <record id="chart1703" model="account.account.template">
+            <field name="code">1703</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">无形资产减值准备</field>
+            <field name="user_type" ref="user_type_bs51"/>
+        </record>
+        <record id="chart1711" model="account.account.template">
+            <field name="code">1711</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">商誉</field>
+            <field name="user_type" ref="user_type_bs51"/>
+        </record>
+        <record id="chart1801" model="account.account.template">
+            <field name="code">1801</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">长期待摊费用</field>
+            <field name="user_type" ref="user_type_bs52"/>
+        </record>
+        <record id="chart1811" model="account.account.template">
+            <field name="code">1811</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">递延所得税资产</field>
+            <field name="user_type" ref="user_type_bs61"/>
+        </record>
+        <record id="chart1901" model="account.account.template">
+            <field name="code">1901</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">待处理财产损溢</field>
+            <field name="user_type" ref="user_type_bs10"/>
+        </record><!-- 负债类 -->
+        <record id="chart2001" model="account.account.template">
+            <field name="code">2001</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">短期借款</field>
+            <field name="user_type" ref="user_type_bs68"/>
+        </record>
+        <record id="chart2101" model="account.account.template">
+            <field name="code">2101</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">交易性金融负债</field>
+            <field name="user_type" ref="user_type_bs68"/>
+        </record>
+        <record id="chart2201" model="account.account.template">
+            <field name="code">2201</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">应付票据</field>
+            <field name="user_type" ref="user_type_bs69"/>
+        </record>
+        <record id="chart2202" model="account.account.template">
+            <field name="code">2202</field>
+            <field eval="True" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">payable</field>
+            <field name="name">应付账款</field>
+            <field name="user_type" ref="user_type_bs70"/>
+        </record>
+        <record id="chart2205" model="account.account.template">
+            <field name="code">2205</field>
+            <field eval="True" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">receivable</field>
+            <field name="name">预收账款</field>
+            <field name="user_type" ref="user_type_bs71"/>
+        </record>
+        <record id="chart2211" model="account.account.template">
+            <field name="code">2211</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">应付职工薪酬</field>
+            <field name="user_type" ref="user_type_bs72"/>
+        </record>
+        <record id="chart2221" model="account.account.template">
+            <field name="code">2221</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>            
+            <field name="type">view</field>
+            <field name="name">应交税费</field>
+            <field name="user_type" ref="user_type_bs75"/>
+        </record>
+        <record id="chart222101" model="account.account.template">
+            <field name="code">222101</field>
+            <field eval="False" name="reconcile"/>
+            <field name="parent_id" ref="chart2221"/>
+            <field name="type">view</field>
+            <field name="name">应交增值税</field>
+            <field name="user_type" ref="user_type_bs75"/>
+        </record>
+        <record id="chart22210101" model="account.account.template">
+            <field name="code">22210101</field>
+            <field eval="False" name="reconcile"/>
+            <field name="parent_id" ref="chart222101"/>
+            <field name="type">other</field>
+            <field name="name">进项税额</field>
+            <field name="user_type" ref="user_type_bs75"/>
+        </record>
+        <record id="chart22210102" model="account.account.template">
+            <field name="code">22210102</field>
+            <field eval="False" name="reconcile"/>
+            <field name="parent_id" ref="chart222101"/>
+            <field name="type">other</field>
+            <field name="name">已交税金</field>
+            <field name="user_type" ref="user_type_bs75"/>
+        </record>
+        <record id="chart22210103" model="account.account.template">
+            <field name="code">22210103</field>
+            <field eval="False" name="reconcile"/>
+            <field name="parent_id" ref="chart222101"/>
+            <field name="type">other</field>
+            <field name="name">转出未交增值税</field>
+            <field name="user_type" ref="user_type_bs75"/>
+        </record>
+        <record id="chart22210104" model="account.account.template">
+            <field name="code">22210104</field>
+            <field eval="False" name="reconcile"/>
+            <field name="parent_id" ref="chart222101"/>
+            <field name="type">other</field>
+            <field name="name">减免税款</field>
+            <field name="user_type" ref="user_type_bs75"/>
+        </record>
+        <record id="chart22210105" model="account.account.template">
+            <field name="code">22210105</field>
+            <field eval="False" name="reconcile"/>
+            <field name="parent_id" ref="chart222101"/>
+            <field name="type">other</field>
+            <field name="name">销项税额</field>
+            <field name="user_type" ref="user_type_bs75"/>
+        </record>
+        <record id="chart22210106" model="account.account.template">
+            <field name="code">22210106</field>
+            <field eval="False" name="reconcile"/>
+            <field name="parent_id" ref="chart222101"/>
+            <field name="type">other</field>
+            <field name="name">出口退税</field>
+            <field name="user_type" ref="user_type_bs75"/>
+        </record>
+        <record id="chart22210107" model="account.account.template">
+            <field name="code">22210107</field>
+            <field eval="False" name="reconcile"/>
+            <field name="parent_id" ref="chart222101"/>
+            <field name="type">other</field>
+            <field name="name">进项税额转出</field>
+            <field name="user_type" ref="user_type_bs75"/>
+        </record>
+        <record id="chart22210108" model="account.account.template">
+            <field name="code">22210108</field>
+            <field eval="False" name="reconcile"/>
+            <field name="parent_id" ref="chart222101"/>
+            <field name="type">other</field>
+            <field name="name">出口抵减内销产品应纳税额</field>
+            <field name="user_type" ref="user_type_bs75"/>
+        </record>
+        <record id="chart22210109" model="account.account.template">
+            <field name="code">22210109</field>
+            <field eval="False" name="reconcile"/>
+            <field name="parent_id" ref="chart222101"/>
+            <field name="type">other</field>
+            <field name="name">转出多交增值税</field>
+            <field name="user_type" ref="user_type_bs75"/>
+        </record>
+        <record id="chart22210110" model="account.account.template">
+            <field name="code">22210110</field>
+            <field eval="False" name="reconcile"/>
+            <field name="parent_id" ref="chart222101"/>
+            <field name="type">other</field>
+            <field name="name">未交增值税</field>
+            <field name="user_type" ref="user_type_bs75"/>
+        </record>
+        <record id="chart222102" model="account.account.template">
+            <field name="code">222102</field>
+            <field eval="False" name="reconcile"/>
+            <field name="parent_id" ref="chart2221"/>
+            <field name="type">other</field>
+            <field name="name">应交营业税</field>
+            <field name="user_type" ref="user_type_bs75"/>
+        </record>
+        <record id="chart222103" model="account.account.template">
+            <field name="code">222103</field>
+            <field eval="False" name="reconcile"/>
+            <field name="parent_id" ref="chart2221"/>
+            <field name="type">other</field>
+            <field name="name">应交消费税</field>
+            <field name="user_type" ref="user_type_bs75"/>
+        </record>
+        <record id="chart222104" model="account.account.template">
+            <field name="code">222104</field>
+            <field eval="False" name="reconcile"/>
+            <field name="parent_id" ref="chart2221"/>
+            <field name="type">other</field>
+            <field name="name">应交资源税</field>
+            <field name="user_type" ref="user_type_bs75"/>
+        </record>
+        <record id="chart222105" model="account.account.template">
+            <field name="code">222105</field>
+            <field eval="False" name="reconcile"/>
+            <field name="parent_id" ref="chart2221"/>
+            <field name="type">other</field>
+            <field name="name">应交所得税</field>
+            <field name="user_type" ref="user_type_bs75"/>
+        </record>
+        <record id="chart222106" model="account.account.template">
+            <field name="code">222106</field>
+            <field eval="False" name="reconcile"/>
+            <field name="parent_id" ref="chart2221"/>
+            <field name="type">other</field>
+            <field name="name">应交土地增值税</field>
+            <field name="user_type" ref="user_type_bs75"/>
+        </record>
+        <record id="chart222107" model="account.account.template">
+            <field name="code">222107</field>
+            <field eval="False" name="reconcile"/>
+            <field name="parent_id" ref="chart2221"/>
+            <field name="type">other</field>
+            <field name="name">应交城市维护建设税</field>
+            <field name="user_type" ref="user_type_bs75"/>
+        </record>
+        <record id="chart222108" model="account.account.template">
+            <field name="code">222108</field>
+            <field eval="False" name="reconcile"/>
+            <field name="parent_id" ref="chart2221"/>
+            <field name="type">other</field>
+            <field name="name">应交房产税</field>
+            <field name="user_type" ref="user_type_bs75"/>
+        </record>
+        <record id="chart222109" model="account.account.template">
+            <field name="code">222109</field>
+            <field eval="False" name="reconcile"/>
+            <field name="parent_id" ref="chart2221"/>
+            <field name="type">other</field>
+            <field name="name">应交土地使用税</field>
+            <field name="user_type" ref="user_type_bs75"/>
+        </record>
+        <record id="chart222110" model="account.account.template">
+            <field name="code">222110</field>
+            <field eval="False" name="reconcile"/>
+            <field name="parent_id" ref="chart2221"/>
+            <field name="type">other</field>
+            <field name="name">应交车船使用税</field>
+            <field name="user_type" ref="user_type_bs75"/>
+        </record>
+        <record id="chart222111" model="account.account.template">
+            <field name="code">222111</field>
+            <field eval="False" name="reconcile"/>
+            <field name="parent_id" ref="chart2221"/>
+            <field name="type">other</field>
+            <field name="name">应交个人所得税</field>
+            <field name="user_type" ref="user_type_bs75"/>
+        </record>
+        <record id="chart2231" model="account.account.template">
+            <field name="code">2231</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">应付股利</field>
+            <field name="user_type" ref="user_type_bs74"/>
+        </record>
+        <record id="chart2232" model="account.account.template">
+            <field name="code">2232</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">应付利息</field>
+            <field name="user_type" ref="user_type_bs74"/>
+        </record>
+        <record id="chart2401" model="account.account.template">
+            <field name="code">2401</field>
+            <field eval="True" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">预提费用</field>
+            <field name="user_type" ref="user_type_bs82"/>
+        </record>
+        <record id="chart2601" model="account.account.template">
+            <field name="code">2601</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">长期借款</field>
+            <field name="user_type" ref="user_type_bs101"/>
+        </record>
+        <record id="chart2602" model="account.account.template">
+            <field name="code">2602</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">长期债券</field>
+            <field name="user_type" ref="user_type_bs102"/>
+        </record>
+        <record id="chart2801" model="account.account.template">
+            <field name="code">2801</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">长期应付款</field>
+            <field name="user_type" ref="user_type_bs103"/>
+        </record>
+        <record id="chart2901" model="account.account.template">
+            <field name="code">2901</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">递延所得税负债</field>
+            <field name="user_type" ref="user_type_bs103"/>
+        </record><!-- 共同类 -->
+        <record id="chart3101" model="account.account.template">
+            <field name="code">3101</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">衍生工具</field>
+            <field name="user_type" ref="user_type_all"/>
+        </record>
+        <record id="chart3102" model="account.account.template">
+            <field name="code">3102</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">套期工具</field>
+            <field name="user_type" ref="user_type_all"/>
+        </record>
+        <record id="chart3202" model="account.account.template">
+            <field name="code">3202</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">被套期项目</field>
+            <field name="user_type" ref="user_type_all"/>
+        </record><!-- 所有者权益类 -->
+        <record id="chart4001" model="account.account.template">
+            <field name="code">4001</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">实收资本</field>
+            <field name="user_type" ref="user_type_bs115"/>
+        </record>
+        <record id="chart4002" model="account.account.template">
+            <field name="code">4002</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">资本公积</field>
+            <field name="user_type" ref="user_type_bs118"/>
+        </record>
+        <record id="chart4101" model="account.account.template">
+            <field name="code">4101</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">盈余公积</field>
+            <field name="user_type" ref="user_type_bs119"/>
+        </record>
+        <record id="chart4103" model="account.account.template">
+            <field name="code">4103</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">本年利润</field>
+            <field name="user_type" ref="user_type_bs121"/>
+        </record>
+        <record id="chart4104" model="account.account.template">
+            <field name="code">4104</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">利润分配</field>
+            <field name="user_type" ref="user_type_bs121"/>
+        </record>
+        <record id="chart4201" model="account.account.template">
+            <field name="code">4201</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">库存股</field>
+            <field name="user_type" ref="user_type_all"/>
+        </record>
+        <!-- 成本类 -->
+        <record id="chart5001" model="account.account.template">
+            <field name="code">5001</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">生产成本</field>
+            <field name="user_type" ref="user_type_all"/>
+        </record>
+        <record id="chart5101" model="account.account.template">
+            <field name="code">5101</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">制造费用</field>
+            <field name="user_type" ref="user_type_all"/>
+        </record>
+        <record id="chart5201" model="account.account.template">
+            <field name="code">5201</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">劳务成本</field>
+            <field name="user_type" ref="user_type_all"/>
+        </record>
+        <record id="chart5301" model="account.account.template">
+            <field name="code">5301</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">研发支出</field>
+            <field name="user_type" ref="user_type_all"/>
+        </record>
+       <!-- 损益类 -->
+        <record id="chart6001" model="account.account.template">
+            <field name="code">6001</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">主营业务收入</field>
+            <field name="user_type" ref="user_type_pl1"/>
+        </record>
+        <record id="chart6051" model="account.account.template">
+            <field name="code">6051</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">其他业务收入</field>
+            <field name="user_type" ref="user_type_pl9"/>
+        </record>
+        <record id="chart6101" model="account.account.template">
+            <field name="code">6101</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">公允价值变动损益</field>
+            <field name="user_type" ref="user_type_pl9"/>
+        </record>
+        <record id="chart6111" model="account.account.template">
+            <field name="code">6111</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">投资收益</field>
+            <field name="user_type" ref="user_type_pl19"/>
+        </record>
+        <record id="chart6301" model="account.account.template">
+            <field name="code">6301</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">营业外收入</field>
+            <field name="user_type" ref="user_type_pl23"/>
+        </record>
+        <record id="chart6401" model="account.account.template">
+            <field name="code">6401</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">主营业务成本</field>
+            <field name="user_type" ref="user_type_pl3"/>
+        </record>
+        <record id="chart6402" model="account.account.template">
+            <field name="code">6402</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">其他业务支出</field>
+            <field name="user_type" ref="user_type_pl9"/>
+        </record>
+        <record id="chart6405" model="account.account.template">
+            <field name="code">6405</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">营业税金及附加</field>
+            <field name="user_type" ref="user_type_pl5"/>
+        </record>
+        <record id="chart6601" model="account.account.template">
+            <field name="code">6601</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">销售费用</field>
+            <field name="user_type" ref="user_type_pl11"/>
+        </record>
+        <record id="chart6602" model="account.account.template">
+            <field name="code">6602</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">管理费用</field>
+            <field name="user_type" ref="user_type_pl13"/>
+        </record>
+        <record id="chart6603" model="account.account.template">
+            <field name="code">6603</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">财务费用</field>
+            <field name="user_type" ref="user_type_pl15"/>
+        </record>
+        <record id="chart6701" model="account.account.template">
+            <field name="code">6701</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">资产减值损失</field>
+            <field name="user_type" ref="user_type_pl25"/>
+        </record>
+        <record id="chart6711" model="account.account.template">
+            <field name="code">6711</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">营业外支出</field>
+            <field name="user_type" ref="user_type_pl25"/>
+        </record>
+        <record id="chart6801" model="account.account.template">
+            <field name="code">6801</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">所得税</field>
+            <field name="user_type" ref="user_type_pl29"/>
+        </record>
+        <record id="chart6901" model="account.account.template">
+            <field name="code">6901</field>
+            <field eval="False" name="reconcile"/>
+            <field ref="cn_root" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="name">以前年度损益调整</field>
+            <field name="user_type" ref="user_type_bs121"/>
+        </record>
+
+        <!-- Chart template -->
+        <record id="l10n_chart_china" model="account.chart.template">
+            <field name="name">中国会计科目表  （财会[2006]3号《企业会计准则》）</field>
+            <field name="account_root_id" ref="cn_root"/>
+            <field name="code_digits" eval="4"/>
+            <field name="tax_code_root_id" ref="vat_cn_chart_root"/>
+            <field name="bank_account_view_id" ref="chart1002"/>
+            <field name="property_account_receivable" ref="chart1122"/>
+            <field name="property_account_payable" ref="chart2202"/>
+            <field name="property_account_expense_categ" ref="chart1401"/>
+            <field name="property_account_income_categ" ref="chart6001"/>
+        </record>
+
+        <record id="l10n_chart_china_value" model="ir.values">
+            <field name="name">中国会计科目表  （财会[2006]3号《企业会计准则》）</field>
+            <field name="model">account.chart.template</field>
+            <field name="key">default</field>
+            <field name="res_id" ref="l10n_chart_china"/>
+            <field name="value" ref="base.CNY"/>
+        </record>
+
+        <!-- 增值税 -->
+        <record id="vats" model="account.tax.template">
+            <field name="chart_template_id" ref="l10n_chart_china"/>
+            <field name="name">增值税17%销项税</field>
+            <field eval="0.17" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="chart22210105"/>
+            <field name="account_paid_id" ref="chart22210105"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+        <record id="vatp" model="account.tax.template">
+            <field name="chart_template_id" ref="l10n_chart_china"/>
+            <field name="name">增值税17%进项税</field>
+            <field eval="0.17" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="chart22210101"/>
+            <field name="account_paid_id" ref="chart22210101"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/l10n_cn/account_chart_type.xml b/addons/l10n_cn/account_chart_type.xml
new file mode 100644
index 00000000000..16f3f8ae0ac
--- /dev/null
+++ b/addons/l10n_cn/account_chart_type.xml
@@ -0,0 +1,309 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<!--
+
+    Copyright (C) 2008-now  开阖软件 jeff@osbzr.com    < PM and LTS >
+
+    科目类型
+我们借用这个对象生成资产负债表和损益表
+-->
+    <data noupdate="True">
+        <!-- 根科目，不显示在报表行上 -->
+        <record id="user_type_all" model="account.account.type">
+            <field name="name">不显示在报表上</field>
+            <field name="code">0</field>
+            <field name="close_method">none</field>
+            <field name="report_type">none</field>
+        </record>
+        <!-- 利润表科目 -->
+        <record id="user_type_pl1" model="account.account.type">
+            <field name="name">一、主营业务收入</field>
+            <field name="code">pl1</field>
+            <field name="close_method">none</field>
+            <field name="report_type">income</field>
+        </record>
+        <record id="user_type_pl21" model="account.account.type">
+            <field name="name">补贴收入</field>
+            <field name="code">pl21</field>
+            <field name="close_method">none</field>
+            <field name="report_type">income</field>
+        </record>
+        <record id="user_type_pl3" model="account.account.type">
+            <field name="name">减：主营业务成本</field>
+            <field name="code">pl3</field>
+            <field name="close_method">none</field>
+            <field name="report_type">expense</field>
+        </record>      
+        <record id="user_type_pl5" model="account.account.type">
+            <field name="name">    主营业务税金及附加</field>
+            <field name="code">pl5</field>
+            <field name="close_method">none</field>
+            <field name="report_type">expense</field>
+        </record>                  
+        <record id="user_type_pl9" model="account.account.type">
+            <field name="name">加：其他业务利润（亏损以“－”号填列）</field>
+            <field name="code">pl9</field>
+            <field name="close_method">none</field>
+            <field name="report_type">income</field>
+        </record>
+        <record id="user_type_pl11" model="account.account.type">
+            <field name="name">减：营业费用</field>
+            <field name="code">pl11</field>
+            <field name="close_method">none</field>
+            <field name="report_type">expense</field>
+        </record>
+        <record id="user_type_pl13" model="account.account.type">
+            <field name="name">    管理费用</field>
+            <field name="code">pl13</field>
+            <field name="close_method">none</field>
+            <field name="report_type">expense</field>
+        </record>
+        <record id="user_type_pl15" model="account.account.type">
+            <field name="name">    财务费用</field>
+            <field name="code">pl15</field>
+            <field name="close_method">none</field>
+            <field name="report_type">expense</field>
+        </record>
+        <record id="user_type_pl19" model="account.account.type">
+            <field name="name">加：投资收益（损失以“-”号填列）</field>
+            <field name="code">pl19</field>
+            <field name="close_method">none</field>
+            <field name="report_type">income</field>
+        </record>
+        <record id="user_type_pl23" model="account.account.type">
+            <field name="name">    营业外收入</field>
+            <field name="code">pl23</field>
+            <field name="close_method">none</field>
+            <field name="report_type">income</field>
+        </record>
+        <record id="user_type_pl25" model="account.account.type">
+            <field name="name">减：营业外支出</field>
+            <field name="code">pl25</field>
+            <field name="close_method">none</field>
+            <field name="report_type">expense</field>
+        </record>
+        <record id="user_type_pl29" model="account.account.type">
+            <field name="name">减：所得税</field>
+            <field name="code">pl29</field>
+            <field name="close_method">none</field>
+            <field name="report_type">expense</field>
+        </record>
+        <!-- 资产负债表科目 -->
+        <record id="user_type_bs1" model="account.account.type">
+            <field name="name">货币资金</field>
+            <field name="code">bs1</field>
+            <field name="close_method">balance</field>
+            <field name="report_type">asset</field>
+        </record>
+        <record id="user_type_bs2" model="account.account.type">
+            <field name="name">短期投资</field>
+            <field name="code">bs2</field>
+            <field name="close_method">balance</field>
+            <field name="report_type">asset</field>
+        </record>
+        <record id="user_type_bs3" model="account.account.type">
+            <field name="name">应收票据</field>
+            <field name="code">bs3</field>
+            <field name="close_method">balance</field>
+            <field name="report_type">asset</field>
+        </record>
+        <record id="user_type_bs4" model="account.account.type">
+            <field name="name">应收股利</field>
+            <field name="code">bs4</field>
+            <field name="close_method">balance</field>
+            <field name="report_type">asset</field>
+        </record>
+        <record id="user_type_bs5" model="account.account.type">
+            <field name="name">应收利息</field>
+            <field name="code">bs5</field>
+            <field name="close_method">balance</field>
+            <field name="report_type">asset</field>
+        </record>
+        <record id="user_type_bs6" model="account.account.type">
+            <field name="name">应收账款</field>
+            <field name="code">bs6</field>
+            <field name="close_method">unreconciled</field>
+            <field name="report_type">asset</field>
+        </record>
+        <record id="user_type_bs7" model="account.account.type">
+            <field name="name">其他应收款</field>
+            <field name="code">bs7</field>
+            <field name="close_method">balance</field>
+            <field name="report_type">asset</field>
+        </record>
+        <record id="user_type_bs10" model="account.account.type">
+            <field name="name">存货</field>
+            <field name="code">bs10</field>
+            <field name="close_method">balance</field>
+            <field name="report_type">asset</field>
+        </record>
+        <record id="user_type_bs11" model="account.account.type">
+            <field name="name">待摊费用</field>
+            <field name="code">bs11</field>
+            <field name="close_method">balance</field>
+            <field name="report_type">asset</field>
+        </record>
+        <record id="user_type_bs21" model="account.account.type">
+            <field name="name">一年内到期的长期债权投资</field>
+            <field name="code">bs21</field>
+            <field name="close_method">balance</field>
+            <field name="report_type">asset</field>
+        </record>
+        <record id="user_type_bs32" model="account.account.type">
+            <field name="name">长期股权投资</field>
+            <field name="code">bs32</field>
+            <field name="close_method">balance</field>
+            <field name="report_type">asset</field>
+        </record>
+        <record id="user_type_bs34" model="account.account.type">
+            <field name="name">长期债权投资</field>
+            <field name="code">bs34</field>
+            <field name="close_method">balance</field>
+            <field name="report_type">asset</field>
+        </record>
+        <record id="user_type_bs39" model="account.account.type">
+            <field name="name">固定资产原值</field>
+            <field name="code">bs39</field>
+            <field name="close_method">balance</field>
+            <field name="report_type">asset</field>
+        </record>
+        <record id="user_type_bs40" model="account.account.type">
+            <field name="name">累计折旧</field>
+            <field name="code">bs40</field>
+            <field name="close_method">balance</field>
+            <field name="report_type">asset</field>
+        </record>
+        <record id="user_type_bs42" model="account.account.type">
+            <field name="name">固定资产减值准备</field>
+            <field name="code">bs42</field>
+            <field name="close_method">balance</field>
+            <field name="report_type">asset</field>
+        </record>
+        <record id="user_type_bs44" model="account.account.type">
+            <field name="name">工程物资</field>
+            <field name="code">bs44</field>
+            <field name="close_method">balance</field>
+            <field name="report_type">asset</field>
+        </record>
+        <record id="user_type_bs45" model="account.account.type">
+            <field name="name">在建工程</field>
+            <field name="code">bs45</field>
+            <field name="close_method">balance</field>
+            <field name="report_type">asset</field>
+        </record>
+        <record id="user_type_bs46" model="account.account.type">
+            <field name="name">固定资产清理</field>
+            <field name="code">bs46</field>
+            <field name="close_method">balance</field>
+            <field name="report_type">asset</field>
+        </record>
+        <record id="user_type_bs51" model="account.account.type">
+            <field name="name">无形资产</field>
+            <field name="code">bs51</field>
+            <field name="close_method">balance</field>
+            <field name="report_type">asset</field>
+        </record>
+        <record id="user_type_bs52" model="account.account.type">
+            <field name="name">长期待摊费用</field>
+            <field name="code">bs52</field>
+            <field name="close_method">balance</field>
+            <field name="report_type">asset</field>
+        </record>
+        <record id="user_type_bs61" model="account.account.type">
+            <field name="name">递延税款借项</field>
+            <field name="code">bs61</field>
+            <field name="close_method">balance</field>
+            <field name="report_type">asset</field>
+        </record>
+        <record id="user_type_bs68" model="account.account.type">
+            <field name="name">短期借款</field>
+            <field name="code">bs68</field>
+            <field name="close_method">balance</field>
+            <field name="report_type">liability</field>
+        </record>
+        <record id="user_type_bs69" model="account.account.type">
+            <field name="name">应付票据</field>
+            <field name="code">bs69</field>
+            <field name="close_method">balance</field>
+            <field name="report_type">liability</field>
+        </record>
+        <record id="user_type_bs70" model="account.account.type">
+            <field name="name">应付账款</field>
+            <field name="code">bs70</field>
+            <field name="close_method">unreconciled</field>
+            <field name="report_type">liability</field>
+        </record>
+        <record id="user_type_bs71" model="account.account.type">
+            <field name="name">预收账款</field>
+            <field name="code">bs71</field>
+            <field name="close_method">unreconciled</field>
+            <field name="report_type">liability</field>
+        </record>
+        <record id="user_type_bs72" model="account.account.type">
+            <field name="name">应付工资</field>
+            <field name="code">bs72</field>
+            <field name="close_method">balance</field>
+            <field name="report_type">liability</field>
+        </record>
+        <record id="user_type_bs74" model="account.account.type">
+            <field name="name">应付股利</field>
+            <field name="code">bs74</field>
+            <field name="close_method">balance</field>
+            <field name="report_type">liability</field>
+        </record>
+        <record id="user_type_bs75" model="account.account.type">
+            <field name="name">应交税金</field>
+            <field name="code">bs75</field>
+            <field name="close_method">balance</field>
+            <field name="report_type">liability</field>
+        </record>
+        <record id="user_type_bs82" model="account.account.type">
+            <field name="name">预提费用</field>
+            <field name="code">bs82</field>
+            <field name="close_method">balance</field>
+            <field name="report_type">liability</field>
+        </record>
+        <record id="user_type_bs101" model="account.account.type">
+            <field name="name">长期借款</field>
+            <field name="code">bs101</field>
+            <field name="close_method">balance</field>
+            <field name="report_type">liability</field>
+        </record>
+        <record id="user_type_bs102" model="account.account.type">
+            <field name="name">应付债券</field>
+            <field name="code">bs102</field>
+            <field name="close_method">balance</field>
+            <field name="report_type">liability</field>
+        </record>
+        <record id="user_type_bs103" model="account.account.type">
+            <field name="name">长期应付款</field>
+            <field name="code">bs103</field>
+            <field name="close_method">balance</field>
+            <field name="report_type">liability</field>
+        </record>
+        <record id="user_type_bs115" model="account.account.type">
+            <field name="name">实收资本</field>
+            <field name="code">bs115</field>
+            <field name="close_method">balance</field>
+            <field name="report_type">liability</field>
+        </record>
+        <record id="user_type_bs118" model="account.account.type">
+            <field name="name">资本公积</field>
+            <field name="code">bs118</field>
+            <field name="close_method">balance</field>
+            <field name="report_type">liability</field>
+        </record>
+        <record id="user_type_bs119" model="account.account.type">
+            <field name="name">盈余公积</field>
+            <field name="code">bs119</field>
+            <field name="close_method">balance</field>
+            <field name="report_type">liability</field>
+        </record>
+        <record id="user_type_bs121" model="account.account.type">
+            <field name="name">未分配利润</field>
+            <field name="code">bs121</field>
+            <field name="close_method">balance</field>
+            <field name="report_type">liability</field>
+        </record>        
+    </data>
+</openerp>
diff --git a/addons/l10n_cn/account_tax.xml b/addons/l10n_cn/account_tax.xml
new file mode 100644
index 00000000000..0c02bd099bb
--- /dev/null
+++ b/addons/l10n_cn/account_tax.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<!--
+
+    Copyright (C) 2008-2008 凯源吕鑫 lvxin@gmail.com   <basic chart data>
+    Copyright (C) 2008-now  开阖软件 jeff@osbzr.com    < PM and LTS >
+
+增值税
+-->
+    <data noupdate="True">
+        <!-- Tax Code Configuration -->
+        <record id="vat_cn_chart_root" model="account.tax.code.template">
+            <field name="name">中国税务报表</field>
+            <field name="parent_id" eval="False"/>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/l10n_cn/base_data.xml b/addons/l10n_cn/base_data.xml
index c65978b6560..e34ed0f0e43 100644
--- a/addons/l10n_cn/base_data.xml
+++ b/addons/l10n_cn/base_data.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0"?>
 <openerp>
+
+<!-- 
+    Copyright (C) 2008-2008 维智众源 oldrev@gmail.com  <states data>
+    Copyright (C) 2008-now  开阖软件 jeff@osbzr.com    < PM and LTS >
+
+依据《 中华人民共和国行政区划代码（国家标准  GB/T 2260-2007》 编制
+http://www.cvh.org.cn/cms/sites/default/files/GBT2260-2007.pdf
+-->
+
     <data noupdate="1">
 
         <!-- 添加省份数据 -->
@@ -48,7 +57,7 @@
             <field name="code">鲁</field>
             <field name="country_id" ref="base.cn"/>
         </record>
-        <record id="state_HeN" model="res.country.state">
+        <record id="state_HA" model="res.country.state">
             <field name="name">河南省</field>
             <field name="code">豫</field>
             <field name="country_id" ref="base.cn"/>
@@ -58,7 +67,7 @@
             <field name="code">蒙</field>
             <field name="country_id" ref="base.cn"/>
         </record>
-        <record id="state_HuB" model="res.country.state">
+        <record id="state_HB" model="res.country.state">
             <field name="name">湖北省</field>
             <field name="code">鄂</field>
             <field name="country_id" ref="base.cn"/>
@@ -68,7 +77,7 @@
             <field name="code">新</field>
             <field name="country_id" ref="base.cn"/>
         </record>
-        <record id="state_HuN" model="res.country.state">
+        <record id="state_HN" model="res.country.state">
             <field name="name">湖南省</field>
             <field name="code">湘</field>
             <field name="country_id" ref="base.cn"/>
@@ -88,7 +97,7 @@
             <field name="code">藏</field>
             <field name="country_id" ref="base.cn"/>
         </record>
-        <record id="state_HaN" model="res.country.state">
+        <record id="state_HI" model="res.country.state">
             <field name="name">海南省</field>
             <field name="code">琼</field>
             <field name="country_id" ref="base.cn"/>
@@ -103,7 +112,7 @@
             <field name="code">蜀</field>
             <field name="country_id" ref="base.cn"/>
         </record>
-        <record id="state_HeB" model="res.country.state">
+        <record id="state_HE" model="res.country.state">
             <field name="name">河北省</field>
             <field name="code">冀</field>
             <field name="country_id" ref="base.cn"/>
@@ -128,7 +137,7 @@
             <field name="code">辽</field>
             <field name="country_id" ref="base.cn"/>
         </record>
-        <record id="state_SX" model="res.country.state">
+        <record id="state_SN" model="res.country.state">
             <field name="name">陕西省</field>
             <field name="code">陕</field>
             <field name="country_id" ref="base.cn"/>
@@ -158,5 +167,23 @@
             <field name="code">苏</field>
             <field name="country_id" ref="base.cn"/>
         </record>
+
+        <record id="state_TW" model="res.country.state">
+            <field name="name">台湾省</field>
+            <field name="code">台</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_HK" model="res.country.state">
+            <field name="name">香港特别行政区</field>
+            <field name="code">港</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_MO" model="res.country.state">
+            <field name="name">澳门特别行政区</field>
+            <field name="code">澳</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+    
+    
     </data>
 </openerp>
diff --git a/addons/l10n_cn/i18n/ar.po b/addons/l10n_cn/i18n/ar.po
deleted file mode 100644
index 6ec2fad3a3f..00000000000
--- a/addons/l10n_cn/i18n/ar.po
+++ /dev/null
@@ -1,62 +0,0 @@
-# Arabic translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-01-17 10:52+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Arabic <ar@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_profit_and_loss
-msgid "损益类"
-msgstr ""
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_all
-msgid "所有科目"
-msgstr ""
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_equity
-msgid "所有者权益类"
-msgstr ""
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_capital
-msgid "资产类"
-msgstr ""
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_debt
-msgid "负债类"
-msgstr ""
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_cost
-msgid "成本类"
-msgstr ""
-
-#~ msgid ""
-#~ "Generate Chart of Accounts from a Chart Template. You will be asked to pass "
-#~ "the name of the company, the chart template to follow, the no. of digits to "
-#~ "generate the code for your accounts and Bank account, currency to create "
-#~ "Journals. Thus,the pure copy of chart Template is generated.\n"
-#~ "\tThis is the same wizard that runs from Financial "
-#~ "Management/Configuration/Financial Accounting/Financial Accounts/Generate "
-#~ "Chart of Accounts from a Chart Template."
-#~ msgstr ""
-#~ "إعداد شجرة الحسابات من قالب. ستم سؤالك عن اسم المنشأة، القالب المتبع، و "
-#~ "إعداد أكواد الحسابات و البنوك، بالإضافة إلي يوميات العملة. و لذلك سيكون هناك "
-#~ "قالب جديد. \n"
-#~ "\tهذه لإعداد الحسابات."
diff --git a/addons/l10n_cn/i18n/ca.po b/addons/l10n_cn/i18n/ca.po
deleted file mode 100644
index c10a0e835ec..00000000000
--- a/addons/l10n_cn/i18n/ca.po
+++ /dev/null
@@ -1,82 +0,0 @@
-# Catalan translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2011-02-15 15:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Catalan <ca@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_profit_and_loss
-msgid "损益类"
-msgstr ""
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_all
-msgid "所有科目"
-msgstr ""
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_equity
-msgid "所有者权益类"
-msgstr ""
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_capital
-msgid "资产类"
-msgstr ""
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_debt
-msgid "负债类"
-msgstr ""
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_cost
-msgid "成本类"
-msgstr ""
-
-#~ msgid "中国会计科目表"
-#~ msgstr "Pla comptable xinès"
-
-#~ msgid ""
-#~ "\n"
-#~ "        添加中文省份数据\n"
-#~ "        科目类型\\会计科目表模板\\增值税\\辅助核算类别\\管理会计凭证簿\\财务会计凭证簿\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "        Afegeix dades de les províncies xineses\n"
-#~ "Sense perjudici de tipus/Plantilla Pla Comptable/Classes de liquidació de "
-#~ "l'IVA/Auxiliar/Documents de Gestió de Llibres Comptables/Llibres de "
-#~ "Documents de Comptabilitat Financera\n"
-#~ "    "
-
-#~ msgid ""
-#~ "Generate Chart of Accounts from a Chart Template. You will be asked to pass "
-#~ "the name of the company, the chart template to follow, the no. of digits to "
-#~ "generate the code for your accounts and Bank account, currency to create "
-#~ "Journals. Thus,the pure copy of chart Template is generated.\n"
-#~ "\tThis is the same wizard that runs from Financial "
-#~ "Management/Configuration/Financial Accounting/Financial Accounts/Generate "
-#~ "Chart of Accounts from a Chart Template."
-#~ msgstr ""
-#~ "Genera el pla de comptes des d'una plantilla de pla. Se us demanarà el nom "
-#~ "de l'empresa, la plantilla de pla a seguir, i el número de dígits per "
-#~ "generar el codi dels vostres comptes, compte bancari, i divisa per crear els "
-#~ "vostres diaris. Per tant, es genera una còpia directa de la plantilla del "
-#~ "pla de comptes.\n"
-#~ "\t Aquest és el mateix assistent que s'executa des de "
-#~ "Comptabilitat/Configuració/Comptabilitat financera/Comptes financers/Genera "
-#~ "pla comptable des d'una plantilla de pla comptable."
diff --git a/addons/l10n_cn/i18n/da.po b/addons/l10n_cn/i18n/da.po
deleted file mode 100644
index f4f89775f34..00000000000
--- a/addons/l10n_cn/i18n/da.po
+++ /dev/null
@@ -1,48 +0,0 @@
-# Danish translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-01-27 09:02+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Danish <da@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_profit_and_loss
-msgid "损益类"
-msgstr ""
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_all
-msgid "所有科目"
-msgstr ""
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_equity
-msgid "所有者权益类"
-msgstr ""
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_capital
-msgid "资产类"
-msgstr ""
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_debt
-msgid "负债类"
-msgstr ""
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_cost
-msgid "成本类"
-msgstr ""
diff --git a/addons/l10n_cn/i18n/es.po b/addons/l10n_cn/i18n/es.po
deleted file mode 100644
index e4ebc06462f..00000000000
--- a/addons/l10n_cn/i18n/es.po
+++ /dev/null
@@ -1,82 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2011-02-15 15:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_profit_and_loss
-msgid "损益类"
-msgstr "Categorías de pérdidas y ganancias"
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_all
-msgid "所有科目"
-msgstr "Todos los sujetos"
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_equity
-msgid "所有者权益类"
-msgstr "Equidad del propietario"
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_capital
-msgid "资产类"
-msgstr "Clases de activos"
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_debt
-msgid "负债类"
-msgstr "Clases de pasivo"
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_cost
-msgid "成本类"
-msgstr "Clases de gastos"
-
-#~ msgid ""
-#~ "Generate Chart of Accounts from a Chart Template. You will be asked to pass "
-#~ "the name of the company, the chart template to follow, the no. of digits to "
-#~ "generate the code for your accounts and Bank account, currency to create "
-#~ "Journals. Thus,the pure copy of chart Template is generated.\n"
-#~ "\tThis is the same wizard that runs from Financial "
-#~ "Management/Configuration/Financial Accounting/Financial Accounts/Generate "
-#~ "Chart of Accounts from a Chart Template."
-#~ msgstr ""
-#~ "Generar el plan contable a partir de una plantilla de plan contable. Se le "
-#~ "pedirá el nombre de la compañía, la plantilla de plan contable a utilizar, "
-#~ "el número de dígitos para generar el código de las cuentas y de la cuenta "
-#~ "bancaria, la moneda para crear los diarios. Así pues, se genere una copia "
-#~ "exacta de la plantilla de plan contable.\n"
-#~ "\tEste es el mismo asistente que se ejecuta desde Contabilidad y finanzas / "
-#~ "Configuración / Contabilidad financiera / Cuentas financieras / Generar el "
-#~ "plan contable a partir de una plantilla de plan contable."
-
-#~ msgid "中国会计科目表"
-#~ msgstr "Plan Contable Chino"
-
-#~ msgid ""
-#~ "\n"
-#~ "        添加中文省份数据\n"
-#~ "        科目类型\\会计科目表模板\\增值税\\辅助核算类别\\管理会计凭证簿\\财务会计凭证簿\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "        Añadir datos de las provincias chinas\n"
-#~ "        Sin perjuicio de tipo/Plantilla Plan Contable/Clases de liquidación "
-#~ "del IVA/Auxiliar/Documentos de Gestión de Libros Contables/Libros de "
-#~ "Documentos de Contabilidad Financiera\n"
-#~ "    "
diff --git a/addons/l10n_cn/i18n/es_CR.po b/addons/l10n_cn/i18n/es_CR.po
deleted file mode 100644
index 9a665f359c1..00000000000
--- a/addons/l10n_cn/i18n/es_CR.po
+++ /dev/null
@@ -1,83 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-02-17 17:39+0000\n"
-"Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
-"Language: es\n"
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_profit_and_loss
-msgid "损益类"
-msgstr "Pérdidas y ganancias de clase"
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_all
-msgid "所有科目"
-msgstr "Todos los sujetos"
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_equity
-msgid "所有者权益类"
-msgstr "Propietario de la equidad"
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_capital
-msgid "资产类"
-msgstr "Clase de activos"
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_debt
-msgid "负债类"
-msgstr "Pasivo"
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_cost
-msgid "成本类"
-msgstr "Costo de clase"
-
-#~ msgid ""
-#~ "Generate Chart of Accounts from a Chart Template. You will be asked to pass "
-#~ "the name of the company, the chart template to follow, the no. of digits to "
-#~ "generate the code for your accounts and Bank account, currency to create "
-#~ "Journals. Thus,the pure copy of chart Template is generated.\n"
-#~ "\tThis is the same wizard that runs from Financial "
-#~ "Management/Configuration/Financial Accounting/Financial Accounts/Generate "
-#~ "Chart of Accounts from a Chart Template."
-#~ msgstr ""
-#~ "Generar el plan contable a partir de una plantilla de plan contable. Se le "
-#~ "pedirá el nombre de la compañía, la plantilla de plan contable a utilizar, "
-#~ "el número de dígitos para generar el código de las cuentas y de la cuenta "
-#~ "bancaria, la moneda para crear los diarios. Así pues, se genere una copia "
-#~ "exacta de la plantilla de plan contable.\n"
-#~ "\tEste es el mismo asistente que se ejecuta desde Contabilidad y finanzas / "
-#~ "Configuración / Contabilidad financiera / Cuentas financieras / Generar el "
-#~ "plan contable a partir de una plantilla de plan contable."
-
-#~ msgid "中国会计科目表"
-#~ msgstr "Plan Contable Chino"
-
-#~ msgid ""
-#~ "\n"
-#~ "        添加中文省份数据\n"
-#~ "        科目类型\\会计科目表模板\\增值税\\辅助核算类别\\管理会计凭证簿\\财务会计凭证簿\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "        Añadir datos de las provincias chinas\n"
-#~ "        Sin perjuicio de tipo/Plantilla Plan Contable/Clases de liquidación "
-#~ "del IVA/Auxiliar/Documentos de Gestión de Libros Contables/Libros de "
-#~ "Documentos de Contabilidad Financiera\n"
-#~ "    "
diff --git a/addons/l10n_cn/i18n/es_MX.po b/addons/l10n_cn/i18n/es_MX.po
deleted file mode 100644
index 644264c1527..00000000000
--- a/addons/l10n_cn/i18n/es_MX.po
+++ /dev/null
@@ -1,58 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-07 05:27+0000\n"
-"PO-Revision-Date: 2011-02-15 15:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:59+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: l10n_cn
-#: model:ir.module.module,shortdesc:l10n_cn.module_meta_information
-msgid "中国会计科目表"
-msgstr "Plan Contable Chino"
-
-#. module: l10n_cn
-#: model:ir.module.module,description:l10n_cn.module_meta_information
-msgid ""
-"\n"
-"        添加中文省份数据\n"
-"        科目类型\\会计科目表模板\\增值税\\辅助核算类别\\管理会计凭证簿\\财务会计凭证簿\n"
-"    "
-msgstr ""
-"\n"
-"        Añadir datos de las provincias chinas\n"
-"        Sin perjuicio de tipo/Plantilla Plan Contable/Clases de liquidación "
-"del IVA/Auxiliar/Documentos de Gestión de Libros Contables/Libros de "
-"Documentos de Contabilidad Financiera\n"
-"    "
-
-#. module: l10n_cn
-#: model:ir.actions.todo,note:l10n_cn.config_call_account_template_cn_chart
-msgid ""
-"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
-"the name of the company, the chart template to follow, the no. of digits to "
-"generate the code for your accounts and Bank account, currency to create "
-"Journals. Thus,the pure copy of chart Template is generated.\n"
-"\tThis is the same wizard that runs from Financial "
-"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
-"Chart of Accounts from a Chart Template."
-msgstr ""
-"Generar el plan contable a partir de una plantilla de plan contable. Se le "
-"pedirá el nombre de la compañía, la plantilla de plan contable a utilizar, "
-"el número de dígitos para generar el código de las cuentas y de la cuenta "
-"bancaria, la moneda para crear los diarios. Así pues, se genere una copia "
-"exacta de la plantilla de plan contable.\n"
-"\tEste es el mismo asistente que se ejecuta desde Contabilidad y finanzas / "
-"Configuración / Contabilidad financiera / Cuentas financieras / Generar el "
-"plan contable a partir de una plantilla de plan contable."
diff --git a/addons/l10n_cn/i18n/es_PY.po b/addons/l10n_cn/i18n/es_PY.po
deleted file mode 100644
index 8626064ec74..00000000000
--- a/addons/l10n_cn/i18n/es_PY.po
+++ /dev/null
@@ -1,82 +0,0 @@
-# Spanish (Paraguay) translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2011-03-21 16:19+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Spanish (Paraguay) <es_PY@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_profit_and_loss
-msgid "损益类"
-msgstr ""
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_all
-msgid "所有科目"
-msgstr ""
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_equity
-msgid "所有者权益类"
-msgstr ""
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_capital
-msgid "资产类"
-msgstr ""
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_debt
-msgid "负债类"
-msgstr ""
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_cost
-msgid "成本类"
-msgstr ""
-
-#~ msgid "中国会计科目表"
-#~ msgstr "Plan Contable Chino"
-
-#~ msgid ""
-#~ "\n"
-#~ "        添加中文省份数据\n"
-#~ "        科目类型\\会计科目表模板\\增值税\\辅助核算类别\\管理会计凭证簿\\财务会计凭证簿\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "        Añadir datos de las provincias chinas\n"
-#~ "        Sin perjuicio de tipo/Plantilla Plan Contable/Clases de liquidación "
-#~ "del IVA/Auxiliar/Documentos de Gestión de Libros Contables/Libros de "
-#~ "Documentos de Contabilidad Financiera\n"
-#~ "    "
-
-#~ msgid ""
-#~ "Generate Chart of Accounts from a Chart Template. You will be asked to pass "
-#~ "the name of the company, the chart template to follow, the no. of digits to "
-#~ "generate the code for your accounts and Bank account, currency to create "
-#~ "Journals. Thus,the pure copy of chart Template is generated.\n"
-#~ "\tThis is the same wizard that runs from Financial "
-#~ "Management/Configuration/Financial Accounting/Financial Accounts/Generate "
-#~ "Chart of Accounts from a Chart Template."
-#~ msgstr ""
-#~ "Generar el plan contable a partir de una plantilla de plan contable. Se le "
-#~ "pedirá el nombre de la compañía, la plantilla de plan contable a utilizar, "
-#~ "el número de dígitos para generar el código de las cuentas y de la cuenta "
-#~ "bancaria, la moneda para crear los diarios. Así pues, se genere una copia "
-#~ "exacta de la plantilla de plan contable.\n"
-#~ "\tEste es el mismo asistente que se ejecuta desde Contabilidad y finanzas / "
-#~ "Configuración / Contabilidad financiera / Cuentas financieras / Generar el "
-#~ "plan contable a partir de una plantilla de plan contable."
diff --git a/addons/l10n_cn/i18n/es_VE.po b/addons/l10n_cn/i18n/es_VE.po
deleted file mode 100644
index 644264c1527..00000000000
--- a/addons/l10n_cn/i18n/es_VE.po
+++ /dev/null
@@ -1,58 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-07 05:27+0000\n"
-"PO-Revision-Date: 2011-02-15 15:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:59+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: l10n_cn
-#: model:ir.module.module,shortdesc:l10n_cn.module_meta_information
-msgid "中国会计科目表"
-msgstr "Plan Contable Chino"
-
-#. module: l10n_cn
-#: model:ir.module.module,description:l10n_cn.module_meta_information
-msgid ""
-"\n"
-"        添加中文省份数据\n"
-"        科目类型\\会计科目表模板\\增值税\\辅助核算类别\\管理会计凭证簿\\财务会计凭证簿\n"
-"    "
-msgstr ""
-"\n"
-"        Añadir datos de las provincias chinas\n"
-"        Sin perjuicio de tipo/Plantilla Plan Contable/Clases de liquidación "
-"del IVA/Auxiliar/Documentos de Gestión de Libros Contables/Libros de "
-"Documentos de Contabilidad Financiera\n"
-"    "
-
-#. module: l10n_cn
-#: model:ir.actions.todo,note:l10n_cn.config_call_account_template_cn_chart
-msgid ""
-"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
-"the name of the company, the chart template to follow, the no. of digits to "
-"generate the code for your accounts and Bank account, currency to create "
-"Journals. Thus,the pure copy of chart Template is generated.\n"
-"\tThis is the same wizard that runs from Financial "
-"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
-"Chart of Accounts from a Chart Template."
-msgstr ""
-"Generar el plan contable a partir de una plantilla de plan contable. Se le "
-"pedirá el nombre de la compañía, la plantilla de plan contable a utilizar, "
-"el número de dígitos para generar el código de las cuentas y de la cuenta "
-"bancaria, la moneda para crear los diarios. Así pues, se genere una copia "
-"exacta de la plantilla de plan contable.\n"
-"\tEste es el mismo asistente que se ejecuta desde Contabilidad y finanzas / "
-"Configuración / Contabilidad financiera / Cuentas financieras / Generar el "
-"plan contable a partir de una plantilla de plan contable."
diff --git a/addons/l10n_cn/i18n/gl.po b/addons/l10n_cn/i18n/gl.po
deleted file mode 100644
index 8a3abf434b9..00000000000
--- a/addons/l10n_cn/i18n/gl.po
+++ /dev/null
@@ -1,81 +0,0 @@
-# Galician translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2011-02-15 15:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Galician <gl@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_profit_and_loss
-msgid "损益类"
-msgstr ""
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_all
-msgid "所有科目"
-msgstr ""
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_equity
-msgid "所有者权益类"
-msgstr ""
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_capital
-msgid "资产类"
-msgstr ""
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_debt
-msgid "负债类"
-msgstr ""
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_cost
-msgid "成本类"
-msgstr ""
-
-#~ msgid "中国会计科目表"
-#~ msgstr "Plan de contas chinés"
-
-#~ msgid ""
-#~ "\n"
-#~ "        添加中文省份数据\n"
-#~ "        科目类型\\会计科目表模板\\增值税\\辅助核算类别\\管理会计凭证簿\\财务会计凭证簿\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "        Engade-los datos do plan de contas chinés\n"
-#~ "        Asunto tipo \\ carta de modelo de contas \\ clases que o IVE \\ "
-#~ "auxiliares \\ documentos de contabilidade de xestión libros \\ libros de "
-#~ "documentos da contabilidade financeira\n"
-#~ "    "
-
-#~ msgid ""
-#~ "Generate Chart of Accounts from a Chart Template. You will be asked to pass "
-#~ "the name of the company, the chart template to follow, the no. of digits to "
-#~ "generate the code for your accounts and Bank account, currency to create "
-#~ "Journals. Thus,the pure copy of chart Template is generated.\n"
-#~ "\tThis is the same wizard that runs from Financial "
-#~ "Management/Configuration/Financial Accounting/Financial Accounts/Generate "
-#~ "Chart of Accounts from a Chart Template."
-#~ msgstr ""
-#~ "Xera un plan de contas a partir dun modelo xenérico. Pediráselle o nome da "
-#~ "compañía, o modelo contable a seguir, o número de díxitos para xera-lo "
-#~ "código das súas contas e da súa conta e divisa bancaria para crea-los "
-#~ "diarios. Así, xerarase unha copia íntegra do modelo contable.\n"
-#~ "\t Este é o mesmo asistente que se executa desde 'Xestión "
-#~ "Financieira/Configuración/Contabilidade Financieira/Contas "
-#~ "Financieiras/Xerar plan de contas dende un modelo base."
diff --git a/addons/l10n_cn/i18n/it.po b/addons/l10n_cn/i18n/it.po
deleted file mode 100644
index 3f48d3bd85e..00000000000
--- a/addons/l10n_cn/i18n/it.po
+++ /dev/null
@@ -1,66 +0,0 @@
-# Italian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2011-02-15 15:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Italian <it@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_profit_and_loss
-msgid "损益类"
-msgstr ""
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_all
-msgid "所有科目"
-msgstr ""
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_equity
-msgid "所有者权益类"
-msgstr ""
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_capital
-msgid "资产类"
-msgstr ""
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_debt
-msgid "负债类"
-msgstr ""
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_cost
-msgid "成本类"
-msgstr ""
-
-#~ msgid ""
-#~ "Generate Chart of Accounts from a Chart Template. You will be asked to pass "
-#~ "the name of the company, the chart template to follow, the no. of digits to "
-#~ "generate the code for your accounts and Bank account, currency to create "
-#~ "Journals. Thus,the pure copy of chart Template is generated.\n"
-#~ "\tThis is the same wizard that runs from Financial "
-#~ "Management/Configuration/Financial Accounting/Financial Accounts/Generate "
-#~ "Chart of Accounts from a Chart Template."
-#~ msgstr ""
-#~ "Genera il Piano dei Conti da un Modello. Vi verrà richiesto di passare il "
-#~ "nome dell'azienda, il modello da seguire, il numero di decimali per generare "
-#~ "il codice dei tuoi conti e, per il conto della Banca, la valuta per creare "
-#~ "il Libro Giornale. Così una copia vergine del Piano dei Conti, derivatante "
-#~ "dal modello, viene generata.\n"
-#~ "\tQuesto è la stessa procedura automatica che viene lanciata da: Gestione "
-#~ "Finanziaria / Configurazione / Contabilità / Conti finanziari / Genera il "
-#~ "Piano dei conti da un modello."
diff --git a/addons/l10n_cn/i18n/l10n_cn.pot b/addons/l10n_cn/i18n/l10n_cn.pot
deleted file mode 100644
index 49c4b2fda2f..00000000000
--- a/addons/l10n_cn/i18n/l10n_cn.pot
+++ /dev/null
@@ -1,47 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* l10n_cn
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 7.0alpha\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-11-24 02:53+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_profit_and_loss
-msgid "损益类"
-msgstr ""
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_all
-msgid "所有科目"
-msgstr ""
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_equity
-msgid "所有者权益类"
-msgstr ""
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_capital
-msgid "资产类"
-msgstr ""
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_debt
-msgid "负债类"
-msgstr ""
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_cost
-msgid "成本类"
-msgstr ""
-
diff --git a/addons/l10n_cn/i18n/nb.po b/addons/l10n_cn/i18n/nb.po
deleted file mode 100644
index 5bfc4cfe851..00000000000
--- a/addons/l10n_cn/i18n/nb.po
+++ /dev/null
@@ -1,64 +0,0 @@
-# Norwegian Bokmal translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-09-08 19:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Norwegian Bokmal <nb@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_profit_and_loss
-msgid "损益类"
-msgstr "Gevinst eller tap kategori."
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_all
-msgid "所有科目"
-msgstr "Alle fag."
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_equity
-msgid "所有者权益类"
-msgstr "Eiernes egenkapital."
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_capital
-msgid "资产类"
-msgstr "Aktivaklasser"
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_debt
-msgid "负债类"
-msgstr "Gjeld klasse."
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_cost
-msgid "成本类"
-msgstr "Kostnaden for klassen"
-
-#~ msgid ""
-#~ "Generate Chart of Accounts from a Chart Template. You will be asked to pass "
-#~ "the name of the company, the chart template to follow, the no. of digits to "
-#~ "generate the code for your accounts and Bank account, currency to create "
-#~ "Journals. Thus,the pure copy of chart Template is generated.\n"
-#~ "\tThis is the same wizard that runs from Financial "
-#~ "Management/Configuration/Financial Accounting/Financial Accounts/Generate "
-#~ "Chart of Accounts from a Chart Template."
-#~ msgstr ""
-#~ "Generere Kontoplan fra en diagrammal. Du vil bli bedt om å passere navnet på "
-#~ "selskapet, diagrammal til følge, nei. sifre som skal generere koden for "
-#~ "kontoene og bankkonto, valuta å skape Journals. Dermed er den rene kopi av "
-#~ "diagrammal generert.\n"
-#~ "\t Dette er den samme veiviser som går fra økonomistyring / konfigurasjon / "
-#~ "finansiell Regnskap / finansregnskapet / Generer Kontoplan fra en diagrammal."
diff --git a/addons/l10n_cn/i18n/pt_BR.po b/addons/l10n_cn/i18n/pt_BR.po
deleted file mode 100644
index 7771286e52b..00000000000
--- a/addons/l10n_cn/i18n/pt_BR.po
+++ /dev/null
@@ -1,79 +0,0 @@
-# Brazilian Portuguese translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-10-16 23:56+0000\n"
-"Last-Translator: Syllas F. de O. Neto <syllasneto@gmail.com>\n"
-"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_profit_and_loss
-msgid "损益类"
-msgstr "Categoria Lucro ou Prejuízo"
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_all
-msgid "所有科目"
-msgstr "Todos os assuntos"
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_equity
-msgid "所有者权益类"
-msgstr "Capital Próprio"
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_capital
-msgid "资产类"
-msgstr "Classe Ativos"
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_debt
-msgid "负债类"
-msgstr "Classe Passivos"
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_cost
-msgid "成本类"
-msgstr "Custo da Classe"
-
-#~ msgid "中国会计科目表"
-#~ msgstr "中国会计科目表"
-
-#~ msgid ""
-#~ "\n"
-#~ "        添加中文省份数据\n"
-#~ "        科目类型\\会计科目表模板\\增值税\\辅助核算类别\\管理会计凭证簿\\财务会计凭证簿\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "        添加中文省份数据\n"
-#~ "        科目类型\\会计科目表模板\\增值税\\辅助核算类别\\管理会计凭证簿\\财务会计凭证簿\n"
-#~ "    "
-
-#~ msgid ""
-#~ "Generate Chart of Accounts from a Chart Template. You will be asked to pass "
-#~ "the name of the company, the chart template to follow, the no. of digits to "
-#~ "generate the code for your accounts and Bank account, currency to create "
-#~ "Journals. Thus,the pure copy of chart Template is generated.\n"
-#~ "\tThis is the same wizard that runs from Financial "
-#~ "Management/Configuration/Financial Accounting/Financial Accounts/Generate "
-#~ "Chart of Accounts from a Chart Template."
-#~ msgstr ""
-#~ "Gerar Gráfico de Contas apartir de um modelo. Você deverá informar o nome da "
-#~ "empresa, o gráfico modelo, o número de dígitos para gerar o código para suas "
-#~ "contas, a conta bancária e a moeda para gerar a sequência. Em seguida uma "
-#~ "cópia do gráfico modelo é gerada.\n"
-#~ "Este é o mesmo assistente que é executado a partir de Gerenciamento "
-#~ "Financeiro/Configuração/Contabilidade Financeira/Contas Financeiras/Gerar "
-#~ "Gráfico de Contas a partir de um Gráfico Modelo."
diff --git a/addons/l10n_cn/i18n/sr@latin.po b/addons/l10n_cn/i18n/sr@latin.po
deleted file mode 100644
index 96377cfa929..00000000000
--- a/addons/l10n_cn/i18n/sr@latin.po
+++ /dev/null
@@ -1,76 +0,0 @@
-# Serbian Latin translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2011-10-13 15:14+0000\n"
-"Last-Translator: Milan Milosevic <Unknown>\n"
-"Language-Team: Serbian Latin <sr@latin@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_profit_and_loss
-msgid "损益类"
-msgstr ""
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_all
-msgid "所有科目"
-msgstr ""
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_equity
-msgid "所有者权益类"
-msgstr ""
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_capital
-msgid "资产类"
-msgstr ""
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_debt
-msgid "负债类"
-msgstr ""
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_cost
-msgid "成本类"
-msgstr ""
-
-#~ msgid ""
-#~ "\n"
-#~ "        添加中文省份数据\n"
-#~ "        科目类型\\会计科目表模板\\增值税\\辅助核算类别\\管理会计凭证簿\\财务会计凭证簿\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "        添加中文省份数据\n"
-#~ "        科目类型\\会计科目表模板\\增值税\\辅助核算类别\\管理会计凭证簿\\财务会计凭证簿\n"
-#~ "    "
-
-#~ msgid ""
-#~ "Generate Chart of Accounts from a Chart Template. You will be asked to pass "
-#~ "the name of the company, the chart template to follow, the no. of digits to "
-#~ "generate the code for your accounts and Bank account, currency to create "
-#~ "Journals. Thus,the pure copy of chart Template is generated.\n"
-#~ "\tThis is the same wizard that runs from Financial "
-#~ "Management/Configuration/Financial Accounting/Financial Accounts/Generate "
-#~ "Chart of Accounts from a Chart Template."
-#~ msgstr ""
-#~ "Generiše tabelu računâ iz  šablona tabelâ.  Bićete upitani za ime kompanije, "
-#~ "šablon tabelâ koji ćete pratiti, broj cifara za generisanje koda za Vaše "
-#~ "naloge i bankovni račun, valuta za pravljenje dnevnika. Na taj način se "
-#~ "generiše čista kopija šablona tabelâ.\n"
-#~ "\tTo je isti setup wizard koji se pokreće iz Financial "
-#~ "Management/Configuration/Financial Accounting/Financial Accounts/Generate "
-#~ "Chart of Accounts from a Chart Template."
diff --git a/addons/l10n_cn/i18n/tr.po b/addons/l10n_cn/i18n/tr.po
deleted file mode 100644
index 97a48ca9ac7..00000000000
--- a/addons/l10n_cn/i18n/tr.po
+++ /dev/null
@@ -1,79 +0,0 @@
-# Turkish translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2011-06-08 10:15+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Turkish <tr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_profit_and_loss
-msgid "损益类"
-msgstr ""
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_all
-msgid "所有科目"
-msgstr ""
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_equity
-msgid "所有者权益类"
-msgstr ""
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_capital
-msgid "资产类"
-msgstr ""
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_debt
-msgid "负债类"
-msgstr ""
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_cost
-msgid "成本类"
-msgstr ""
-
-#~ msgid "中国会计科目表"
-#~ msgstr "中国会计科目表"
-
-#~ msgid ""
-#~ "\n"
-#~ "        添加中文省份数据\n"
-#~ "        科目类型\\会计科目表模板\\增值税\\辅助核算类别\\管理会计凭证簿\\财务会计凭证簿\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "        添加中文省份数据\n"
-#~ "        科目类型\\会计科目表模板\\增值税\\辅助核算类别\\管理会计凭证簿\\财务会计凭证簿\n"
-#~ "    "
-
-#~ msgid ""
-#~ "Generate Chart of Accounts from a Chart Template. You will be asked to pass "
-#~ "the name of the company, the chart template to follow, the no. of digits to "
-#~ "generate the code for your accounts and Bank account, currency to create "
-#~ "Journals. Thus,the pure copy of chart Template is generated.\n"
-#~ "\tThis is the same wizard that runs from Financial "
-#~ "Management/Configuration/Financial Accounting/Financial Accounts/Generate "
-#~ "Chart of Accounts from a Chart Template."
-#~ msgstr ""
-#~ "Bir Tablo Şablonundan bir Hesap Tablosu oluşturun. Firma adını girmeniz, "
-#~ "hesaplarınızın ve banka hesaplarınızın kodlarının oluşturulması için rakam "
-#~ "sayısını, yevmiyeleri oluşturmak için para birimini girmeniz istenecektir. "
-#~ "Böylece sade bir hesap planı oluşturumuş olur.\n"
-#~ "\t Bu sihirbaz, Mali Yönetim/Yapılandırma/Mali Muhasebe/Mali Hesaplar/Tablo "
-#~ "Şablonundan Hesap planı Oluşturma menüsünden çalıştırılan sihirbaz ile "
-#~ "aynıdır."
diff --git a/addons/l10n_cn/i18n/zh_CN.po b/addons/l10n_cn/i18n/zh_CN.po
deleted file mode 100644
index 540f3223ee3..00000000000
--- a/addons/l10n_cn/i18n/zh_CN.po
+++ /dev/null
@@ -1,48 +0,0 @@
-# Chinese (Simplified) translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-03-20 02:42+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_profit_and_loss
-msgid "损益类"
-msgstr "损益类"
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_all
-msgid "所有科目"
-msgstr "所有科目"
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_equity
-msgid "所有者权益类"
-msgstr "所有者权益类"
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_capital
-msgid "资产类"
-msgstr "资产类"
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_debt
-msgid "负债类"
-msgstr "负债类"
-
-#. module: l10n_cn
-#: model:account.account.type,name:l10n_cn.user_type_cost
-msgid "成本类"
-msgstr "成本类"
diff --git a/addons/l10n_cn/l10n_chart_cn_wizard.xml b/addons/l10n_cn/l10n_chart_cn_wizard.xml
index 52aaa88fdab..465c3816d83 100644
--- a/addons/l10n_cn/l10n_chart_cn_wizard.xml
+++ b/addons/l10n_cn/l10n_chart_cn_wizard.xml
@@ -1,4 +1,12 @@
 <openerp>
+
+<!--
+ 
+    Copyright (C) 2008-2008 维智众源 oldrev@gmail.com  <states data>
+    Copyright (C) 2008-now  开阖软件 jeff@osbzr.com    < PM and LTS >
+    
+-->
+
     <data noupdate="1">
         <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
             <field name="state">open</field>