From 79649a6226175b930920fca55369c69a4153f794 Mon Sep 17 00:00:00 2001
From: Michael Hohn <hohn@github.com>
Date: Sat, 18 Dec 2021 14:58:51 -0800
Subject: [PATCH] Add treeio/ files referenced in sarif

---
 .../treeio/treeio/static/js/12o_super_mini.js |  8305 +++++++
 data/treeio/treeio/static/js/chat.js          |   561 +
 .../static/js/colorbox/example1/index.html    |    95 +
 .../static/js/colorbox/example2/index.html    |    95 +
 .../static/js/colorbox/example3/index.html    |    95 +
 .../static/js/colorbox/example4/index.html    |    95 +
 .../static/js/colorbox/example5/index.html    |    95 +
 data/treeio/treeio/static/js/fileuploader.js  |  1299 ++
 data/treeio/treeio/static/js/hardtree.js      |  1425 ++
 .../demos/accordion/hoverintent.html          |   148 +
 .../demos/dialog/modal-form.html              |   157 +
 .../demos/droppable/photo-manager.html        |   182 +
 .../jquery-ui-1.10.3/demos/effect/easing.html |   102 +
 .../demos/tabs/manipulation.html              |   122 +
 .../js/jquery-ui-1.10.3/ui/jquery-ui.js       | 15003 +++++++++++++
 .../jquery-ui-1.10.3/ui/jquery.ui.button.js   |   419 +
 .../ui/jquery.ui.datepicker.js                |  2038 ++
 .../ui/jquery.ui.droppable.js                 |   372 +
 .../jquery-ui-1.10.3/ui/jquery.ui.position.js |   497 +
 .../ui/jquery.ui.resizable.js                 |   968 +
 .../jquery-ui-1.10.3/ui/jquery.ui.slider.js   |   672 +
 .../jquery-ui-1.10.3/ui/jquery.ui.sortable.js |  1285 ++
 .../js/jquery-ui-1.10.3/ui/jquery.ui.tabs.js  |   846 +
 .../treeio/static/js/jquery-ui-custom.js      |   778 +
 .../static/js/jquery.ba-serializeobject.js    |    31 +
 .../treeio/static/js/jquery.ganttView.js      |   440 +
 .../treeio/treeio/static/js/jquery.gritter.js |   401 +
 .../tiny_mce/plugins/advimage/js/image.js     |   464 +
 .../tiny_mce/plugins/advlink/js/advlink.js    |   543 +
 .../plugins/contextmenu/editor_plugin_src.js  |   163 +
 .../tiny_mce/plugins/emotions/js/emotions.js  |    43 +
 .../plugins/fullpage/editor_plugin_src.js     |   405 +
 .../plugins/fullscreen/editor_plugin_src.js   |   234 +
 .../plugins/fullscreen/fullscreen.htm         |   117 +
 .../plugins/inlinepopups/editor_plugin_src.js |   699 +
 .../plugins/layer/editor_plugin_src.js        |   262 +
 .../plugins/legacyoutput/editor_plugin_src.js |   139 +
 .../plugins/lists/editor_plugin_src.js        |   955 +
 .../plugins/media/editor_plugin_src.js        |   898 +
 .../tiny_mce/plugins/media/js/embed.js        |    73 +
 .../tiny_mce/plugins/media/js/media.js        |   513 +
 .../plugins/noneditable/editor_plugin_src.js  |   537 +
 .../plugins/paste/editor_plugin_src.js        |   887 +
 .../plugins/preview/jscripts/embed.js         |    73 +
 .../tiny_mce/plugins/preview/preview.html     |    17 +
 .../plugins/save/editor_plugin_src.js         |   101 +
 .../plugins/searchreplace/js/searchreplace.js |   152 +
 .../plugins/spellchecker/editor_plugin_src.js |   471 +
 .../plugins/style/editor_plugin_src.js        |    71 +
 .../tiny_mce/plugins/style/js/props.js        |   709 +
 .../plugins/tabfocus/editor_plugin_src.js     |   122 +
 .../plugins/table/editor_plugin_src.js        |  1456 ++
 .../tiny_mce/plugins/table/js/cell.js         |   319 +
 .../tiny_mce/plugins/table/js/table.js        |   501 +
 .../plugins/template/editor_plugin_src.js     |   159 +
 .../tiny_mce/plugins/template/js/template.js  |   106 +
 .../plugins/visualchars/editor_plugin_src.js  |    83 +
 .../plugins/wordcount/editor_plugin_src.js    |   122 +
 .../plugins/xhtmlxtras/js/attributes.js       |   111 +
 .../plugins/xhtmlxtras/js/element_common.js   |   229 +
 .../themes/advanced/editor_template_src.js    |  1490 ++
 .../tiny_mce/themes/advanced/js/anchor.js     |    56 +
 .../tiny_mce/themes/advanced/js/charmap.js    |   363 +
 .../themes/advanced/js/color_picker.js        |   345 +
 .../tiny_mce/themes/advanced/js/image.js      |   253 +
 .../tiny_mce/themes/advanced/js/link.js       |   159 +
 .../themes/simple/editor_template_src.js      |    84 +
 .../tinymce/jscripts/tiny_mce/tiny_mce_src.js | 17942 ++++++++++++++++
 .../tiny_mce/utils/editable_selects.js        |    70 +
 .../jscripts/tiny_mce/utils/form_utils.js     |   210 +
 .../tinymce/jscripts/tiny_mce/utils/mctabs.js |   162 +
 .../jscripts/tiny_mce/utils/validate.js       |   252 +
 .../mobile/jquery.mobile.forms.ajaxform.js    |    68 +
 .../static/mobile/jquery.mobile.scrollview.js |   803 +
 .../core/administration/settings_view.html    |    50 +
 .../templates/html/core/billing/upgrade.html  |   104 +
 .../templates/html/core/database_setup.html   |    26 +
 data/treeio/treeio/treeio/account/ajax.py     |   272 +
 data/treeio/treeio/treeio/account/cron.py     |    88 +
 data/treeio/treeio/treeio/account/forms.py    |   237 +
 .../account/south_migrations/0001_initial.py  |    25 +
 data/treeio/treeio/treeio/account/views.py    |   223 +
 .../changes/south_migrations/0001_initial.py  |   194 +
 .../core/administration/api/handlers.py       |   217 +
 .../treeio/core/administration/forms.py       |   474 +
 .../treeio/core/administration/views.py       |   848 +
 .../treeio/treeio/core/ajax/converter.py      |   225 +
 data/treeio/treeio/treeio/core/api/doc.py     |   280 +
 .../core/api/south_migrations/0001_initial.py |   152 +
 .../0002_auto__add_field_consumer_owner.py    |    96 +
 data/treeio/treeio/treeio/core/api/utils.py   |   346 +
 data/treeio/treeio/treeio/core/auth.py        |    54 +
 .../core/contrib/messages/storage/cache.py    |    98 +
 .../treeio/treeio/core/dashboard/views.py     |   279 +
 data/treeio/treeio/treeio/core/db/__init__.py |    13 +
 data/treeio/treeio/treeio/core/db/creation.py |    77 +
 data/treeio/treeio/treeio/core/db/db.py       |   119 +
 data/treeio/treeio/treeio/core/forms.py       |   383 +
 data/treeio/treeio/treeio/core/mail.py        |   522 +
 .../core/management/commands/installdb.py     |    92 +
 .../core/management/commands/runcron.py       |   261 +
 .../treeio/treeio/core/middleware/chat.py     |   519 +
 .../treeio/treeio/core/middleware/user.py     |   354 +
 data/treeio/treeio/treeio/core/models.py      |  1544 ++
 data/treeio/treeio/treeio/core/rendering.py   |   246 +
 data/treeio/treeio/treeio/core/rss.py         |   117 +
 data/treeio/treeio/treeio/core/sanitizer.py   |   318 +
 .../treeio/treeio/core/search/models.py       |    74 +
 .../treeio/treeio/treeio/core/search/views.py |    67 +
 ...ment__add_tag__add_revisionfield__add_r.py |   719 +
 .../core/south_migrations/0003_treeiocore.py  |   245 +
 .../0004_auto__del_field_object_user.py       |   228 +
 ...ield_group_accessentity_ptr__del_field_.py |   257 +
 .../0006_auto__add_configsetting.py           |   242 +
 .../0007_auto__add_attachment.py              |   258 +
 ...008_auto__add_field_attachment_filename.py |   244 +
 .../treeio/core/templatetags/modules.py       |   894 +
 .../treeio/treeio/core/templatetags/user.py   |    90 +
 data/treeio/treeio/treeio/core/trash/views.py |   109 +
 data/treeio/treeio/treeio/core/views.py       |   604 +
 data/treeio/treeio/treeio/documents/forms.py  |   200 +
 .../south_migrations/0001_initial.py          |   187 +
 data/treeio/treeio/treeio/events/forms.py     |   159 +
 data/treeio/treeio/treeio/events/rendering.py |   253 +
 .../events/south_migrations/0001_initial.py   |   182 +
 .../treeio/treeio/finance/api/handlers.py     |   240 +
 data/treeio/treeio/treeio/finance/forms.py    |   782 +
 data/treeio/treeio/treeio/finance/models.py   |   349 +
 .../finance/south_migrations/0001_initial.py  |   331 +
 ...d_field_liability_value_currency__add_f.py |   393 +
 .../south_migrations/0003_treeiocurrency.py   |   255 +
 data/treeio/treeio/treeio/finance/views.py    |  1441 ++
 .../treeio/treeio/identities/api/handlers.py  |   124 +
 .../treeio/treeio/identities/integration.py   |   248 +
 .../treeio/treeio/treeio/identities/models.py |   185 +
 .../treeio/treeio/identities/objects.py       |   142 +
 .../south_migrations/0001_initial.py          |   221 +
 ...02_auto__chg_field_contact_related_user.py |   158 +
 .../0003_related_accessentity.py              |   156 +
 ...4_auto__del_field_contact_related_group.py |   154 +
 .../treeio/infrastructure/api/handlers.py     |   164 +
 .../south_migrations/0001_initial.py          |   406 +
 .../south_migrations/0001_initial.py          |   176 +
 .../treeio/treeio/messaging/api/handlers.py   |   190 +
 data/treeio/treeio/treeio/messaging/emails.py |   148 +
 data/treeio/treeio/treeio/messaging/forms.py  |   342 +
 .../south_migrations/0001_initial.py          |   226 +
 ...late__add_field_message_mlist__chg_fiel.py |   353 +
 .../0003_merge_emailbox_stream.py             |   213 +
 ...essagestream_email_outgoing__del_field_.py |   222 +
 data/treeio/treeio/treeio/messaging/views.py  |   764 +
 data/treeio/treeio/treeio/news/forms.py       |    83 +
 .../news/south_migrations/0001_initial.py     |    25 +
 data/treeio/treeio/treeio/projects/ajax.py    |    31 +
 .../treeio/treeio/projects/identities.py      |    65 +
 .../projects/south_migrations/0001_initial.py |   322 +
 .../south_migrations/0002_updaterecords.py    |   236 +
 .../0003_auto__add_field_tasktimeslot_user.py |   210 +
 .../south_migrations/0004_timeslots.py        |   211 +
 .../0005_auto__del_taskrecord.py              |   208 +
 .../0006_auto__add_field_task_depends.py      |   196 +
 data/treeio/treeio/treeio/projects/views.py   |  1301 ++
 .../reports/south_migrations/0001_initial.py  |   144 +
 ...del_field_report_template__add_field_re.py |   174 +
 .../south_migrations/0003_delete_old.py       |   134 +
 .../treeio/reports/templatetags/reports.py    |   237 +
 data/treeio/treeio/treeio/sales/forms.py      |  1095 +
 data/treeio/treeio/treeio/sales/models.py     |   560 +
 ...ld_orderedproduct_tax__add_field_ordere.py |   502 +
 .../south_migrations/0003_treeiocurrency.py   |   339 +
 ...auto__chg_field_orderedproduct_quantity.py |   314 +
 data/treeio/treeio/treeio/sales/views.py      |  1604 ++
 .../treeio/treeio/services/api/handlers.py    |   260 +
 data/treeio/treeio/treeio/services/forms.py   |   611 +
 .../treeio/treeio/services/identities.py      |    67 +
 data/treeio/treeio/treeio/services/models.py  |   370 +
 .../services/south_migrations/0001_initial.py |   412 +
 ...add_field_ticketrecord_updaterecord_ptr.py |   305 +
 .../south_migrations/0003_updaterecords.py    |   310 +
 ...cord_type__del_field_ticketrecord_detai.py |   317 +
 data/treeio/treeio/treeio/services/views.py   |  1197 ++
 data/treeio/treeio/treeio_project/settings.py |   590 +
 182 files changed, 105195 insertions(+)
 create mode 100644 data/treeio/treeio/static/js/12o_super_mini.js
 create mode 100644 data/treeio/treeio/static/js/chat.js
 create mode 100644 data/treeio/treeio/static/js/colorbox/example1/index.html
 create mode 100644 data/treeio/treeio/static/js/colorbox/example2/index.html
 create mode 100644 data/treeio/treeio/static/js/colorbox/example3/index.html
 create mode 100644 data/treeio/treeio/static/js/colorbox/example4/index.html
 create mode 100644 data/treeio/treeio/static/js/colorbox/example5/index.html
 create mode 100644 data/treeio/treeio/static/js/fileuploader.js
 create mode 100644 data/treeio/treeio/static/js/hardtree.js
 create mode 100644 data/treeio/treeio/static/js/jquery-ui-1.10.3/demos/accordion/hoverintent.html
 create mode 100644 data/treeio/treeio/static/js/jquery-ui-1.10.3/demos/dialog/modal-form.html
 create mode 100644 data/treeio/treeio/static/js/jquery-ui-1.10.3/demos/droppable/photo-manager.html
 create mode 100644 data/treeio/treeio/static/js/jquery-ui-1.10.3/demos/effect/easing.html
 create mode 100644 data/treeio/treeio/static/js/jquery-ui-1.10.3/demos/tabs/manipulation.html
 create mode 100644 data/treeio/treeio/static/js/jquery-ui-1.10.3/ui/jquery-ui.js
 create mode 100644 data/treeio/treeio/static/js/jquery-ui-1.10.3/ui/jquery.ui.button.js
 create mode 100644 data/treeio/treeio/static/js/jquery-ui-1.10.3/ui/jquery.ui.datepicker.js
 create mode 100644 data/treeio/treeio/static/js/jquery-ui-1.10.3/ui/jquery.ui.droppable.js
 create mode 100644 data/treeio/treeio/static/js/jquery-ui-1.10.3/ui/jquery.ui.position.js
 create mode 100644 data/treeio/treeio/static/js/jquery-ui-1.10.3/ui/jquery.ui.resizable.js
 create mode 100644 data/treeio/treeio/static/js/jquery-ui-1.10.3/ui/jquery.ui.slider.js
 create mode 100644 data/treeio/treeio/static/js/jquery-ui-1.10.3/ui/jquery.ui.sortable.js
 create mode 100644 data/treeio/treeio/static/js/jquery-ui-1.10.3/ui/jquery.ui.tabs.js
 create mode 100644 data/treeio/treeio/static/js/jquery-ui-custom.js
 create mode 100644 data/treeio/treeio/static/js/jquery.ba-serializeobject.js
 create mode 100644 data/treeio/treeio/static/js/jquery.ganttView.js
 create mode 100644 data/treeio/treeio/static/js/jquery.gritter.js
 create mode 100644 data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/advimage/js/image.js
 create mode 100644 data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/advlink/js/advlink.js
 create mode 100644 data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin_src.js
 create mode 100644 data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/emotions/js/emotions.js
 create mode 100644 data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin_src.js
 create mode 100644 data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin_src.js
 create mode 100644 data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/fullscreen/fullscreen.htm
 create mode 100644 data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin_src.js
 create mode 100644 data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin_src.js
 create mode 100644 data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin_src.js
 create mode 100644 data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/lists/editor_plugin_src.js
 create mode 100644 data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin_src.js
 create mode 100644 data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/media/js/embed.js
 create mode 100644 data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/media/js/media.js
 create mode 100644 data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin_src.js
 create mode 100644 data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js
 create mode 100644 data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/preview/jscripts/embed.js
 create mode 100644 data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/preview/preview.html
 create mode 100644 data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/save/editor_plugin_src.js
 create mode 100644 data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/searchreplace/js/searchreplace.js
 create mode 100644 data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin_src.js
 create mode 100644 data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin_src.js
 create mode 100644 data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/style/js/props.js
 create mode 100644 data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin_src.js
 create mode 100644 data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin_src.js
 create mode 100644 data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js
 create mode 100644 data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/table/js/table.js
 create mode 100644 data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/template/editor_plugin_src.js
 create mode 100644 data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/template/js/template.js
 create mode 100644 data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin_src.js
 create mode 100644 data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin_src.js
 create mode 100644 data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/attributes.js
 create mode 100644 data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/element_common.js
 create mode 100644 data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/themes/advanced/editor_template_src.js
 create mode 100644 data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/themes/advanced/js/anchor.js
 create mode 100644 data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/themes/advanced/js/charmap.js
 create mode 100644 data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/themes/advanced/js/color_picker.js
 create mode 100644 data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/themes/advanced/js/image.js
 create mode 100644 data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/themes/advanced/js/link.js
 create mode 100644 data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/themes/simple/editor_template_src.js
 create mode 100644 data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/tiny_mce_src.js
 create mode 100644 data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/utils/editable_selects.js
 create mode 100644 data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/utils/form_utils.js
 create mode 100644 data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/utils/mctabs.js
 create mode 100644 data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/utils/validate.js
 create mode 100644 data/treeio/treeio/static/mobile/jquery.mobile.forms.ajaxform.js
 create mode 100644 data/treeio/treeio/static/mobile/jquery.mobile.scrollview.js
 create mode 100644 data/treeio/treeio/templates/html/core/administration/settings_view.html
 create mode 100644 data/treeio/treeio/templates/html/core/billing/upgrade.html
 create mode 100644 data/treeio/treeio/templates/html/core/database_setup.html
 create mode 100644 data/treeio/treeio/treeio/account/ajax.py
 create mode 100644 data/treeio/treeio/treeio/account/cron.py
 create mode 100644 data/treeio/treeio/treeio/account/forms.py
 create mode 100644 data/treeio/treeio/treeio/account/south_migrations/0001_initial.py
 create mode 100644 data/treeio/treeio/treeio/account/views.py
 create mode 100644 data/treeio/treeio/treeio/changes/south_migrations/0001_initial.py
 create mode 100644 data/treeio/treeio/treeio/core/administration/api/handlers.py
 create mode 100644 data/treeio/treeio/treeio/core/administration/forms.py
 create mode 100644 data/treeio/treeio/treeio/core/administration/views.py
 create mode 100644 data/treeio/treeio/treeio/core/ajax/converter.py
 create mode 100644 data/treeio/treeio/treeio/core/api/doc.py
 create mode 100644 data/treeio/treeio/treeio/core/api/south_migrations/0001_initial.py
 create mode 100644 data/treeio/treeio/treeio/core/api/south_migrations/0002_auto__add_field_consumer_owner.py
 create mode 100644 data/treeio/treeio/treeio/core/api/utils.py
 create mode 100644 data/treeio/treeio/treeio/core/auth.py
 create mode 100644 data/treeio/treeio/treeio/core/contrib/messages/storage/cache.py
 create mode 100644 data/treeio/treeio/treeio/core/dashboard/views.py
 create mode 100644 data/treeio/treeio/treeio/core/db/__init__.py
 create mode 100644 data/treeio/treeio/treeio/core/db/creation.py
 create mode 100644 data/treeio/treeio/treeio/core/db/db.py
 create mode 100644 data/treeio/treeio/treeio/core/forms.py
 create mode 100644 data/treeio/treeio/treeio/core/mail.py
 create mode 100644 data/treeio/treeio/treeio/core/management/commands/installdb.py
 create mode 100644 data/treeio/treeio/treeio/core/management/commands/runcron.py
 create mode 100644 data/treeio/treeio/treeio/core/middleware/chat.py
 create mode 100644 data/treeio/treeio/treeio/core/middleware/user.py
 create mode 100644 data/treeio/treeio/treeio/core/models.py
 create mode 100644 data/treeio/treeio/treeio/core/rendering.py
 create mode 100644 data/treeio/treeio/treeio/core/rss.py
 create mode 100644 data/treeio/treeio/treeio/core/sanitizer.py
 create mode 100644 data/treeio/treeio/treeio/core/search/models.py
 create mode 100644 data/treeio/treeio/treeio/core/search/views.py
 create mode 100644 data/treeio/treeio/treeio/core/south_migrations/0002_auto__del_notification__add_comment__add_tag__add_revisionfield__add_r.py
 create mode 100644 data/treeio/treeio/treeio/core/south_migrations/0003_treeiocore.py
 create mode 100644 data/treeio/treeio/treeio/core/south_migrations/0004_auto__del_field_object_user.py
 create mode 100644 data/treeio/treeio/treeio/core/south_migrations/0005_auto__del_field_group_id__chg_field_group_accessentity_ptr__del_field_.py
 create mode 100644 data/treeio/treeio/treeio/core/south_migrations/0006_auto__add_configsetting.py
 create mode 100644 data/treeio/treeio/treeio/core/south_migrations/0007_auto__add_attachment.py
 create mode 100644 data/treeio/treeio/treeio/core/south_migrations/0008_auto__add_field_attachment_filename.py
 create mode 100644 data/treeio/treeio/treeio/core/templatetags/modules.py
 create mode 100644 data/treeio/treeio/treeio/core/templatetags/user.py
 create mode 100644 data/treeio/treeio/treeio/core/trash/views.py
 create mode 100644 data/treeio/treeio/treeio/core/views.py
 create mode 100644 data/treeio/treeio/treeio/documents/forms.py
 create mode 100644 data/treeio/treeio/treeio/documents/south_migrations/0001_initial.py
 create mode 100644 data/treeio/treeio/treeio/events/forms.py
 create mode 100644 data/treeio/treeio/treeio/events/rendering.py
 create mode 100644 data/treeio/treeio/treeio/events/south_migrations/0001_initial.py
 create mode 100644 data/treeio/treeio/treeio/finance/api/handlers.py
 create mode 100644 data/treeio/treeio/treeio/finance/forms.py
 create mode 100644 data/treeio/treeio/treeio/finance/models.py
 create mode 100644 data/treeio/treeio/treeio/finance/south_migrations/0001_initial.py
 create mode 100644 data/treeio/treeio/treeio/finance/south_migrations/0002_auto__add_currency__add_tax__add_field_liability_value_currency__add_f.py
 create mode 100644 data/treeio/treeio/treeio/finance/south_migrations/0003_treeiocurrency.py
 create mode 100644 data/treeio/treeio/treeio/finance/views.py
 create mode 100644 data/treeio/treeio/treeio/identities/api/handlers.py
 create mode 100644 data/treeio/treeio/treeio/identities/integration.py
 create mode 100644 data/treeio/treeio/treeio/identities/models.py
 create mode 100644 data/treeio/treeio/treeio/identities/objects.py
 create mode 100644 data/treeio/treeio/treeio/identities/south_migrations/0001_initial.py
 create mode 100644 data/treeio/treeio/treeio/identities/south_migrations/0002_auto__chg_field_contact_related_user.py
 create mode 100644 data/treeio/treeio/treeio/identities/south_migrations/0003_related_accessentity.py
 create mode 100644 data/treeio/treeio/treeio/identities/south_migrations/0004_auto__del_field_contact_related_group.py
 create mode 100644 data/treeio/treeio/treeio/infrastructure/api/handlers.py
 create mode 100644 data/treeio/treeio/treeio/infrastructure/south_migrations/0001_initial.py
 create mode 100644 data/treeio/treeio/treeio/knowledge/south_migrations/0001_initial.py
 create mode 100644 data/treeio/treeio/treeio/messaging/api/handlers.py
 create mode 100644 data/treeio/treeio/treeio/messaging/emails.py
 create mode 100644 data/treeio/treeio/treeio/messaging/forms.py
 create mode 100644 data/treeio/treeio/treeio/messaging/south_migrations/0001_initial.py
 create mode 100644 data/treeio/treeio/treeio/messaging/south_migrations/0002_auto__add_mailinglist__add_template__add_field_message_mlist__chg_fiel.py
 create mode 100644 data/treeio/treeio/treeio/messaging/south_migrations/0003_merge_emailbox_stream.py
 create mode 100644 data/treeio/treeio/treeio/messaging/south_migrations/0004_auto__del_emailbox__del_field_messagestream_email_outgoing__del_field_.py
 create mode 100644 data/treeio/treeio/treeio/messaging/views.py
 create mode 100644 data/treeio/treeio/treeio/news/forms.py
 create mode 100644 data/treeio/treeio/treeio/news/south_migrations/0001_initial.py
 create mode 100644 data/treeio/treeio/treeio/projects/ajax.py
 create mode 100644 data/treeio/treeio/treeio/projects/identities.py
 create mode 100644 data/treeio/treeio/treeio/projects/south_migrations/0001_initial.py
 create mode 100644 data/treeio/treeio/treeio/projects/south_migrations/0002_updaterecords.py
 create mode 100644 data/treeio/treeio/treeio/projects/south_migrations/0003_auto__add_field_tasktimeslot_user.py
 create mode 100644 data/treeio/treeio/treeio/projects/south_migrations/0004_timeslots.py
 create mode 100644 data/treeio/treeio/treeio/projects/south_migrations/0005_auto__del_taskrecord.py
 create mode 100644 data/treeio/treeio/treeio/projects/south_migrations/0006_auto__add_field_task_depends.py
 create mode 100644 data/treeio/treeio/treeio/projects/views.py
 create mode 100644 data/treeio/treeio/treeio/reports/south_migrations/0001_initial.py
 create mode 100644 data/treeio/treeio/treeio/reports/south_migrations/0002_auto__del_template__add_chart__del_field_report_template__add_field_re.py
 create mode 100644 data/treeio/treeio/treeio/reports/south_migrations/0003_delete_old.py
 create mode 100644 data/treeio/treeio/treeio/reports/templatetags/reports.py
 create mode 100644 data/treeio/treeio/treeio/sales/forms.py
 create mode 100644 data/treeio/treeio/treeio/sales/models.py
 create mode 100644 data/treeio/treeio/treeio/sales/south_migrations/0002_auto__del_updaterecord__add_field_orderedproduct_tax__add_field_ordere.py
 create mode 100644 data/treeio/treeio/treeio/sales/south_migrations/0003_treeiocurrency.py
 create mode 100644 data/treeio/treeio/treeio/sales/south_migrations/0004_auto__chg_field_orderedproduct_quantity.py
 create mode 100644 data/treeio/treeio/treeio/sales/views.py
 create mode 100644 data/treeio/treeio/treeio/services/api/handlers.py
 create mode 100644 data/treeio/treeio/treeio/services/forms.py
 create mode 100644 data/treeio/treeio/treeio/services/identities.py
 create mode 100644 data/treeio/treeio/treeio/services/models.py
 create mode 100644 data/treeio/treeio/treeio/services/south_migrations/0001_initial.py
 create mode 100644 data/treeio/treeio/treeio/services/south_migrations/0002_auto__add_field_ticketrecord_updaterecord_ptr.py
 create mode 100644 data/treeio/treeio/treeio/services/south_migrations/0003_updaterecords.py
 create mode 100644 data/treeio/treeio/treeio/services/south_migrations/0004_auto__del_field_ticketrecord_record_type__del_field_ticketrecord_detai.py
 create mode 100644 data/treeio/treeio/treeio/services/views.py
 create mode 100644 data/treeio/treeio/treeio_project/settings.py

diff --git a/data/treeio/treeio/static/js/12o_super_mini.js b/data/treeio/treeio/static/js/12o_super_mini.js
new file mode 100644
index 0000000..999caa9
--- /dev/null
+++ b/data/treeio/treeio/static/js/12o_super_mini.js
@@ -0,0 +1,8305 @@
+(function(a, b, c) {
+	function d(a) {
+		a = a || location.href;
+		return "#" + a.replace(/^[^#]*#?(.*)$/, "$1")
+	}
+	var f = "hashchange",
+	h = document,
+	n, g = a.event.special,
+	p = h.documentMode,
+	j = "on" + f in b && (p === c || p > 7);
+	a.fn[f] = function(a) {
+		return a ? this.bind(f, a) : this.trigger(f)
+	};
+	a.fn[f].delay = 50;
+	g[f] = a.extend(g[f], {
+		setup: function() {
+			if (j) return false;
+			a(n.start)
+		},
+		teardown: function() {
+			if (j) return false;
+			a(n.stop)
+		}
+	});
+	n = function() {
+		function g() {
+			var c = d(),
+			j = F(q);
+			if (c !== q) aa(q = c, j),
+			a(b).trigger(f);
+			else if (j !== q) location.href = location.href.replace(/#.*/, "") + j;
+			p = setTimeout(g, a.fn[f].delay)
+		}
+		var n = {},
+		p, q = d(),
+		w = function(a) {
+			return a
+		},
+		aa = w,
+		F = w;
+		n.start = function() {
+			p || g()
+		};
+		n.stop = function() {
+			p && clearTimeout(p);
+			p = c
+		};
+		a.browser.msie && ! j && function() {
+			var b, c;
+			n.start = function() {
+				if (!b) c = (c = a.fn[f].src) && c + d(),
+				b = a('<iframe tabindex="-1" title="empty"/>').hide().one("load", function() {
+					c || aa(d());
+					g()
+				}).attr("src", c || "javascript:0").insertAfter("body")[0].contentWindow,
+				h.onpropertychange = function() {
+					try {
+						if (event.propertyName === "title") b.document.title = h.title
+					} catch(a) {}
+				}
+			};
+			n.stop = w;
+			F = function() {
+				return d(b.location.href)
+			};
+			aa = function(c, g) {
+				var d = b.document,
+				j = a.fn[f].domain;
+				if (c !== g) d.title = h.title,
+				d.open(),
+				j && d.write('<script>document.domain="' + j + '"<\/script>'),
+				d.close(),
+				b.location.hash = c
+			}
+		} ();
+		return n
+	} ()
+})(jQuery, this);
+(function() {
+	function a(i, a) {
+		i || (i = {});
+		for (var e in a) i[e] = a[e];
+		return i
+	}
+	function b(i, a) {
+		return parseInt(i, a || 10)
+	}
+	function c(i) {
+		return typeof i == "string"
+	}
+	function d(i) {
+		return typeof i == "object"
+	}
+	function f(i) {
+		return typeof i == "number"
+	}
+	function h(i, a) {
+		for (var e = i.length; e--;) if (i[e] == a) {
+			i.splice(e, 1);
+			break
+		}
+	}
+	function n(i) {
+		return i !== ya && i !== null
+	}
+	function g(i, a, e) {
+		var b, g;
+		if (c(a)) n(e) ? i.setAttribute(a, e) : i && i.getAttribute && (g = i.getAttribute(a));
+		else if (n(a) && d(a)) for (b in a) i.setAttribute(b, a[b]);
+		return g
+	}
+	function p(a) {
+		if (!a || a.constructor != Array) a = [a];
+		return a
+	}
+	function j() {
+		var a = arguments,
+		l, e, b = a.length;
+		for (l = 0; l < b; l++) if (e = a[l], typeof e !== "undefined" && e !== null) return e
+	}
+	function o(a) {
+		var l = "",
+		e;
+		for (e in a) l += ub(e) + ":" + a[e] + ";";
+		return l
+	}
+	function m(i, l) {
+		if (D && l && l.opacity !== ya) l.filter = "alpha(opacity=" + l.opacity * 100 + ")";
+		a(i.style, l)
+	}
+	function t(i, l, e, b, c) {
+		i = A.createElement(i);
+		l && a(i, l);
+		c && m(i, {
+			padding: 0,
+			border: Na,
+			margin: 0
+		});
+		e && m(i, e);
+		b && b.appendChild(i);
+		return i
+	}
+	function q(a, l) {
+		vb = j(a, l.animation)
+	}
+	function w() {
+		var a = za.global.useUTC;
+		wb = a ? Date.UTC: function(a, i, b, c, g, d) {
+			return (new Date(a, i, j(b, 1), j(c, 0), j(g, 0), j(d, 0))).getTime()
+		};
+		Ib = a ? "getUTCMinutes": "getMinutes";
+		Jb = a ? "getUTCHours": "getHours";
+		Kb = a ? "getUTCDay": "getDay";
+		pb = a ? "getUTCDate": "getDate";
+		xb = a ? "getUTCMonth": "getMonth";
+		yb = a ? "getUTCFullYear": "getFullYear";
+		ec = a ? "setUTCMinutes": "setMinutes";
+		fc = a ? "setUTCHours": "setHours";
+		Lb = a ? "setUTCDate": "setDate";
+		gc = a ? "setUTCMonth": "setMonth";
+		hc = a ? "setUTCFullYear": "setFullYear"
+	}
+	function aa(a) {
+		Ka || (Ka = t($a));
+		a && Ka.appendChild(a);
+		Ka.innerHTML = ""
+	}
+	function F(i, l) {
+		var e = function() {};
+		e.prototype = new i;
+		a(e.prototype, l);
+		return e
+	}
+	function Ma(a, l, e, c) {
+		var g = za.lang,
+		d = isNaN(l = Y(l)) ? 2: l,
+		l = e === void 0 ? g.decimalPoint: e,
+		c = c === void 0 ? g.thousandsSep: c,
+		g = a < 0 ? "-": "",
+		e = b(a = Y( + a || 0).toFixed(d)) + "",
+		j = (j = e.length) > 3 ? j % 3: 0;
+		return g + (j ? e.substr(0, j) + c: "") + e.substr(j).replace(/(\d{3})(?=\d)/g, "$1" + c) + (d ? l + Y(a - e).toFixed(d).slice(2) : "")
+	}
+	function M() {}
+	function Q(i, l) {
+		function e(i, e) {
+			function l(a, i) {
+				this.pos = a;
+				this.minor = i;
+				this.isNew = true;
+				i || this.addLabel()
+			}
+			function c(a) {
+				if (a) this.options = a,
+				this.id = a.id;
+				return this
+			}
+			function s() {
+				var a = [],
+				i = [],
+				l;
+				v = Ga = null;
+				F = [];
+				y(la, function(b) {
+					l = false;
+					y(["xAxis", "yAxis"], function(a) {
+						if (b.isCartesian && (a == "xAxis" && H || a == "yAxis" && ! H) && (b.options[a] == e.index || b.options[a] === ya && e.index === 0)) b[a] = fa,
+						F.push(b),
+						l = true
+					}); ! b.visible && B.ignoreHiddenSeries && (l = false);
+					if (l) {
+						var c, s, g, d, f;
+						if (!H) {
+							c = b.options.stacking;
+							Ia = c == "percent";
+							if (c) d = b.type + j(b.options.stack, ""),
+							f = "-" + d,
+							b.stackKey = d,
+							s = a[d] || [],
+							a[d] = s,
+							g = i[f] || [],
+							i[f] = g;
+							Ia && (v = 0, Ga = 99)
+						}
+						b.isCartesian && (y(b.data, function(a) {
+							var i = a.x,
+							e = a.y,
+							l = e < 0,
+							b = l ? g: s,
+							l = l ? f: d;
+							v === null && (v = Ga = a[I]);
+							H ? i > Ga ? Ga = i: i < v && (v = i) : n(e) && (c && (b[i] = n(b[i]) ? b[i] + e: e), e = b ? b[i] : e, a = j(a.low, e), Ia || (e > Ga ? Ga = e: a < v && (v = a)), c && (z[l] || (z[l] = {}), z[l][i] = {
+								total: e,
+								cum: e
+							}))
+						}), /(area|column|bar)/.test(b.type) && ! H && (v >= 0 ? (v = 0, eb = true) : Ga < 0 && (Ga = 0, ob = true)))
+					}
+				})
+			}
+			function g(a, i) {
+				var l;
+				U = i ? 1: N.pow(10, ha(N.log(a) / N.LN10));
+				l = a / U;
+				i || (i = [1, 2, 2.5, 5, 10], e.allowDecimals === false && (U == 1 ? i = [1, 2, 5, 10] : U <= 0.1 && (i = [1 / U])));
+				for (var b = 0; b < i.length; b++) if (a = i[b], l <= (i[b] + (i[b + 1] || i[b])) / 2) break;
+				a *= U;
+				return a
+			}
+			function d(a) {
+				var i;
+				i = a;
+				n(U) && (i = (U < 1 ? x(1 / U) : 1) * 10, i = x(a * i) / i);
+				return i
+			}
+			function f() {
+				var a, l, b, c, s = e.tickInterval,
+				C = e.tickPixelInterval;
+				a = e.maxZoom || (H ? Da(i.smallestInterval * 5, Ga - v) : null);
+				D = m ? oa: ea;
+				Qa ? (b = i[H ? "xAxis": "yAxis"][e.linkedTo], c = b.getExtremes(), V = j(c.min, c.dataMin), X = j(c.max, c.dataMax)) : (V = j(Ha, e.min, v), X = j(Ya, e.max, Ga));
+				X - V < a && (c = (a - X + V) / 2, V = G(V - c, j(e.min, V - c), v), X = Da(V + a, j(e.max, V + a), Ga));
+				if (!Fa && ! Ia && ! Qa && n(V) && n(X)) {
+					a = X - V || 1;
+					if (!n(e.min) && ! n(Ha) && L && (v < 0 || ! eb)) V -= a * L;
+					if (!n(e.max) && ! n(Ya) && M && (Ga > 0 || ! ob)) X += a * M
+				}
+				K = V == X ? 1: Qa && ! s && C == b.options.tickPixelInterval ? b.tickInterval: j(s, Fa ? 1: (X - V) * C / D); ! R && ! n(e.tickInterval) && (K = g(K));
+				fa.tickInterval = K;
+				Ka = e.minorTickInterval === "auto" && K ? K / 5: e.minorTickInterval;
+				if (R) {
+					ba = [];
+					var s = za.global.useUTC,
+					E = 1E3 / Oa,
+					J = 6E4 / Oa,
+					h = 36E5 / Oa,
+					C = 864E5 / Oa;
+					a = 6048E5 / Oa;
+					c = 2592E6 / Oa;
+					var p = 31556952E3 / Oa,
+					o = [["second", E, [1, 2, 5, 10, 15, 30]], ["minute", J, [1, 2, 5, 10, 15, 30]], ["hour", h, [1, 2, 3, 4, 6, 8, 12]], ["day", C, [1, 2]], ["week", a, [1, 2]], ["month", c, [1, 2, 3, 4, 6]], ["year", p, null]],
+					t = o[6],
+					z = t[1],
+					q = t[2];
+					for (b = 0; b < o.length; b++) if (t = o[b], z = t[1], q = t[2], o[b + 1] && K <= (z * q[q.length - 1] + o[b + 1][1]) / 2) break;
+					z == p && K < 5 * z && (q = [1, 2, 5]);
+					o = g(K / z, q);
+					q = new Date(V * Oa);
+					q.setMilliseconds(0);
+					z >= E && q.setSeconds(z >= J ? 0: o * ha(q.getSeconds() / o));
+					if (z >= J) q[ec](z >= h ? 0: o * ha(q[Ib]() / o));
+					if (z >= h) q[fc](z >= C ? 0: o * ha(q[Jb]() / o));
+					if (z >= C) q[Lb](z >= c ? 1: o * ha(q[pb]() / o));
+					z >= c && (q[gc](z >= p ? 0: o * ha(q[xb]() / o)), l = q[yb]());
+					z >= p && (l -= l % o, q[hc](l));
+					z == a && q[Lb](q[pb]() - q[Kb]() + e.startOfWeek);
+					b = 1;
+					l = q[yb]();
+					E = q.getTime() / Oa;
+					J = q[xb]();
+					for (h = q[pb](); E < X && b < oa;) ba.push(E),
+					z == p ? E = wb(l + b * o, 0) / Oa: z == c ? E = wb(l, J + b * o) / Oa: ! s && (z == C || z == a) ? E = wb(l, J, h + b * o * (z == C ? 1: 7)) : E += z * o,
+					b++;
+					ba.push(E);
+					Gb = e.dateTimeLabelFormats[t[0]]
+				} else {
+					b = ha(V / K) * K;
+					l = gb(X / K) * K;
+					ba = [];
+					for (b = d(b); b <= l;) ba.push(b),
+					b = d(b + K)
+				}
+				if (!Qa) {
+					if (Fa || H && i.hasColumn) {
+						l = (Fa ? 1: K) * 0.5;
+						if (Fa || ! n(j(e.min, Ha))) V -= l;
+						if (Fa || ! n(j(e.max, Ya))) X += l
+					}
+					l = ba[0];
+					b = ba[ba.length - 1];
+					e.startOnTick ? V = l: V > l && ba.shift();
+					e.endOnTick ? X = b: X < b && ba.pop();
+					Xa || (Xa = {
+						x: 0,
+						y: 0
+					});
+					if (!R && ba.length > Xa[I]) Xa[I] = ba.length
+				}
+			}
+			function C() {
+				var a, i;
+				aa = V;
+				mc = X;
+				s();
+				f();
+				na = w;
+				w = D / (X - V || 1);
+				if (!H) for (a in z) for (i in z[a]) z[a][i].cum = z[a][i].total;
+				if (!fa.isDirty) fa.isDirty = V != aa || X != mc
+			}
+			function E(a) {
+				a = (new c(a)).render();
+				Ja.push(a);
+				return a
+			}
+			function J() {
+				var a = e.title,
+				s = e.alternateGridColor,
+				g = e.lineWidth,
+				d, j, f = i.hasRendered,
+				C = f && n(aa) && ! isNaN(aa);
+				d = F.length && n(V) && n(X);
+				D = m ? oa: ea;
+				w = D / (X - V || 1);
+				Wa = m ? O: ga;
+				if (d || Qa) {
+					if (Ka && ! Fa) for (d = V + (ba[0] - V) % Ka; d <= X; d += Ka) W[d] || (W[d] = new l(d, true)),
+					C && W[d].isNew && W[d].render(null, true),
+					W[d].isActive = true,
+					W[d].render();
+					y(ba, function(a, i) {
+						if (!Qa || a >= V && a <= X) C && P[a].isNew && P[a].render(i, true),
+						P[a].isActive = true,
+						P[a].render(i)
+					});
+					s && y(ba, function(a, i) {
+						if (i % 2 === 0 && a < X) Y[a] || (Y[a] = new c),
+						Y[a].options = {
+							from: a,
+							to: ba[i + 1] !== ya ? ba[i + 1] : X,
+							color: s
+						},
+						Y[a].render(),
+						Y[a].isActive = true
+					});
+					f || y((e.plotLines || []).concat(e.plotBands || []), function(a) {
+						Ja.push((new c(a)).render())
+					})
+				}
+				y([P, W, Y], function(a) {
+					for (var i in a) a[i].isActive ? a[i].isActive = false: (a[i].destroy(), delete a[i])
+				});
+				g && (d = O + (o ? oa: 0) + u, j = ua - ga - (o ? ea: 0) + u, d = S.crispLine([Ca, m ? O: d, m ? j: T, ma, m ? Aa - ja: d, m ? j: ua - ga], g), A ? A.animate({
+					d: d
+				}) : A = S.path(d).attr({
+					stroke: e.lineColor,
+					"stroke-width": g,
+					zIndex: 7
+				}).add());
+				fa.axisTitle && (d = m ? O: T, g = b(a.style.fontSize || 12), d = {
+					low: d + (m ? 0: D),
+					middle: d + D / 2,
+					high: d + (m ? D: 0)
+				} [a.align], g = (m ? T + ea: O) + (m ? 1: - 1) * (o ? - 1: 1) * ka + (t == 2 ? g: 0), fa.axisTitle[f ? "animate": "attr"]({
+					x: m ? d: g + (o ? oa: 0) + u + (a.x || 0),
+					y: m ? g - (o ? ea: 0) + u: d + (a.y || 0)
+				}));
+				fa.isDirty = false
+			}
+			function p(a) {
+				for (var i = 0; i < Ja.length; i++) Ja[i].id == a && Ja[i].destroy()
+			}
+			var H = e.isX,
+			o = e.opposite,
+			m = qa ? ! H: H,
+			t = m ? o ? 0: 2: o ? 1: 3,
+			z = {},
+			e = ia(H ? zb: Mb, [oc, pc, ic, qc][t], e),
+			fa = this,
+			R = e.type == "datetime",
+			u = e.offset || 0,
+			I = H ? "x": "y",
+			D,
+			w,
+			na,
+			Wa = m ? O: ga,
+			ca,
+			mb,
+			Ba,
+			nb,
+			A,
+			v,
+			Ga,
+			F,
+			Ha,
+			Ya,
+			X = null,
+			V = null,
+			aa,
+			mc,
+			L = e.minPadding,
+			M = e.maxPadding,
+			Qa = n(e.linkedTo),
+			eb,
+			ob,
+			Ia,
+			Q = e.events,
+			Ub,
+			Ja = [],
+			K,
+			Ka,
+			U,
+			ba,
+			P = {},
+			W = {},
+			Y = {},
+			Z,
+			da,
+			ka,
+			Gb,
+			Fa = e.categories,
+			wa = e.labels.formatter || function() {
+				var a = this.value;
+				return Gb ? Ab(Gb, a) : K % 1E6 === 0 ? a / 1E6 + "M": K % 1E3 === 0 ? a / 1E3 + "k": ! Fa && a >= 1E3 ? Ma(a, 0) : a
+			},
+			xa = m && e.labels.staggerLines,
+			ra = e.reversed,
+			sa = Fa && e.tickmarkPlacement == "between" ? 0.5: 0;
+			l.prototype = {
+				addLabel: function() {
+					var i = this.pos,
+					l = e.labels,
+					b = ! (i == V && ! j(e.showFirstLabel, 1) || i == X && ! j(e.showLastLabel, 0)),
+					c,
+					s = this.label,
+					i = wa.call({
+						isFirst: i == ba[0],
+						isLast: i == ba[ba.length - 1],
+						dateTimeLabelFormat: Gb,
+						value: Fa && Fa[i] ? Fa[i] : i
+					});
+					c = c && {
+						width: c - 2 * (l.padding || 10) + Ea
+					};
+					s === ya ? this.label = n(i) && b && l.enabled ? S.text(i, 0, 0).attr({
+						align: l.align,
+						rotation: l.rotation
+					}).css(a(c, l.style)).add(Ba) : null: s && s.attr({
+						text: i
+					}).css(c)
+				},
+				getLabelSize: function() {
+					var a = this.label;
+					return a ? (this.labelBBox = a.getBBox())[m ? "height": "width"] : 0
+				},
+				render: function(a, i) {
+					var l = ! this.minor,
+					b = this.label,
+					c = this.pos,
+					s = e.labels,
+					g = this.gridLine,
+					d = l ? e.gridLineWidth: e.minorGridLineWidth,
+					j = l ? e.gridLineColor: e.minorGridLineColor,
+					f = l ? e.gridLineDashStyle: e.minorGridLineDashStyle,
+					C = this.mark,
+					E = l ? e.tickLength: e.minorTickLength,
+					J = l ? e.tickWidth: e.minorTickWidth || 0,
+					h = l ? e.tickColor: e.minorTickColor,
+					p = l ? e.tickPosition: e.minorTickPosition,
+					l = s.step,
+					H = i && Za || ua,
+					z;
+					z = m ? ca(c + sa, null, null, i) + Wa: O + u + (o ? (i && cb || Aa) - ja - O: 0);
+					H = m ? H - ga + u - (o ? ea: 0) : H - ca(c + sa, null, null, i) - Wa;
+					if (d) {
+						c = mb(c + sa, d, i);
+						if (g === ya) {
+							g = {
+								stroke: j,
+								"stroke-width": d
+							};
+							if (f) g.dashstyle = f;
+							this.gridLine = g = d ? S.path(c).attr(g).add(nb) : null
+						}
+						g && c && g.animate({
+							d: c
+						})
+					}
+					if (J) p == "inside" && (E = - E),
+					o && (E = - E),
+					d = S.crispLine([Ca, z, H, ma, z + (m ? 0: - E), H + (m ? E: 0)], J),
+					C ? C.animate({
+						d: d
+					}) : this.mark = S.path(d).attr({
+						stroke: h,
+						"stroke-width": J
+					}).add(Ba);
+					if (b) {
+						z = z + s.x - (sa && m ? sa * w * (ra ? - 1: 1) : 0);
+						H = H + s.y - (sa && ! m ? sa * w * (ra ? 1: - 1) : 0);
+						n(s.y) || (H += parseInt(b.styles.lineHeight) * 0.9 - b.getBBox().height / 2);
+						xa && (H += a % xa * 16);
+						if (l) b[a % l ? "hide": "show"]();
+						b[this.isNew ? "attr": "animate"]({
+							x: z,
+							y: H
+						})
+					}
+					this.isNew = false
+				},
+				destroy: function() {
+					for (var a in this) this[a] && this[a].destroy && this[a].destroy()
+				}
+			};
+			c.prototype = {
+				render: function() {
+					var a = this,
+					i = a.options,
+					e = i.label,
+					l = a.label,
+					b = i.width,
+					c = i.to,
+					s, g = i.from,
+					d = i.dashStyle,
+					j = a.svgElem,
+					f = [],
+					C,
+					E,
+					J = i.color;
+					E = i.zIndex;
+					var h = i.events;
+					if (b) {
+						if (f = mb(i.value, b), i = {
+							stroke: J,
+							"stroke-width": b
+						},
+						d) i.dashstyle = d
+					} else if (n(g) && n(c)) g = G(g, V),
+					c = Da(c, X),
+					s = mb(c),
+					(f = mb(g)) && s ? f.push(s[4], s[5], s[1], s[2]) : f = null,
+					i = {
+						fill: J
+					};
+					else return;
+					if (n(E)) i.zIndex = E;
+					if (j) f ? j.animate({
+						d: f
+					},
+					null, j.onGetPath) : (j.hide(), j.onGetPath = function() {
+						j.show()
+					});
+					else if (f && f.length && (a.svgElem = j = S.path(f).attr(i).add(), h)) for (C in d = function(i) {
+						j.on(i, function(e) {
+							h[i].apply(a, [e])
+						})
+					},
+					h) d(C);
+					if (e && n(e.text) && f && f.length && oa > 0 && ea > 0) {
+						e = ia({
+							align: m && s && "center",
+							x: m ? ! s && 4: 10,
+							verticalAlign: ! m && s && "middle",
+							y: m ? s ? 16: 10: s ? 6: - 4,
+							rotation: m && ! s && 90
+						},
+						e);
+						if (!l) a.label = l = S.text(e.text, 0, 0).attr({
+							align: e.textAlign || e.align,
+							rotation: e.rotation,
+							zIndex: E
+						}).css(e.style).add();
+						s = [f[1], f[4], f[6] || f[1]];
+						f = [f[2], f[5], f[7] || f[2]];
+						C = Da.apply(N, s);
+						E = Da.apply(N, f);
+						l.align(e, false, {
+							x: C,
+							y: E,
+							width: G.apply(N, s) - C,
+							height: G.apply(N, f) - E
+						});
+						l.show()
+					} else l && l.hide();
+					return a
+				},
+				destroy: function() {
+					for (var a in this) this[a] && this[a].destroy && this[a].destroy(),
+					delete this[a];
+					h(Ja, this)
+				}
+			};
+			ca = function(a, i, e, l) {
+				var b = 1,
+				c = 0,
+				s = l ? na: w,
+				l = l ? aa: V;
+				s || (s = w);
+				e && (b *= - 1, c = D);
+				ra && (b *= - 1, c -= b * D);
+				i ? (ra && (a = D - a), a = a / s + l) : a = b * (a - l) * s + c;
+				return a
+			};
+			mb = function(a, i, e) {
+				var l, b, c, a = ca(a, null, null, e),
+				s = e && Za || ua,
+				g = e && cb || Aa,
+				d,
+				e = b = x(a + Wa);
+				l = c = x(s - a - Wa);
+				if (isNaN(a)) d = true;
+				else if (m) {
+					if (l = T, c = s - ga, e < O || e > O + oa) d = true
+				} else if (e = O, b = g - ja, l < T || l > T + ea) d = true;
+				return d ? null: S.crispLine([Ca, e, l, ma, b, c], i || 0)
+			};
+			qa && H && ra === ya && (ra = true);
+			a(fa, {
+				addPlotBand: E,
+				addPlotLine: E,
+				adjustTickAmount: function() {
+					if (Xa && ! R && ! Fa && ! Qa) {
+						var a = Z,
+						i = ba.length;
+						Z = Xa[I];
+						if (i < Z) {
+							for (; ba.length < Z;) ba.push(d(ba[ba.length - 1] + K));
+							w *= (i - 1) / (Z - 1);
+							X = ba[ba.length - 1]
+						}
+						if (n(a) && Z != a) fa.isDirty = true
+					}
+				},
+				categories: Fa,
+				getExtremes: function() {
+					return {
+						min: V,
+						max: X,
+						dataMin: v,
+						dataMax: Ga
+					}
+				},
+				getPlotLinePath: mb,
+				getThreshold: function(a) {
+					V > a ? a = V: X < a && (a = X);
+					return ca(a, 0, 1)
+				},
+				isXAxis: H,
+				options: e,
+				plotLinesAndBands: Ja,
+				getOffset: function() {
+					var a = F.length && n(V) && n(X),
+					i = 0,
+					b = 0,
+					c = e.title,
+					s = e.labels,
+					d = [ - 1, 1, 1, - 1][t];
+					Ba || (Ba = S.g("axis").attr({
+						zIndex: 7
+					}).add(), nb = S.g("grid").attr({
+						zIndex: 1
+					}).add());
+					da = 0;
+					if (a || Qa) y(ba, function(a) {
+						P[a] ? P[a].addLabel() : P[a] = new l(a);
+						if (t === 0 || t == 2 || {
+							1: "left",
+							3: "right"
+						} [t] == s.align) da = G(P[a].getLabelSize(), da)
+					}),
+					xa && (da += (xa - 1) * 16);
+					else for (var g in P) P[g].destroy(),
+					delete P[g];
+					if (c && c.text) {
+						if (!fa.axisTitle) fa.axisTitle = S.text(c.text, 0, 0).attr({
+							zIndex: 7,
+							rotation: c.rotation || 0,
+							align: c.textAlign || {
+								low: "left",
+								middle: "center",
+								high: "right"
+							} [c.align]
+						}).css(c.style).add();
+						i = fa.axisTitle.getBBox()[m ? "height": "width"];
+						b = j(c.margin, m ? 5: 10)
+					}
+					u = d * (e.offset || pa[t]);
+					ka = da + (t != 2 && da && d * e.labels[m ? "y": "x"]) + b;
+					pa[t] = G(pa[t], ka + i + d * u)
+				},
+				render: J,
+				setCategories: function(a, e) {
+					fa.categories = Fa = a;
+					y(F, function(a) {
+						a.translate();
+						a.setTooltipPoints(true)
+					});
+					fa.isDirty = true;
+					j(e, true) && i.redraw()
+				},
+				setExtremes: function(a, e, l, b) {
+					q(b, i);
+					l = j(l, true);
+					ta(fa, "setExtremes", {
+						min: a,
+						max: e
+					},
+					function() {
+						Ha = a;
+						Ya = e;
+						l && i.redraw()
+					})
+				},
+				setScale: C,
+				setTickPositions: f,
+				translate: ca,
+				redraw: function() {
+					hb.resetTracker && hb.resetTracker();
+					J();
+					y(Ja, function(a) {
+						a.render()
+					});
+					y(F, function(a) {
+						a.isDirty = true
+					})
+				},
+				removePlotBand: p,
+				removePlotLine: p,
+				reversed: ra,
+				stacks: z
+			});
+			for (Ub in Q) va(fa, Ub, Q[Ub]);
+			C()
+		}
+		function s() {
+			var a = {};
+			return {
+				add: function(e, l, b, c) {
+					a[e] || (l = S.text(l, 0, 0).css(i.toolbar.itemStyle).align({
+						align: "right",
+						x: - ja - 20,
+						y: T + 30
+					}).on("click", c).attr({
+						align: "right",
+						zIndex: 20
+					}).add(), a[e] = l)
+				},
+				remove: function(i) {
+					aa(a[i].element);
+					a[i] = null
+				}
+			}
+		}
+		function f(a) {
+			function i() {
+				var a = this.points || p(this),
+				e = a[0].series.xAxis,
+				l = this.x,
+				e = e && e.options.type == "datetime",
+				b = c(l) || e,
+				s;
+				s = b ? ['<span style="font-size: 10px">', e ? Ab("%A, %b %e, %Y", l) : l, "</span><br/>"] : [];
+				y(a, function(a) {
+					s.push(a.point.tooltipFormatter(b))
+				});
+				return s.join("")
+			}
+			function e(a, i) {
+				m = n ? a: (2 * m + a) / 3;
+				z = n ? i: (z + i) / 2;
+				q.translate(m, z);
+				Nb = Y(a - m) > 1 || Y(i - z) > 1 ? function() {
+					e(a, i)
+				}: null
+			}
+			function l() {
+				if (!n) {
+					var a = u.hoverPoints;
+					q.hide();
+					y(j, function(a) {
+						a && a.hide()
+					});
+					a && y(a, function(a) {
+						a.setState()
+					});
+					u.hoverPoints = null;
+					n = true
+				}
+			}
+			var s, d = a.borderWidth,
+			g = a.crosshairs,
+			j = [],
+			C = a.style,
+			E = a.shared,
+			J = b(C.padding),
+			h = d + J,
+			n = true,
+			H,
+			o,
+			m = 0,
+			z = 0;
+			C.padding = 0;
+			var q = S.g("tooltip").attr({
+				zIndex: 8
+			}).add(),
+			t = S.rect(h, h, 0, 0, a.borderRadius, d).attr({
+				fill: a.backgroundColor,
+				"stroke-width": d
+			}).add(q).shadow(a.shadow),
+			fa = S.text("", J + h, b(C.fontSize) + J + h).attr({
+				zIndex: 1
+			}).css(C).add(q);
+			q.hide();
+			return {
+				shared: E,
+				refresh: function(b) {
+					var c, d, f, C = 0,
+					m = {},
+					z = [];
+					f = b.tooltipPos;
+					c = a.formatter || i;
+					var m = u.hoverPoints,
+					R = function(a) {
+						return {
+							series: a.series,
+							point: a,
+							x: a.category,
+							y: a.y,
+							percentage: a.percentage,
+							total: a.total || a.stackTotal
+						}
+					};
+					E ? (m && y(m, function(a) {
+						a.setState()
+					}), u.hoverPoints = b, y(b, function(a) {
+						a.setState(Sa);
+						C += a.plotY;
+						z.push(R(a))
+					}), d = b[0].plotX, C = x(C) / b.length, m = {
+						x: b[0].category
+					},
+					m.points = z, b = b[0]) : m = R(b);
+					m = c.call(m);
+					s = b.series;
+					d = E ? d: b.plotX;
+					C = E ? C: b.plotY;
+					c = x(f ? f[0] : qa ? oa - C: d);
+					d = x(f ? f[1] : qa ? ea - d: C);
+					f = E || ! b.series.isCartesian || ib(c, d);
+					m === false || ! f ? l() : (n && (q.show(), n = false), fa.attr({
+						text: m
+					}), f = fa.getBBox(), H = f.width, o = f.height, t.attr({
+						width: H + 2 * J,
+						height: o + 2 * J,
+						stroke: a.borderColor || b.color || s.color || "#606060"
+					}), c = c - H + O - 25, d = d - o + T + 10, c < 7 && (c = 7, d -= 30), d < 5 ? d = 5: d + o > ua && (d = ua - o - 5), e(x(c - h), x(d - h)));
+					if (g) {
+						g = p(g);
+						d = g.length;
+						for (var D; d--;) if (g[d] && (D = b.series[d ? "yAxis": "xAxis"])) if (c = D.getPlotLinePath(b[d ? "y": "x"], 1), j[d]) j[d].attr({
+							d: c,
+							visibility: Ua
+						});
+						else {
+							f = {
+								"stroke-width": g[d].width || 1,
+								stroke: g[d].color || "#C0C0C0",
+								zIndex: 2
+							};
+							if (g[d].dashStyle) f.dashstyle = g[d].dashStyle;
+							j[d] = S.path(c).attr(f).add()
+						}
+					}
+				},
+				hide: l
+			}
+		}
+		function E(i, e) {
+			function l(a) {
+				var i, a = a || v.event;
+				if (!a.target) a.target = a.srcElement;
+				i = a.touches ? a.touches.item(0) : a;
+				if (a.type != "mousemove" || v.opera) {
+					for (var e = K, b = {
+						left: e.offsetLeft,
+						top: e.offsetTop
+					}; e = e.offsetParent;) b.left += e.offsetLeft,
+					b.top += e.offsetTop,
+					e != A.body && e != A.documentElement && (b.left -= e.scrollLeft, b.top -= e.scrollTop);
+					qb = b
+				}
+				D ? (a.chartX = a.x, a.chartY = a.y) : i.layerX === ya ? (a.chartX = i.pageX - qb.left, a.chartY = i.pageY - qb.top) : (a.chartX = a.layerX, a.chartY = a.layerY);
+				return a
+			}
+			function b(a) {
+				var i = {
+					xAxis: [],
+					yAxis: []
+				};
+				y(wa, function(e) {
+					var l = e.translate,
+					b = e.isXAxis;
+					i[b ? "xAxis": "yAxis"].push({
+						axis: e,
+						value: l((qa ? ! b: b) ? a.chartX - O: ea - a.chartY + T, true)
+					})
+				});
+				return i
+			}
+			function c() {
+				var a = i.hoverSeries,
+				e = i.hoverPoint;
+				e && e.onMouseOut();
+				a && a.onMouseOut();
+				rb && rb.hide();
+				Ob = null
+			}
+			function s() {
+				if (J) {
+					var a = {
+						xAxis: [],
+						yAxis: []
+					},
+					e = J.getBBox(),
+					l = e.x - O,
+					b = e.y - T;
+					E && (y(wa, function(i) {
+						var c = i.translate,
+						s = i.isXAxis,
+						d = qa ? ! s: s,
+						g = c(d ? l: ea - b - e.height, true),
+						c = c(d ? l + e.width: ea - b, true);
+						a[s ? "xAxis": "yAxis"].push({
+							axis: i,
+							min: Da(g, c),
+							max: G(g, c)
+						})
+					}), ta(i, "selection", a, Pb));
+					J = J.destroy()
+				}
+				i.mouseIsDown = Qb = E = false;
+				Va(A, Ha ? "touchend": "mouseup", s)
+			}
+			var d, j, E, J, h = B.zoomType,
+			n = /x/.test(h),
+			p = /y/.test(h),
+			m = n && ! qa || p && qa,
+			o = p && ! qa || n && qa;
+			Bb = function() {
+				Cb ? (Cb.translate(O, T), qa && Cb.attr({
+					width: i.plotWidth,
+					height: i.plotHeight
+				}).invert()) : i.trackerGroup = Cb = S.g("tracker").attr({
+					zIndex: 9
+				}).add()
+			};
+			Bb();
+			if (e.enabled) i.tooltip = rb = f(e);
+			(function() {
+				var f = true;
+				K.onmousedown = function(a) {
+					a = l(a);
+					i.mouseIsDown = Qb = true;
+					d = a.chartX;
+					j = a.chartY;
+					va(A, Ha ? "touchend": "mouseup", s)
+				};
+				var C = function(a) {
+					if (!a || ! (a.touches && a.touches.length > 1)) {
+						a = l(a);
+						if (!Ha) a.returnValue = false;
+						var b = a.chartX,
+						s = a.chartY,
+						C = ! ib(b - O, s - T);
+						Ha && a.type == "touchstart" && (g(a.target, "isTracker") ? i.runTrackerClick || a.preventDefault() : ! ub && ! C && a.preventDefault());
+						C && (f || c(), b < O ? b = O: b > O + oa && (b = O + oa), s < T ? s = T: s > T + ea && (s = T + ea));
+						if (Qb && a.type != "touchstart") {
+							if (E = Math.sqrt(Math.pow(d - b, 2) + Math.pow(j - s, 2)) > 10) {
+								if (jb && (n || p) && ib(d - O, j - T)) J || (J = S.rect(O, T, m ? 1: oa, o ? 1: ea, 0).attr({
+									fill: "rgba(69,114,167,0.25)",
+									zIndex: 7
+								}).add());
+								J && m && (b -= d, J.attr({
+									width: Y(b),
+									x: (b > 0 ? 0: b) + d
+								}));
+								J && o && (s -= j, J.attr({
+									height: Y(s),
+									y: (s > 0 ? 0: s) + j
+								}))
+							}
+						} else if (!C) {
+							var h, s = i.hoverPoint,
+							b = i.hoverSeries,
+							H, z, q = Aa,
+							t = qa ? a.chartY: a.chartX - O;
+							if (rb && e.shared) {
+								h = [];
+								H = la.length;
+								for (z = 0; z < H; z++) if (la[z].visible && la[z].tooltipPoints.length) a = la[z].tooltipPoints[t],
+								a._dist = Y(t - a.plotX),
+								q = Da(q, a._dist),
+								h.push(a);
+								for (H = h.length; H--;) h[H]._dist > q && h.splice(H, 1);
+								if (h.length && h[0].plotX != Ob) rb.refresh(h),
+								Ob = h[0].plotX
+							}
+							b && b.tracker && (a = b.tooltipPoints[t]) && a != s && a.onMouseOver()
+						}
+						return (f = C) || ! jb
+					}
+				};
+				K.onmousemove = C;
+				va(K, "mouseleave", c);
+				K.ontouchstart = function(a) {
+					if (n || p) K.onmousedown(a);
+					C(a)
+				};
+				K.ontouchmove = C;
+				K.ontouchend = function() {
+					E && c()
+				};
+				K.onclick = function(e) {
+					var c = i.hoverPoint,
+					e = l(e);
+					e.cancelBubble = true;
+					if (!E) if (c && g(e.target, "isTracker")) {
+						var s = c.plotX,
+						d = c.plotY;
+						a(c, {
+							pageX: qb.left + O + (qa ? oa - d: s),
+							pageY: qb.top + T + (qa ? ea - s: d)
+						});
+						ta(c.series, "click", a(e, {
+							point: c
+						}));
+						c.firePointEvent("click", e)
+					} else a(e, b(e)),
+					ib(e.chartX - O, e.chartY - T) && ta(i, "click", e);
+					E = false
+				}
+			})();
+			jc = setInterval(function() {
+				Nb && Nb()
+			},
+			32);
+			a(this, {
+				zoomX: n,
+				zoomY: p,
+				resetTracker: c
+			})
+		}
+		function J(a) {
+			var i = a.type || B.type || B.defaultSeriesType,
+			e = Pa[i],
+			l = u.hasRendered;
+			if (l) if (qa && i == "column") e = Pa.bar;
+			else if (!qa && i == "bar") e = Pa.column;
+			i = new e;
+			i.init(u, a); ! l && i.inverted && (qa = true);
+			if (i.isCartesian) jb = i.isCartesian;
+			la.push(i);
+			return i
+		}
+		function H() {
+			B.alignTicks !== false && y(wa, function(a) {
+				a.adjustTickAmount()
+			});
+			Xa = null
+		}
+		function o(a) {
+			var i = u.isDirtyLegend,
+			e, l = u.isDirtyBox,
+			b = la.length,
+			c = b,
+			s = u.clipRect;
+			for (q(a, u); c--;) if (a = la[c], a.isDirty && a.options.stacking) {
+				e = true;
+				break
+			}
+			if (e) for (c = b; c--;) if (a = la[c], a.options.stacking) a.isDirty = true;
+			y(la, function(a) {
+				a.isDirty && (a.cleanData(), a.getSegments(), a.options.legendType == "point" && (i = true))
+			});
+			if (i && Rb.renderLegend) Rb.renderLegend(),
+			u.isDirtyLegend = false;
+			jb && (Db || (Xa = null, y(wa, function(a) {
+				a.setScale()
+			})), H(), sb(), y(wa, function(a) {
+				if (a.isDirty || l) a.redraw(),
+				l = true
+			}));
+			l && (Sb(), Bb(), s && (Eb(s), s.animate({
+				width: u.plotSizeX,
+				height: u.plotSizeY
+			})));
+			y(la, function(a) {
+				a.isDirty && a.visible && (!a.isCartesian || a.xAxis) && a.redraw()
+			});
+			hb && hb.resetTracker && hb.resetTracker();
+			ta(u, "redraw")
+		}
+		function z() {
+			var a = i.xAxis || {},
+			l = i.yAxis || {},
+			b, a = p(a);
+			y(a, function(a, i) {
+				a.index = i;
+				a.isX = true
+			});
+			l = p(l);
+			y(l, function(a, i) {
+				a.index = i
+			});
+			wa = a.concat(l);
+			u.xAxis = [];
+			u.yAxis = [];
+			wa = kb(wa, function(a) {
+				b = new e(u, a);
+				u[b.isXAxis ? "xAxis": "yAxis"].push(b);
+				return b
+			});
+			H()
+		}
+		function R(a, e) {
+			Z = ia(i.title, a);
+			da = ia(i.subtitle, e);
+			y([["title", a, Z], ["subtitle", e, da]], function(a) {
+				var i = a[0],
+				e = u[i],
+				l = a[1],
+				a = a[2];
+				e && l && (e.destroy(), e = null);
+				a && a.text && ! e && (u[i] = S.text(a.text, 0, 0).attr({
+					align: a.align,
+					"class": "highcharts-" + i,
+					zIndex: 1
+				}).css(a.style).add().align(a, false, P))
+			})
+		}
+		function I() {
+			ra = B.renderTo;
+			sa = db + Qa++;
+			c(ra) && (ra = A.getElementById(ra));
+			ra.innerHTML = "";
+			ra.offsetWidth || (ka = ra.cloneNode(0), m(ka, {
+				position: lb,
+				top: "-9999px",
+				display: ""
+			}), A.body.appendChild(ka));
+			La = (ka || ra).offsetWidth;
+			Ta = (ka || ra).offsetHeight;
+			u.chartWidth = Aa = B.width || La || 600;
+			u.chartHeight = ua = B.height || (Ta > 19 ? Ta: 400);
+			u.container = K = t($a, {
+				className: "highcharts-container" + (B.className ? " " + B.className: ""),
+				id: sa
+			},
+			a({
+				position: kc,
+				overflow: Ra,
+				width: Aa + Ea,
+				height: ua + Ea,
+				textAlign: "left"
+			},
+			B.style), ka || ra);
+			u.renderer = S = B.renderer == "SVG" ? new Fb(K, Aa, ua) : new lc(K, Aa, ua);
+			var i, e;
+			/Firefox/.test(U) && K.getBoundingClientRect && (i = function() {
+				m(K, {
+					left: 0,
+					top: 0
+				});
+				e = K.getBoundingClientRect();
+				m(K, {
+					left: - e.left % 1 + Ea,
+					top: - e.top % 1 + Ea
+				})
+			},
+			i(), va(v, "resize", i), va(u, "destroy", function() {
+				Va(v, "resize", i)
+			}))
+		}
+		function w() {
+			function a() {
+				var e = B.width || ra.offsetWidth,
+				l = B.height || ra.offsetHeight;
+				if (e && l) {
+					if (e != La || l != Ta) clearTimeout(i),
+					i = setTimeout(function() {
+						Tb(e, l, false)
+					},
+					100);
+					La = e;
+					Ta = l
+				}
+			}
+			var i;
+			va(window, "resize", a);
+			va(u, "destroy", function() {
+				Va(window, "resize", a)
+			})
+		}
+		function Ba() {
+			var e = i.labels,
+			l = i.credits,
+			c;
+			R();
+			Rb = u.legend = new dc(u);
+			sb();
+			y(wa, function(a) {
+				a.setTickPositions(true)
+			});
+			H();
+			sb();
+			Sb();
+			jb && y(wa, function(a) {
+				a.render()
+			});
+			if (!u.seriesGroup) u.seriesGroup = S.g("series-group").attr({
+				zIndex: 3
+			}).add();
+			y(la, function(a) {
+				a.translate();
+				a.setTooltipPoints();
+				a.render()
+			});
+			e.items && y(e.items, function() {
+				var i = a(e.style, this.style),
+				l = b(i.left) + O,
+				c = b(i.top) + T + 12;
+				delete i.left;
+				delete i.top;
+				S.text(this.html, l, c).attr({
+					zIndex: 2
+				}).css(i).add()
+			});
+			if (!u.toolbar) u.toolbar = s(u);
+			if (l.enabled && ! u.credits) c = l.href,
+			S.text(l.text, 0, 0).on("click", function() {
+				if (c) location.href = c
+			}).attr({
+				align: l.position.align,
+				zIndex: 8
+			}).css(l.style).add().align(l.position);
+			Bb();
+			u.hasRendered = true;
+			ka && (ra.appendChild(K), aa(ka))
+		}
+		function F() {
+			var a = la.length,
+			i = K && K.parentNode;
+			ta(u, "destroy");
+			Va(v, "unload", F);
+			Va(u);
+			for (y(wa, function(a) {
+				Va(a)
+			}); a--;) la[a].destroy();
+			K.innerHTML = "";
+			Va(K);
+			i && i.removeChild(K);
+			K = null;
+			S.alignedObjects = null;
+			clearInterval(jc);
+			for (a in u) delete u[a]
+		}
+		function nb() { ! ca && ! v.parent && A.readyState != "complete" ? A.attachEvent("onreadystatechange", function() {
+				A.detachEvent("onreadystatechange", nb);
+				nb()
+			}) : (I(), Vb(), Wb(), y(i.series || [], function(a) {
+				J(a)
+			}), u.inverted = qa = j(qa, i.chart.inverted), z(), u.render = Ba, u.tracker = hb = new E(u, i.tooltip), Ba(), ta(u, "load"), l && l.apply(u, [u]), y(u.callbacks, function(a) {
+				a.apply(u, [u])
+			}))
+		}
+		zb = ia(zb, za.xAxis);
+		Mb = ia(Mb, za.yAxis);
+		za.xAxis = za.yAxis = null;
+		var i = ia(za, i),
+		B = i.chart,
+		na = B.margin,
+		na = d(na) ? na: [na, na, na, na],
+		eb = j(B.marginTop, na[0]),
+		ob = j(B.marginRight, na[1]),
+		L = j(B.marginBottom, na[2]),
+		M = j(B.marginLeft, na[3]),
+		Q = B.spacingTop,
+		Ja = B.spacingRight,
+		Ka = B.spacingBottom,
+		W = B.spacingLeft,
+		P,
+		Z,
+		da,
+		T,
+		ja,
+		ga,
+		O,
+		pa,
+		ra,
+		ka,
+		K,
+		sa,
+		La,
+		Ta,
+		Aa,
+		ua,
+		cb,
+		Za,
+		Xb,
+		Yb,
+		Zb,
+		$b,
+		u = this,
+		ub = (na = B.events) && !! na.click,
+		ac,
+		ib,
+		rb,
+		Qb,
+		fb,
+		tb,
+		bc,
+		ea,
+		oa,
+		hb,
+		Cb,
+		Bb,
+		Rb,
+		ab,
+		bb,
+		qb,
+		jb = B.showAxes,
+		Db = 0,
+		wa = [],
+		Xa,
+		la = [],
+		qa,
+		S,
+		Nb,
+		jc,
+		Ob,
+		Sb,
+		sb,
+		Vb,
+		Wb,
+		Tb,
+		Pb,
+		nc,
+		dc = function(i) {
+			function e(a, i) {
+				var l = a.legendItem,
+				b = a.legendLine,
+				c = a.legendSymbol,
+				s = p.color,
+				d = i ? g.itemStyle.color: s,
+				s = i ? a.color: s;
+				l && l.css({
+					fill: d
+				});
+				b && b.attr({
+					stroke: s
+				});
+				c && c.attr({
+					stroke: s,
+					fill: s
+				})
+			}
+			function l(a, i, e) {
+				var b = a.legendItem,
+				c = a.legendLine,
+				s = a.legendSymbol,
+				a = a.checkbox;
+				b && b.attr({
+					x: i,
+					y: e
+				});
+				c && c.translate(i, e - 4);
+				s && s.attr({
+					x: i + s.xOff,
+					y: e + s.yOff
+				});
+				if (a) a.x = i,
+				a.y = e
+			}
+			function c() {
+				y(E, function(a) {
+					var i = a.checkbox;
+					i && m(i, {
+						left: x.attr("translateX") + a.legendItemWidth + i.x - 40 + Ea,
+						top: x.attr("translateY") + i.y - 11 + Ea
+					})
+				})
+			}
+			function s(a) {
+				var i, b, c, d, J, m = a.legendItem;
+				d = a.series || a;
+				if (!m) {
+					J = /^(bar|pie|area|column)$/.test(d.type);
+					a.legendItem = m = S.text(g.labelFormatter.call(a), 0, 0).css(a.visible ? h: p).on("mouseover", function() {
+						a.setState(Sa);
+						m.css(n)
+					}).on("mouseout", function() {
+						m.css(a.visible ? h: p);
+						a.setState()
+					}).on("click", function() {
+						var i = function() {
+							a.setVisible()
+						};
+						a.firePointEvent ? a.firePointEvent("legendItemClick", null, i) : ta(a, "legendItemClick", null, i)
+					}).attr({
+						zIndex: 2
+					}).add(x);
+					if (!J && a.options && a.options.lineWidth) {
+						var z = a.options;
+						d = {
+							"stroke-width": z.lineWidth,
+							zIndex: 2
+						};
+						if (z.dashStyle) d.dashstyle = z.dashStyle;
+						a.legendLine = S.path([Ca, - f - C, 0, ma, - C, 0]).attr(d).add(x)
+					}
+					J ? i = S.rect(b = - f - C, c = - 11, f, 12, 2).attr({
+						"stroke-width": 0,
+						zIndex: 3
+					}).add(x) : a.options && a.options.marker && a.options.marker.enabled && (i = S.symbol(a.symbol, b = - f / 2 - C, c = - 4, a.options.marker.radius).attr(a.pointAttr[xa]).attr({
+						zIndex: 3
+					}).add(x));
+					if (i) i.xOff = b,
+					i.yOff = c;
+					a.legendSymbol = i;
+					e(a, a.visible);
+					if (a.options && a.options.showCheckbox) a.checkbox = t("input", {
+						type: "checkbox",
+						checked: a.selected,
+						defaultChecked: a.selected
+					},
+					g.itemCheckboxStyle, K),
+					va(a.checkbox, "click", function(i) {
+						ta(a, "checkboxClick", {
+							checked: i.target.checked
+						},
+						function() {
+							a.select()
+						})
+					})
+				}
+				i = m.getBBox();
+				b = a.legendItemWidth = g.itemWidth || f + C + i.width + o;
+				D = i.height;
+				if (j && fa - q + b > (na || Aa - 2 * H - q)) fa = q,
+				R += D;
+				u = R;
+				l(a, fa, R);
+				j ? fa += b: R += D;
+				Wa = na || G(j ? fa - q: b, Wa);
+				E.push(a)
+			}
+			function d() {
+				fa = q;
+				R = z;
+				u = Wa = 0;
+				E = [];
+				x || (x = S.g("legend").attr({
+					zIndex: 7
+				}).add());
+				ca && v.reverse();
+				y(v, function(a) {
+					a.options.showInLegend && y(a.options.legendType == "point" ? a.data: [a], s)
+				});
+				ca && v.reverse();
+				ab = na || Wa;
+				bb = u - z + D;
+				if (I || w) ab += 2 * H,
+				bb += 2 * H,
+				B ? ab > 0 && bb > 0 && B.animate({
+					width: ab,
+					height: bb
+				}) : B = S.rect(0, 0, ab, bb, g.borderRadius, I || 0).attr({
+					stroke: g.borderColor,
+					"stroke-width": I || 0,
+					fill: w || Na
+				}).add(x).shadow(g.shadow),
+				B[E.length ? "show": "hide"]();
+				for (var i = ["left", "right", "top", "bottom"], e, l = 4; l--;) e = i[l],
+				J[e] && J[e] != "auto" && (g[l < 2 ? "align": "verticalAlign"] = e, g[l < 2 ? "x": "y"] = b(J[e]) * (l % 2 ? - 1: 1));
+				x.align(a(g, {
+					width: ab,
+					height: bb
+				}), true, P);
+				Db || c()
+			}
+			var g = i.options.legend;
+			if (g.enabled) {
+				var j = g.layout == "horizontal",
+				f = g.symbolWidth,
+				C = g.symbolPadding,
+				E, J = g.style,
+				h = g.itemStyle,
+				n = g.itemHoverStyle,
+				p = g.itemHiddenStyle,
+				H = b(J.padding),
+				o = 20,
+				z = 18,
+				q = 4 + H + f + C,
+				fa,
+				R,
+				u,
+				D = 0,
+				B,
+				I = g.borderWidth,
+				w = g.backgroundColor,
+				x,
+				Wa,
+				na = g.width,
+				v = i.series,
+				ca = g.reversed;
+				d();
+				va(i, "endResize", c);
+				return {
+					colorizeItem: e,
+					destroyItem: function(a) {
+						var i = a.checkbox;
+						y(["legendItem", "legendLine", "legendSymbol"], function(i) {
+							a[i] && a[i].destroy()
+						});
+						i && aa(a.checkbox)
+					},
+					renderLegend: d
+				}
+			}
+		};
+		ib = function(a, i) {
+			return a >= 0 && a <= oa && i >= 0 && i <= ea
+		};
+		nc = function() {
+			ta(u, "selection", {
+				resetSelection: true
+			},
+			Pb);
+			u.toolbar.remove("zoom")
+		};
+		Pb = function(a) {
+			var i = za.lang,
+			e = u.pointCount < 100;
+			u.toolbar.add("zoom", i.resetZoom, i.resetZoomTitle, nc); ! a || a.resetSelection ? y(wa, function(a) {
+				a.setExtremes(null, null, false, e)
+			}) : y(a.xAxis.concat(a.yAxis), function(a) {
+				var i = a.axis;
+				u.tracker[i.isXAxis ? "zoomX": "zoomY"] && i.setExtremes(a.min, a.max, false, e)
+			});
+			o()
+		};
+		sb = function() {
+			var a = i.legend,
+			e = j(a.margin, 10),
+			l = a.x,
+			b = a.y,
+			c = a.align,
+			s = a.verticalAlign,
+			d;
+			Vb();
+			if ((u.title || u.subtitle) && ! n(eb)) if (d = G(u.title && ! Z.floating && ! Z.verticalAlign && Z.y || 0, u.subtitle && ! da.floating && ! da.verticalAlign && da.y || 0)) T = G(T, d + j(Z.margin, 15) + Q);
+			a.enabled && ! a.floating && (c == "right" ? n(ob) || (ja = G(ja, ab - l + e + Ja)) : c == "left" ? n(M) || (O = G(O, ab + l + e + W)) : s == "top" ? n(eb) || (T = G(T, bb + b + e + Q)) : s == "bottom" && (n(L) || (ga = G(ga, bb - b + e + Ka))));
+			jb && y(wa, function(a) {
+				a.getOffset()
+			});
+			n(M) || (O += pa[3]);
+			n(eb) || (T += pa[0]);
+			n(L) || (ga += pa[2]);
+			n(ob) || (ja += pa[1]);
+			Wb()
+		};
+		Tb = function(a, i, e) {
+			var l = u.title,
+			b = u.subtitle;
+			Db += 1;
+			q(e, u);
+			Za = ua;
+			cb = Aa;
+			Aa = x(a);
+			ua = x(i);
+			m(K, {
+				width: Aa + Ea,
+				height: ua + Ea
+			});
+			S.setSize(Aa, ua, e);
+			oa = Aa - O - ja;
+			ea = ua - T - ga;
+			Xa = null;
+			y(wa, function(a) {
+				a.isDirty = true;
+				a.setScale()
+			});
+			y(la, function(a) {
+				a.isDirty = true
+			});
+			u.isDirtyLegend = true;
+			u.isDirtyBox = true;
+			sb();
+			l && l.align(null, null, P);
+			b && b.align(null, null, P);
+			o(e);
+			Za = null;
+			ta(u, "resize");
+			setTimeout(function() {
+				ta(u, "endResize", null, function() {
+					Db -= 1
+				})
+			},
+			vb && vb.duration || 500)
+		};
+		Wb = function() {
+			u.plotLeft = O = x(O);
+			u.plotTop = T = x(T);
+			u.plotWidth = oa = x(Aa - O - ja);
+			u.plotHeight = ea = x(ua - T - ga);
+			u.plotSizeX = qa ? ea: oa;
+			u.plotSizeY = qa ? oa: ea;
+			P = {
+				x: W,
+				y: Q,
+				width: Aa - W - Ja,
+				height: ua - Q - Ka
+			}
+		};
+		Vb = function() {
+			T = j(eb, Q);
+			ja = j(ob, Ja);
+			ga = j(L, Ka);
+			O = j(M, W);
+			pa = [0, 0, 0, 0]
+		};
+		Sb = function() {
+			var a = B.borderWidth || 0,
+			i = B.backgroundColor,
+			e = B.plotBackgroundColor,
+			l = B.plotBackgroundImage,
+			b, c = {
+				x: O,
+				y: T,
+				width: oa,
+				height: ea
+			};
+			b = a + (B.shadow ? 8: 0);
+			if (a || i) Xb ? Xb.animate({
+				width: Aa - b,
+				height: ua - b
+			}) : Xb = S.rect(b / 2, b / 2, Aa - b, ua - b, B.borderRadius, a).attr({
+				stroke: B.borderColor,
+				"stroke-width": a,
+				fill: i || Na
+			}).add().shadow(B.shadow);
+			e && (Yb ? Yb.animate(c) : Yb = S.rect(O, T, oa, ea, 0).attr({
+				fill: e
+			}).add().shadow(B.plotShadow));
+			l && (Zb ? Zb.animate(c) : Zb = S.image(l, O, T, oa, ea).add());
+			B.plotBorderWidth && ($b ? $b.animate(c) : $b = S.rect(O, T, oa, ea, 0, B.plotBorderWidth).attr({
+				stroke: B.plotBorderColor,
+				"stroke-width": B.plotBorderWidth,
+				zIndex: 4
+			}).add());
+			u.isDirtyBox = false
+		};
+		Ya = Ia = 0;
+		va(v, "unload", F);
+		B.reflow !== false && va(u, "load", w);
+		if (na) for (ac in na) va(u, ac, na[ac]);
+		u.options = i;
+		u.series = la;
+		u.addSeries = function(a, i, e) {
+			var l;
+			a && (q(e, u), i = j(i, true), ta(u, "addSeries", {
+				options: a
+			},
+			function() {
+				l = J(a);
+				l.isDirty = true;
+				u.isDirtyLegend = true;
+				i && u.redraw()
+			}));
+			return l
+		};
+		u.animation = j(B.animation, true);
+		u.destroy = F;
+		u.get = function(a) {
+			var i, e, l;
+			for (i = 0; i < wa.length; i++) if (wa[i].options.id == a) return wa[i];
+			for (i = 0; i < la.length; i++) if (la[i].options.id == a) return la[i];
+			for (i = 0; i < la.length; i++) {
+				l = la[i].data;
+				for (e = 0; e < l.length; e++) if (l[e].id == a) return l[e]
+			}
+			return null
+		};
+		u.getSelectedPoints = function() {
+			var a = [];
+			y(la, function(i) {
+				a = a.concat(cc(i.data, function(a) {
+					return a.selected
+				}))
+			});
+			return a
+		};
+		u.getSelectedSeries = function() {
+			return cc(la, function(a) {
+				return a.selected
+			})
+		};
+		u.hideLoading = function() {
+			Hb(fb, {
+				opacity: 0
+			},
+			{
+				duration: i.loading.hideDuration,
+				complete: function() {
+					m(fb, {
+						display: Na
+					})
+				}
+			});
+			bc = false
+		};
+		u.isInsidePlot = ib;
+		u.redraw = o;
+		u.setSize = Tb;
+		u.setTitle = R;
+		u.showLoading = function(e) {
+			var l = i.loading;
+			fb || (fb = t($a, {
+				className: "highcharts-loading"
+			},
+			a(l.style, {
+				left: O + Ea,
+				top: T + Ea,
+				width: oa + Ea,
+				height: ea + Ea,
+				zIndex: 10,
+				display: Na
+			}), K), tb = t("span", null, l.labelStyle, fb));
+			tb.innerHTML = e || i.lang.loading;
+			bc || (m(fb, {
+				opacity: 0,
+				display: ""
+			}), Hb(fb, {
+				opacity: l.style.opacity
+			},
+			{
+				duration: l.showDuration
+			}), bc = true)
+		};
+		u.pointCount = 0;
+		nb()
+	}
+	var A = document,
+	v = window,
+	N = Math,
+	x = N.round,
+	ha = N.floor,
+	gb = N.ceil,
+	G = N.max,
+	Da = N.min,
+	Y = N.abs,
+	Z = N.cos,
+	da = N.sin,
+	P = N.PI,
+	L = P * 2 / 360,
+	U = navigator.userAgent,
+	D = /msie/i.test(U) && ! v.opera,
+	I = A.documentMode == 8,
+	Ba = /AppleWebKit/.test(U),
+	ca = v.SVGAngle || A.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure", "1.1"),
+	Ha = "ontouchstart" in A.documentElement,
+	Ia,
+	Ya,
+	Ja = {},
+	Qa = 0,
+	Oa = 1,
+	Ka,
+	za,
+	Ab,
+	vb,
+	cb,
+	ya,
+	$a = "div",
+	lb = "absolute",
+	kc = "relative",
+	Ra = "hidden",
+	db = "highcharts-",
+	Ua = "visible",
+	Ea = "px",
+	Na = "none",
+	Ca = "M",
+	ma = "L",
+	tb = "rgba(192,192,192," + (ca ? (1.0E-6):0.002) + ")",
+	xa = "",
+	Sa = "hover",
+	wb,
+	Ib,
+	Jb,
+	Kb,
+	pb,
+	xb,
+	yb,
+	ec,
+	fc,
+	Lb,
+	gc,
+	hc,
+	ja = v.HighchartsAdapter,
+	sa = ja || {},
+	y = sa.each,
+	cc = sa.grep,
+	kb = sa.map,
+	ia = sa.merge,
+	ub = sa.hyphenate,
+	va = sa.addEvent,
+	Va = sa.removeEvent,
+	ta = sa.fireEvent,
+	Hb = sa.animate,
+	Eb = sa.stop,
+	Pa = {};
+	ja && ja.init && ja.init();
+	if (!ja && v.jQuery) {
+		var ga = jQuery,
+		y = function(a, l) {
+			for (var e = 0, b = a.length; e < b; e++) if (l.call(a[e], a[e], e, a) === false) return e
+		},
+		cc = ga.grep,
+		kb = function(a, l) {
+			for (var e = [], b = 0, c = a.length; b < c; b++) e[b] = l.call(a[b], a[b], b, a);
+			return e
+		},
+		ia = function() {
+			var a = arguments;
+			return ga.extend(true, null, a[0], a[1], a[2], a[3])
+		},
+		ub = function(a) {
+			return a.replace(/([A-Z])/g, function(a, i) {
+				return "-" + i.toLowerCase()
+			})
+		},
+		va = function(a, l, e) {
+			ga(a).bind(l, e)
+		},
+		Va = function(a, l, e) {
+			var b = A.removeEventListener ? "removeEventListener": "detachEvent";
+			A[b] && ! a[b] && (a[b] = function() {});
+			ga(a).unbind(l, e)
+		},
+		ta = function(i, l, e, b) {
+			var c = ga.Event(l),
+			d = "detached" + l;
+			a(c, e);
+			i[l] && (i[d] = i[l], i[l] = null);
+			ga(i).trigger(c);
+			i[d] && (i[l] = i[d], i[d] = null);
+			b && ! c.isDefaultPrevented() && b(c)
+		},
+		Hb = function(a, l, e) {
+			var b = ga(a);
+			if (l.d) a.toD = l.d,
+			l.d = 1;
+			b.stop();
+			b.animate(l, e)
+		},
+		Eb = function(a) {
+			ga(a).stop()
+		};
+		ga.extend(ga.easing, {
+			easeOutQuad: function(a, l, e, b, c) {
+				return - b * (l /= c) * (l - 2) + e
+			}
+		});
+		var dc = jQuery.fx.step._default,
+		rc = jQuery.fx.prototype.cur;
+		ga.fx.step._default = function(a) {
+			var l = a.elem;
+			l.attr ? l.attr(a.prop, a.now) : dc.apply(this, arguments)
+		};
+		ga.fx.step.d = function(a) {
+			var l = a.elem;
+			if (!a.started) {
+				var e = cb.init(l, l.d, l.toD);
+				a.start = e[0];
+				a.end = e[1];
+				a.started = true
+			}
+			l.attr("d", cb.step(a.start, a.end, a.pos, l.toD))
+		};
+		ga.fx.prototype.cur = function() {
+			var a = this.elem;
+			return a.attr ? a.attr(this.prop) : rc.apply(this, arguments)
+		}
+	}
+	cb = {
+		init: function(a, l, e) {
+			var l = l || "",
+			b = a.shift,
+			c = l.indexOf("C") > - 1,
+			d = c ? 7: 3,
+			g,
+			l = l.split(" "),
+			e = [].concat(e),
+			f,
+			j,
+			h = function(a) {
+				for (g = a.length; g--;) a[g] == Ca && a.splice(g + 1, 0, a[g + 1], a[g + 2], a[g + 1], a[g + 2])
+			};
+			c && (h(l), h(e));
+			a.isArea && (f = l.splice(l.length - 6, 6), j = e.splice(e.length - 6, 6));
+			if (b) e = [].concat(e).splice(0, d).concat(e),
+			a.shift = false;
+			if (l.length) for (a = e.length; l.length < a;) b = [].concat(l).splice(l.length - d, d),
+			c && (b[d - 6] = b[d - 2], b[d - 5] = b[d - 1]),
+			l = l.concat(b);
+			f && (l = l.concat(f), e = e.concat(j));
+			return [l, e]
+		},
+		step: function(a, l, e, b) {
+			var c = [],
+			d = a.length;
+			if (e == 1) c = b;
+			else if (d == l.length && e < 1) for (; d--;) b = parseFloat(a[d]),
+			c[d] = isNaN(b) ? a[d] : e * parseFloat(l[d] - b) + b;
+			else c = l;
+			return c
+		}
+	};
+	ja = {
+		enabled: true,
+		align: "center",
+		x: 0,
+		y: 15,
+		style: {
+			color: "#666",
+			fontSize: "11px",
+			lineHeight: "14px"
+		}
+	};
+	za = {
+		colors: "#4572A7,#AA4643,#89A54E,#80699B,#3D96AE,#DB843D,#92A8CD,#A47D7C,#B5CA92".split(","),
+		symbols: ["circle", "diamond", "square", "triangle", "triangle-down"],
+		lang: {
+			loading: "Loading...",
+			months: "January,February,March,April,May,June,July,August,September,October,November,December".split(","),
+			weekdays: "Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday".split(","),
+			decimalPoint: ".",
+			resetZoom: "Reset zoom",
+			resetZoomTitle: "Reset zoom level 1:1",
+			thousandsSep: ","
+		},
+		global: {
+			useUTC: true
+		},
+		chart: {
+			borderColor: "#4572A7",
+			borderRadius: 5,
+			defaultSeriesType: "line",
+			ignoreHiddenSeries: true,
+			spacingTop: 10,
+			spacingRight: 10,
+			spacingBottom: 15,
+			spacingLeft: 10,
+			style: {
+				fontFamily: '"Lucida Grande", "Lucida Sans Unicode", Verdana, Arial, Helvetica, sans-serif',
+				fontSize: "12px"
+			},
+			backgroundColor: "#FFFFFF",
+			plotBorderColor: "#C0C0C0"
+		},
+		title: {
+			text: "Chart title",
+			align: "center",
+			y: 15,
+			style: {
+				color: "#3E576F",
+				fontSize: "16px"
+			}
+		},
+		subtitle: {
+			text: "",
+			align: "center",
+			y: 30,
+			style: {
+				color: "#6D869F"
+			}
+		},
+		plotOptions: {
+			line: {
+				allowPointSelect: false,
+				showCheckbox: false,
+				animation: {
+					duration: 1E3
+				},
+				events: {},
+				lineWidth: 2,
+				shadow: true,
+				marker: {
+					enabled: true,
+					lineWidth: 0,
+					radius: 4,
+					lineColor: "#FFFFFF",
+					states: {
+						hover: {},
+						select: {
+							fillColor: "#FFFFFF",
+							lineColor: "#000000",
+							lineWidth: 2
+						}
+					}
+				},
+				point: {
+					events: {}
+				},
+				dataLabels: ia(ja, {
+					enabled: false,
+					y: - 6,
+					formatter: function() {
+						return this.y
+					}
+				}),
+				showInLegend: true,
+				states: {
+					hover: {
+						marker: {}
+					},
+					select: {
+						marker: {}
+					}
+				},
+				stickyTracking: true
+			}
+		},
+		labels: {
+			style: {
+				position: lb,
+				color: "#3E576F"
+			}
+		},
+		legend: {
+			enabled: true,
+			align: "center",
+			layout: "horizontal",
+			labelFormatter: function() {
+				return this.name
+			},
+			borderWidth: 1,
+			borderColor: "#909090",
+			borderRadius: 5,
+			shadow: false,
+			style: {
+				padding: "5px"
+			},
+			itemStyle: {
+				cursor: "pointer",
+				color: "#3E576F"
+			},
+			itemHoverStyle: {
+				cursor: "pointer",
+				color: "#000000"
+			},
+			itemHiddenStyle: {
+				color: "#C0C0C0"
+			},
+			itemCheckboxStyle: {
+				position: lb,
+				width: "13px",
+				height: "13px"
+			},
+			symbolWidth: 16,
+			symbolPadding: 5,
+			verticalAlign: "bottom",
+			x: 0,
+			y: 0
+		},
+		loading: {
+			hideDuration: 100,
+			labelStyle: {
+				fontWeight: "bold",
+				position: kc,
+				top: "1em"
+			},
+			showDuration: 100,
+			style: {
+				position: lb,
+				backgroundColor: "white",
+				opacity: 0.5,
+				textAlign: "center"
+			}
+		},
+		tooltip: {
+			enabled: true,
+			backgroundColor: "rgba(255, 255, 255, .85)",
+			borderWidth: 2,
+			borderRadius: 5,
+			shadow: true,
+			snap: Ha ? 25: 10,
+			style: {
+				color: "#333333",
+				fontSize: "12px",
+				padding: "5px",
+				whiteSpace: "nowrap"
+			}
+		},
+		toolbar: {
+			itemStyle: {
+				color: "#4572A7",
+				cursor: "pointer"
+			}
+		},
+		credits: {
+			enabled: true,
+			text: "Highcharts.com",
+			href: "http://www.highcharts.com",
+			position: {
+				align: "right",
+				x: - 10,
+				verticalAlign: "bottom",
+				y: - 5
+			},
+			style: {
+				cursor: "pointer",
+				color: "#909090",
+				fontSize: "10px"
+			}
+		}
+	};
+	var zb = {
+		dateTimeLabelFormats: {
+			second: "%H:%M:%S",
+			minute: "%H:%M",
+			hour: "%H:%M",
+			day: "%e. %b",
+			week: "%e. %b",
+			month: "%b '%y",
+			year: "%Y"
+		},
+		endOnTick: false,
+		gridLineColor: "#C0C0C0",
+		labels: ja,
+		lineColor: "#C0D0E0",
+		lineWidth: 1,
+		max: null,
+		min: null,
+		minPadding: 0.01,
+		maxPadding: 0.01,
+		minorGridLineColor: "#E0E0E0",
+		minorGridLineWidth: 1,
+		minorTickColor: "#A0A0A0",
+		minorTickLength: 2,
+		minorTickPosition: "outside",
+		startOfWeek: 1,
+		startOnTick: false,
+		tickColor: "#C0D0E0",
+		tickLength: 5,
+		tickmarkPlacement: "between",
+		tickPixelInterval: 100,
+		tickPosition: "outside",
+		tickWidth: 1,
+		title: {
+			align: "middle",
+			style: {
+				color: "#6D869F",
+				fontWeight: "bold"
+			}
+		},
+		type: "linear"
+	},
+	Mb = ia(zb, {
+		endOnTick: true,
+		gridLineWidth: 1,
+		tickPixelInterval: 72,
+		showLastLabel: true,
+		labels: {
+			align: "right",
+			x: - 8,
+			y: 3
+		},
+		lineWidth: 0,
+		maxPadding: 0.05,
+		minPadding: 0.05,
+		startOnTick: true,
+		tickWidth: 0,
+		title: {
+			rotation: 270,
+			text: "Y-values"
+		}
+	}),
+	qc = {
+		labels: {
+			align: "right",
+			x: - 8,
+			y: null
+		},
+		title: {
+			rotation: 270
+		}
+	},
+	pc = {
+		labels: {
+			align: "left",
+			x: 8,
+			y: null
+		},
+		title: {
+			rotation: 90
+		}
+	},
+	ic = {
+		labels: {
+			align: "center",
+			x: 0,
+			y: 14
+		},
+		title: {
+			rotation: 0
+		}
+	},
+	oc = ia(ic, {
+		labels: {
+			y: - 5
+		}
+	}),
+	ka = za.plotOptions,
+	ja = ka.line;
+	ka.spline = ia(ja);
+	ka.scatter = ia(ja, {
+		lineWidth: 0,
+		states: {
+			hover: {
+				lineWidth: 0
+			}
+		}
+	});
+	ka.area = ia(ja, {});
+	ka.areaspline = ia(ka.area);
+	ka.column = ia(ja, {
+		borderColor: "#FFFFFF",
+		borderWidth: 1,
+		borderRadius: 0,
+		groupPadding: 0.2,
+		marker: null,
+		pointPadding: 0.1,
+		minPointLength: 0,
+		states: {
+			hover: {
+				brightness: 0.1,
+				shadow: false
+			},
+			select: {
+				color: "#C0C0C0",
+				borderColor: "#000000",
+				shadow: false
+			}
+		}
+	});
+	ka.bar = ia(ka.column, {
+		dataLabels: {
+			align: "left",
+			x: 5,
+			y: 0
+		}
+	});
+	ka.pie = ia(ja, {
+		borderColor: "#FFFFFF",
+		borderWidth: 1,
+		center: ["50%", "50%"],
+		colorByPoint: true,
+		dataLabels: {
+			distance: 30,
+			enabled: true,
+			formatter: function() {
+				return this.point.name
+			},
+			y: 5
+		},
+		legendType: "point",
+		marker: null,
+		size: "75%",
+		showInLegend: false,
+		slicedOffset: 10,
+		states: {
+			hover: {
+				brightness: 0.1,
+				shadow: false
+			}
+		}
+	});
+	w();
+	var La = function(a) {
+		var l = [],
+		e;
+		(function(a) {
+			if (e = /rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]?(?:\.[0-9]+)?)\s*\)/.exec(a)) l = [b(e[1]), b(e[2]), b(e[3]), parseFloat(e[4], 10)];
+			else if (e = /#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(a)) l = [b(e[1], 16), b(e[2], 16), b(e[3], 16), 1]
+		})(a);
+		return {
+			get: function(e) {
+				return l && ! isNaN(l[0]) ? e == "rgb" ? "rgb(" + l[0] + "," + l[1] + "," + l[2] + ")": e == "a" ? l[3] : "rgba(" + l.join(",") + ")": a
+			},
+			brighten: function(a) {
+				if (f(a) && a !== 0) {
+					var i;
+					for (i = 0; i < 3; i++) l[i] += b(a * 255),
+					l[i] < 0 && (l[i] = 0),
+					l[i] > 255 && (l[i] = 255)
+				}
+				return this
+			},
+			setOpacity: function(a) {
+				l[3] = a;
+				return this
+			}
+		}
+	};
+	Ab = function(a, l, e) {
+		function b(a) {
+			return a.toString().replace(/^([0-9])$/, "0$1")
+		}
+		if (!n(l) || isNaN(l)) return "Invalid date";
+		var a = j(a, "%Y-%m-%d %H:%M:%S"),
+		l = new Date(l * Oa),
+		c = l[Jb](),
+		d = l[Kb](),
+		g = l[pb](),
+		f = l[xb](),
+		h = l[yb](),
+		p = za.lang,
+		m = p.weekdays,
+		p = p.months,
+		l = {
+			a: m[d].substr(0, 3),
+			A: m[d],
+			d: b(g),
+			e: g,
+			b: p[f].substr(0, 3),
+			B: p[f],
+			m: b(f + 1),
+			y: h.toString().substr(2, 2),
+			Y: h,
+			H: b(c),
+			I: b(c % 12 || 12),
+			l: c % 12 || 12,
+			M: b(l[Ib]()),
+			p: c < 12 ? "AM": "PM",
+			P: c < 12 ? "am": "pm",
+			S: b(l.getSeconds())
+		},
+		o;
+		for (o in l) a = a.replace("%" + o, l[o]);
+		return e ? a.substr(0, 1).toUpperCase() + a.substr(1) : a
+	};
+	M.prototype = {
+		init: function(a, l) {
+			this.element = A.createElementNS("http://www.w3.org/2000/svg", l);
+			this.renderer = a
+		},
+		animate: function(a, l, e) {
+			if (l = j(l, vb, true)) {
+				l = ia(l);
+				if (e) l.complete = e;
+				Hb(this, a, l)
+			} else this.attr(a),
+			e && e()
+		},
+		attr: function(a, l) {
+			var e, s, d, f, j = this.element,
+			h = j.nodeName,
+			p = this.renderer,
+			m, o = this.shadows,
+			q, t = this;
+			c(a) && n(l) && (e = a, a = {},
+			a[e] = l);
+			if (c(a)) e = a,
+			h == "circle" ? e = {
+				x: "cx",
+				y: "cy"
+			} [e] || e: e == "strokeWidth" && (e = "stroke-width"),
+			t = g(j, e) || this[e] || 0,
+			e != "d" && e != "visibility" && (t = parseFloat(t));
+			else for (e in a) {
+				m = false;
+				s = a[e];
+				if (e == "d") s && s.join && (s = s.join(" ")),
+				/(NaN| {2}|^$)/.test(s) && (s = "M 0 0"),
+				this.d = s;
+				else if (e == "x" && h == "text") {
+					for (d = 0; d < j.childNodes.length; d++) f = j.childNodes[d],
+					g(f, "x") == g(j, "x") && g(f, "x", s);
+					this.rotation && g(j, "transform", "rotate(" + this.rotation + " " + s + " " + b(a.y || g(j, "y")) + ")")
+				} else if (e == "fill") s = p.color(s, j, e);
+				else if (h == "circle" && (e == "x" || e == "y")) e = {
+					x: "cx",
+					y: "cy"
+				} [e] || e;
+				else if (e == "translateX" || e == "translateY" || e == "rotation" || e == "verticalAlign") this[e] = s,
+				this.updateTransform(),
+				m = true;
+				else if (e == "stroke") s = p.color(s, j, e);
+				else if (e == "dashstyle") {
+					if (e = "stroke-dasharray", s) {
+						s = s.toLowerCase().replace("shortdashdotdot", "3,1,1,1,1,1,").replace("shortdashdot", "3,1,1,1").replace("shortdot", "1,1,").replace("shortdash", "3,1,").replace("longdash", "8,3,").replace(/dot/g, "1,3,").replace("dash", "4,3,").replace(/,$/, "").split(",");
+						for (d = s.length; d--;) s[d] = b(s[d]) * a["stroke-width"];
+						s = s.join(",")
+					}
+				} else e == "isTracker" ? this[e] = s: e == "width" ? s = b(s) : e == "align" && (e = "text-anchor", s = {
+					left: "start",
+					center: "middle",
+					right: "end"
+				} [s]);
+				e == "strokeWidth" && (e = "stroke-width");
+				Ba && e == "stroke-width" && s === 0 && (s = 1.0E-6);
+				this.symbolName && /^(x|y|r|start|end|innerR)/.test(e) && (q || (this.symbolAttr(a), q = true), m = true);
+				if (o && /^(width|height|visibility|x|y|d)$/.test(e)) for (d = o.length; d--;) g(o[d], e, s);
+				e == "text" ? (this.textStr = s, p.buildText(this)) : m || g(j, e, s)
+			}
+			return t
+		},
+		symbolAttr: function(a) {
+			this.x = j(a.x, this.x);
+			this.y = j(a.y, this.y);
+			this.r = j(a.r, this.r);
+			this.start = j(a.start, this.start);
+			this.end = j(a.end, this.end);
+			this.width = j(a.width, this.width);
+			this.height = j(a.height, this.height);
+			this.innerR = j(a.innerR, this.innerR);
+			this.attr({
+				d: this.renderer.symbols[this.symbolName](this.x, this.y, this.r, {
+					start: this.start,
+					end: this.end,
+					width: this.width,
+					height: this.height,
+					innerR: this.innerR
+				})
+			})
+		},
+		clip: function(a) {
+			return this.attr("clip-path", "url(" + this.renderer.url + "#" + a.id + ")")
+		},
+		css: function(i) {
+			var l = this.element;
+			if (i && i.color) i.fill = i.color;
+			i = a(this.styles, i);
+			D && ! ca ? m(this.element, i) : this.attr({
+				style: o(i)
+			});
+			this.styles = i;
+			i.width && l.nodeName == "text" && this.added && this.renderer.buildText(this);
+			return this
+		},
+		on: function(a, l) {
+			var e = l;
+			Ha && a == "click" && (a = "touchstart", e = function(a) {
+				a.preventDefault();
+				l()
+			});
+			this.element["on" + a] = e;
+			return this
+		},
+		translate: function(a, l) {
+			return this.attr({
+				translateX: a,
+				translateY: l
+			})
+		},
+		invert: function() {
+			this.inverted = true;
+			this.updateTransform();
+			return this
+		},
+		updateTransform: function() {
+			var a = this.translateX || 0,
+			l = this.translateY || 0,
+			e = this.inverted,
+			b = this.rotation,
+			c = [];
+			e && (a += this.attr("width"), l += this.attr("height"));
+			(a || l) && c.push("translate(" + a + "," + l + ")");
+			e ? c.push("rotate(90) scale(-1,1)") : b && c.push("rotate(" + b + " " + this.x + " " + this.y + ")");
+			c.length && g(this.element, "transform", c.join(" "))
+		},
+		toFront: function() {
+			var a = this.element;
+			a.parentNode.appendChild(a);
+			return this
+		},
+		align: function(a, l, e) {
+			a ? (this.alignOptions = a, this.alignByTranslate = l, e || this.renderer.alignedObjects.push(this)) : (a = this.alignOptions, l = this.alignByTranslate);
+			var e = j(e, this.renderer),
+			b = a.align,
+			c = a.verticalAlign,
+			d = (e.x || 0) + (a.x || 0),
+			g = (e.y || 0) + (a.y || 0),
+			f = {};
+			/^(right|center)$/.test(b) && (d += (e.width - (a.width || 0)) / {
+				right: 1,
+				center: 2
+			} [b]);
+			f[l ? "translateX": "x"] = d;
+			/^(bottom|middle)$/.test(c) && (g += (e.height - (a.height || 0)) / ({
+				bottom: 1,
+				middle: 2
+			} [c] || 1));
+			f[l ? "translateY": "y"] = g;
+			this[this.placed ? "animate": "attr"](f);
+			this.placed = true;
+			return this
+		},
+		getBBox: function() {
+			var i, b, e, c = this.rotation,
+			d = c * L;
+			try {
+				i = a({},
+				this.element.getBBox())
+			} catch(g) {
+				i = {
+					width: 0,
+					height: 0
+				}
+			}
+			b = i.width;
+			e = i.height;
+			if (c) i.width = Y(e * da(d)) + Y(b * Z(d)),
+			i.height = Y(e * Z(d)) + Y(b * da(d));
+			return i
+		},
+		show: function() {
+			return this.attr({
+				visibility: Ua
+			})
+		},
+		hide: function() {
+			return this.attr({
+				visibility: Ra
+			})
+		},
+		add: function(a) {
+			var l = this.renderer,
+			e = a || l,
+			c = e.element || l.box,
+			d = c.childNodes,
+			f = this.element,
+			j = g(f, "zIndex"),
+			h = this.textStr,
+			p;
+			this.parentInverted = a && a.inverted;
+			if (j) e.handleZ = true,
+			j = b(j);
+			if (e.handleZ) for (p = 0; p < d.length; p++) if (a = d[p], e = g(a, "zIndex"), a != f && (b(e) > j || ! n(j) && n(e))) return c.insertBefore(f, a),
+			this;
+			if (h !== void 0) l.buildText(this),
+			this.added = true;
+			c.appendChild(f);
+			return this
+		},
+		destroy: function() {
+			var a = this.element || {},
+			b = this.shadows,
+			e = a.parentNode,
+			c;
+			a.onclick = a.onmouseout = a.onmouseover = a.onmousemove = null;
+			Eb(this);
+			e && e.removeChild(a);
+			b && y(b, function(a) { (e = a.parentNode) && e.removeChild(a)
+			});
+			h(this.renderer.alignedObjects, this);
+			for (c in this) delete this[c];
+			return null
+		},
+		empty: function() {
+			for (var a = this.element, b = a.childNodes, e = b.length; e--;) a.removeChild(b[e])
+		},
+		shadow: function(a) {
+			var b = [],
+			e,
+			c = this.element,
+			d = this.parentInverted ? "(-1,-1)": "(1,1)";
+			if (a) {
+				for (a = 1; a <= 3; a++) e = c.cloneNode(0),
+				g(e, {
+					isShadow: "true",
+					stroke: "rgb(0, 0, 0)",
+					"stroke-opacity": 0.05 * a,
+					"stroke-width": 7 - 2 * a,
+					transform: "translate" + d,
+					fill: Na
+				}),
+				c.parentNode.insertBefore(e, c),
+				b.push(e);
+				this.shadows = b
+			}
+			return this
+		}
+	};
+	var Fb = function() {
+		this.init.apply(this, arguments)
+	};
+	Fb.prototype = {
+		init: function(a, b, e) {
+			var c = location,
+			d;
+			this.Element = M;
+			d = this.createElement("svg").attr({
+				xmlns: "http://www.w3.org/2000/svg",
+				version: "1.1"
+			});
+			a.appendChild(d.element);
+			this.box = d.element;
+			this.boxWrapper = d;
+			this.alignedObjects = [];
+			this.url = D ? "": c.href.replace(/#.*?$/, "");
+			this.defs = this.createElement("defs").add();
+			this.setSize(b, e, false)
+		},
+		createElement: function(a) {
+			var b = new this.Element;
+			b.init(this, a);
+			return b
+		},
+		buildText: function(a) {
+			for (var l = a.element, e = j(a.textStr, "").toString().replace(/<(b|strong)>/g, '<span style="font-weight:bold">').replace(/<(i|em)>/g, '<span style="font-style:italic">').replace(/<a/g, "<span").replace(/<\/(b|strong|i|em|a)>/g, "</span>").split(/<br[^>]?>/g), c = l.childNodes, d = /style="([^"]+)"/, f = /href="([^"]+)"/, h = g(l, "x"), n = (a = a.styles) && b(a.width), p = a && a.lineHeight, o, a = c.length; a--;) l.removeChild(c[a]);
+			n && this.box.appendChild(l);
+			y(e, function(a, i) {
+				var e, c = 0,
+				s, a = a.replace(/<span/g, "|||<span").replace(/<\/span>/g, "</span>|||");
+				e = a.split("|||");
+				y(e, function(a) {
+					if (a !== "" || e.length == 1) {
+						var j = {},
+						q = A.createElementNS("http://www.w3.org/2000/svg", "tspan");
+						d.test(a) && g(q, "style", a.match(d)[1].replace(/(;| |^)color([ :])/, "$1fill$2"));
+						f.test(a) && (g(q, "onclick", 'location.href="' + a.match(f)[1] + '"'), m(q, {
+							cursor: "pointer"
+						}));
+						a = a.replace(/<(.|\n)*?>/g, "") || " ";
+						q.appendChild(A.createTextNode(a));
+						c ? j.dx = 3: j.x = h;
+						c || (i && (s = b(window.getComputedStyle(o, null).getPropertyValue("line-height")), isNaN(s) && (s = p || o.offsetHeight || 18), g(q, "dy", s)), o = q);
+						g(q, j);
+						l.appendChild(q);
+						c++;
+						if (n) for (var a = a.replace(/-/g, "- ").split(" "), t, R = []; a.length || R.length;) t = l.getBBox().width,
+						j = t > n,
+						! j || a.length == 1 ? (a = R, R = [], q = A.createElementNS("http://www.w3.org/2000/svg", "tspan"), g(q, {
+							x: h,
+							dy: p || 16
+						}), l.appendChild(q), t > n && (n = t)) : (q.removeChild(q.firstChild), R.unshift(a.pop())),
+						q.appendChild(A.createTextNode(a.join(" ").replace(/- /g, "-")))
+					}
+				})
+			})
+		},
+		crispLine: function(a, b) {
+			a[1] == a[4] && (a[1] = a[4] = x(a[1]) + b % 2 / 2);
+			a[2] == a[5] && (a[2] = a[5] = x(a[2]) + b % 2 / 2);
+			return a
+		},
+		path: function(a) {
+			return this.createElement("path").attr({
+				d: a,
+				fill: Na
+			})
+		},
+		circle: function(a, b, e) {
+			a = d(a) ? a: {
+				x: a,
+				y: b,
+				r: e
+			};
+			return this.createElement("circle").attr(a)
+		},
+		arc: function(a, b, e, c, g, j) {
+			if (d(a)) b = a.y,
+			e = a.r,
+			c = a.innerR,
+			g = a.start,
+			j = a.end,
+			a = a.x;
+			return this.symbol("arc", a || 0, b || 0, e || 0, {
+				innerR: c || 0,
+				start: g || 0,
+				end: j || 0
+			})
+		},
+		rect: function(i, b, e, c, g, j) {
+			if (arguments.length > 1) var f = (j || 0) % 2 / 2,
+			i = x(i || 0) + f,
+			b = x(b || 0) + f,
+			e = x((e || 0) - 2 * f),
+			c = x((c || 0) - 2 * f);
+			f = d(i) ? i: {
+				x: i,
+				y: b,
+				width: G(e, 0),
+				height: G(c, 0)
+			};
+			return this.createElement("rect").attr(a(f, {
+				rx: g || f.r,
+				ry: g || f.r,
+				fill: Na
+			}))
+		},
+		setSize: function(a, b, e) {
+			var c = this.alignedObjects,
+			d = c.length;
+			this.width = a;
+			this.height = b;
+			for (this.boxWrapper[j(e, true) ? "animate": "attr"]({
+				width: a,
+				height: b
+			}); d--;) c[d].align()
+		},
+		g: function(a) {
+			return this.createElement("g").attr(n(a) && {
+				"class": db + a
+			})
+		},
+		image: function(i, b, e, c, d) {
+			var g = {
+				preserveAspectRatio: Na
+			};
+			arguments.length > 1 && a(g, {
+				x: b,
+				y: e,
+				width: c,
+				height: d
+			});
+			g = this.createElement("image").attr(g);
+			g.element.setAttributeNS("http://www.w3.org/1999/xlink", "href", i);
+			return g
+		},
+		symbol: function(i, b, e, c, d) {
+			var g, f = this.symbols[i],
+			f = f && f(b, e, c, d),
+			j = /^url\((.*?)\)$/;
+			f ? (g = this.path(f), a(g, {
+				symbolName: i,
+				x: b,
+				y: e,
+				r: c
+			}), d && a(g, d)) : j.test(i) ? (i = i.match(j)[1], g = this.image(i).attr({
+				x: b,
+				y: e
+			}), t("img", {
+				onload: function() {
+					var a = Ja[this.src] || [this.width, this.height];
+					g.attr({
+						width: a[0],
+						height: a[1]
+					}).translate( - x(a[0] / 2), - x(a[1] / 2))
+				},
+				src: i
+			})) : g = this.circle(b, e, c);
+			return g
+		},
+		symbols: {
+			square: function(a, b, e) {
+				e *= 0.707;
+				return [Ca, a - e, b - e, ma, a + e, b - e, a + e, b + e, a - e, b + e, "Z"]
+			},
+			triangle: function(a, b, e) {
+				return [Ca, a, b - 1.33 * e, ma, a + e, b + 0.67 * e, a - e, b + 0.67 * e, "Z"]
+			},
+			"triangle-down": function(a, b, e) {
+				return [Ca, a, b + 1.33 * e, ma, a - e, b - 0.67 * e, a + e, b - 0.67 * e, "Z"]
+			},
+			diamond: function(a, b, e) {
+				return [Ca, a, b - e, ma, a + e, b, a, b + e, a - e, b, "Z"]
+			},
+			arc: function(a, b, e, c) {
+				var d = c.start,
+				g = c.end - 1.0E-6,
+				f = c.innerR,
+				j = Z(d),
+				h = da(d),
+				n = Z(g),
+				g = da(g),
+				c = c.end - d < P ? 0: 1;
+				return [Ca, a + e * j, b + e * h, "A", e, e, 0, c, 1, a + e * n, b + e * g, ma, a + f * n, b + f * g, "A", f, f, 0, c, 0, a + f * j, b + f * h, "Z"]
+			}
+		},
+		clipRect: function(a, b, e, c) {
+			var d = db + Qa++,
+			g = this.createElement("clipPath").attr({
+				id: d
+			}).add(this.defs),
+			a = this.rect(a, b, e, c, 0).add(g);
+			a.id = d;
+			return a
+		},
+		color: function(a, b, e) {
+			var c, d = /^rgba/;
+			if (a && a.linearGradient) {
+				var f = this,
+				b = a.linearGradient,
+				e = db + Qa++,
+				j, h, n;
+				j = f.createElement("linearGradient").attr({
+					id: e,
+					gradientUnits: "userSpaceOnUse",
+					x1: b[0],
+					y1: b[1],
+					x2: b[2],
+					y2: b[3]
+				}).add(f.defs);
+				y(a.stops, function(a) {
+					d.test(a[1]) ? (c = La(a[1]), h = c.get("rgb"), n = c.get("a")) : (h = a[1], n = 1);
+					f.createElement("stop").attr({
+						offset: a[0],
+						"stop-color": h,
+						"stop-opacity": n
+					}).add(j)
+				});
+				return "url(" + this.url + "#" + e + ")"
+			} else return d.test(a) ? (c = La(a), g(b, e + "-opacity", c.get("a")), c.get("rgb")) : a
+		},
+		text: function(a, b, e) {
+			var c = za.chart.style,
+			b = x(j(b, 0)),
+			e = x(j(e, 0)),
+			a = this.createElement("text").attr({
+				x: b,
+				y: e,
+				text: a
+			}).css({
+				"font-family": c.fontFamily,
+				"font-size": c.fontSize
+			});
+			a.x = b;
+			a.y = e;
+			return a
+		}
+	};
+	var W;
+	if (!ca) {
+		var sc = F(M, {
+			init: function(a, b) {
+				var e = ["<", b, ' filled="f" stroked="f"'],
+				c = ["position: ", lb, ";"];
+				(b == "shape" || b == $a) && c.push("left:0;top:0;width:10px;height:10px;");
+				I && c.push("visibility: ", b == $a ? Ra: Ua);
+				e.push(' style="', c.join(""), '"/>');
+				if (b) e = b == $a || b == "span" || b == "img" ? e.join("") : a.prepVML(e),
+				this.element = t(e);
+				this.renderer = a
+			},
+			add: function(a) {
+				var b = this.renderer,
+				e = this.element,
+				c = b.box,
+				c = a ? a.element || a: c;
+				a && a.inverted && b.invertChild(e, c);
+				I && c.gVis == Ra && m(e, {
+					visibility: Ra
+				});
+				c.appendChild(e);
+				this.added = true;
+				this.alignOnAdd && this.updateTransform();
+				return this
+			},
+			attr: function(a, b) {
+				var e, d, j, h = this.element || {},
+				p = h.style,
+				o = h.nodeName,
+				q = this.renderer,
+				z = this.symbolName,
+				R, D, w = this.shadows,
+				y = this;
+				c(a) && n(b) && (e = a, a = {},
+				a[e] = b);
+				if (c(a)) e = a,
+				y = e == "strokeWidth" || e == "stroke-width" ? this.strokeweight: this[e];
+				else for (e in a) {
+					d = a[e];
+					R = false;
+					if (z && /^(x|y|r|start|end|width|height|innerR)/.test(e)) D || (this.symbolAttr(a), D = true),
+					R = true;
+					else if (e == "d") {
+						d = d || [];
+						this.d = d.join(" ");
+						j = d.length;
+						for (R = []; j--;) R[j] = f(d[j]) ? x(d[j] * 10) - 5: d[j] == "Z" ? "x": d[j];
+						d = R.join(" ") || "x";
+						h.path = d;
+						if (w) for (j = w.length; j--;) w[j].path = d;
+						R = true
+					} else if (e == "zIndex" || e == "visibility") {
+						if (I && e == "visibility" && o == "DIV") {
+							h.gVis = d;
+							R = h.childNodes;
+							for (j = R.length; j--;) m(R[j], {
+								visibility: d
+							});
+							d == Ua && (d = null)
+						}
+						d && (p[e] = d);
+						R = true
+					} else if (/^(width|height)$/.test(e)) this.updateClipping ? (this[e] = d, this.updateClipping()) : p[e] = d,
+					R = true;
+					else if (/^(x|y)$/.test(e)) this[e] = d,
+					h.tagName == "SPAN" ? this.updateTransform() : p[{
+						x: "left",
+						y: "top"
+					} [e]] = d;
+					else if (e == "class") h.className = d;
+					else if (e == "stroke") d = q.color(d, h, e),
+					e = "strokecolor";
+					else if (e == "stroke-width" || e == "strokeWidth") h.stroked = d ? true: false,
+					e = "strokeweight",
+					this[e] = d,
+					f(d) && (d += Ea);
+					else if (e == "dashstyle")(h.getElementsByTagName("stroke")[0] || t(q.prepVML(["<stroke/>"]), null, null, h))[e] = d || "solid",
+					this.dashstyle = d,
+					R = true;
+					else if (e == "fill") o == "SPAN" ? p.color = d: (h.filled = d != Na ? true: false, d = q.color(d, h, e), e = "fillcolor");
+					else if (e == "translateX" || e == "translateY" || e == "rotation" || e == "align") e == "align" && (e = "textAlign"),
+					this[e] = d,
+					this.updateTransform(),
+					R = true;
+					else if (e == "text") h.innerHTML = d,
+					R = true;
+					if (w && e == "visibility") for (j = w.length; j--;) w[j].style[e] = d;
+					R || (I ? h[e] = d: g(h, e, d))
+				}
+				return y
+			},
+			clip: function(a) {
+				var b = this,
+				e = a.members;
+				e.push(b);
+				b.destroyClip = function() {
+					h(e, b)
+				};
+				return b.css(a.getCSS(b.inverted))
+			},
+			css: function(i) {
+				var b = this.element;
+				(b = i && i.width && b.tagName == "SPAN") && a(i, {
+					display: "block",
+					whiteSpace: "normal"
+				});
+				this.styles = a(this.styles, i);
+				m(this.element, i);
+				b && this.updateTransform();
+				return this
+			},
+			destroy: function() {
+				this.destroyClip && this.destroyClip();
+				M.prototype.destroy.apply(this)
+			},
+			empty: function() {
+				for (var a = this.element.childNodes, b = a.length, e; b--;) e = a[b],
+				e.parentNode.removeChild(e)
+			},
+			getBBox: function() {
+				var a = this.element;
+				if (a.nodeName == "text") a.style.position = lb;
+				return {
+					x: a.offsetLeft,
+					y: a.offsetTop,
+					width: a.offsetWidth,
+					height: a.offsetHeight
+				}
+			},
+			on: function(a, b) {
+				this.element["on" + a] = function() {
+					var a = v.event;
+					a.target = a.srcElement;
+					b(a)
+				};
+				return this
+			},
+			updateTransform: function() {
+				if (this.added) {
+					var a = this,
+					c = a.element,
+					e = a.translateX || 0,
+					d = a.translateY || 0,
+					g = a.x || 0,
+					j = a.y || 0,
+					f = a.textAlign || "left",
+					h = {
+						left: 0,
+						center: 0.5,
+						right: 1
+					} [f],
+					p = f && f != "left";
+					(e || d) && a.css({
+						marginLeft: e,
+						marginTop: d
+					});
+					a.inverted && y(c.childNodes, function(b) {
+						a.renderer.invertChild(b, c)
+					});
+					if (c.tagName == "SPAN") {
+						var o, q, e = a.rotation,
+						t;
+						o = 0;
+						var d = 1,
+						D = 0,
+						w, I = a.xCorr || 0,
+						v = a.yCorr || 0,
+						B = [e, f, c.innerHTML, c.style.width].join(",");
+						if (B != a.cTT) n(e) && (o = e * L, d = Z(o), D = da(o), m(c, {
+							filter: e ? ["progid:DXImageTransform.Microsoft.Matrix(M11=", d, ", M12=", - D, ", M21=", D, ", M22=", d, ", sizingMethod='auto expand')"].join("") : Na
+						})),
+						o = c.offsetWidth,
+						q = c.offsetHeight,
+						t = x(b(c.style.fontSize || 12) * 1.2),
+						I = d < 0 && - o,
+						v = D < 0 && - q,
+						w = d * D < 0,
+						I += D * t * (w ? 1 - h: h),
+						v -= d * t * (e ? w ? h: 1 - h: 1),
+						p && (I -= o * h * (d < 0 ? - 1: 1), e && (v -= q * h * (D < 0 ? - 1: 1)), m(c, {
+							textAlign: f
+						})),
+						a.xCorr = I,
+						a.yCorr = v;
+						m(c, {
+							left: g + I,
+							top: j + v
+						});
+						a.cTT = B
+					}
+				} else this.alignOnAdd = true
+			},
+			shadow: function(a) {
+				var c = [],
+				e = this.element,
+				d = this.renderer,
+				g,
+				j = e.style,
+				f,
+				h = e.path;
+				"" + e.path === "" && (h = "x");
+				if (a) {
+					for (a = 1; a <= 3; a++) f = ['<shape isShadow="true" strokeweight="', 7 - 2 * a, '" filled="false" path="', h, '" coordsize="100,100" style="', e.style.cssText, '" />'],
+					g = t(d.prepVML(f), null, {
+						left: b(j.left) + 1,
+						top: b(j.top) + 1
+					}),
+					f = ['<stroke color="black" opacity="', 0.05 * a, '"/>'],
+					t(d.prepVML(f), null, null, g),
+					e.parentNode.insertBefore(g, e),
+					c.push(g);
+					this.shadows = c
+				}
+				return this
+			}
+		});
+		W = function() {
+			this.init.apply(this, arguments)
+		};
+		W.prototype = ia(Fb.prototype, {
+			isIE8: U.indexOf("MSIE 8.0") > - 1,
+			init: function(a, b, e) {
+				var c;
+				this.Element = sc;
+				this.alignedObjects = [];
+				c = this.createElement($a);
+				a.appendChild(c.element);
+				this.box = c.element;
+				this.boxWrapper = c;
+				this.setSize(b, e, false);
+				if (!A.namespaces.hcv) A.namespaces.add("hcv", "urn:schemas-microsoft-com:vml"),
+				A.createStyleSheet().cssText = "hcv\\:fill, hcv\\:path, hcv\\:shape, hcv\\:stroke{ behavior:url(#default#VML); display: inline-block; } "
+			},
+			clipRect: function(b, c, e, d) {
+				var g = this.createElement();
+				return a(g, {
+					members: [],
+					left: b,
+					top: c,
+					width: e,
+					height: d,
+					getCSS: function(b) {
+						var e = this.top,
+						i = this.left,
+						c = i + this.width,
+						l = e + this.height,
+						e = {
+							clip: "rect(" + x(b ? i: e) + "px," + x(b ? l: c) + "px," + x(b ? c: l) + "px," + x(b ? e: i) + "px)"
+						}; ! b && I && a(e, {
+							width: c + Ea,
+							height: l + Ea
+						});
+						return e
+					},
+					updateClipping: function() {
+						y(g.members, function(a) {
+							a.css(g.getCSS(a.inverted))
+						})
+					}
+				})
+			},
+			color: function(a, b, e) {
+				var c, d = /^rgba/;
+				if (a && a.linearGradient) {
+					var g, j, f = a.linearGradient,
+					h, n, p, o;
+					y(a.stops, function(a, b) {
+						d.test(a[1]) ? (c = La(a[1]), g = c.get("rgb"), j = c.get("a")) : (g = a[1], j = 1);
+						b ? (p = g, o = j) : (h = g, n = j)
+					});
+					a = 90 - N.atan((f[3] - f[1]) / (f[2] - f[0])) * 180 / P;
+					e = ["<", e, ' colors="0% ', h, ",100% ", p, '" angle="', a, '" opacity="', o, '" o:opacity2="', n, '" type="gradient" focus="100%" />'];
+					t(this.prepVML(e), null, null, b)
+				} else return d.test(a) && b.tagName != "IMG" ? (c = La(a), e = ["<", e, ' opacity="', c.get("a"), '"/>'], t(this.prepVML(e), null, null, b), c.get("rgb")) : a
+			},
+			prepVML: function(a) {
+				var b = this.isIE8,
+				a = a.join("");
+				b ? (a = a.replace("/>", ' xmlns="urn:schemas-microsoft-com:vml" />'), a = a.indexOf('style="') == - 1 ? a.replace("/>", ' style="display:inline-block;behavior:url(#default#VML);" />') : a.replace('style="', 'style="display:inline-block;behavior:url(#default#VML);')) : a = a.replace("<", "<hcv:");
+				return a
+			},
+			text: function(a, b, e) {
+				var c = za.chart.style;
+				return this.createElement("span").attr({
+					text: a,
+					x: x(b),
+					y: x(e)
+				}).css({
+					whiteSpace: "nowrap",
+					fontFamily: c.fontFamily,
+					fontSize: c.fontSize
+				})
+			},
+			path: function(a) {
+				return this.createElement("shape").attr({
+					coordsize: "100 100",
+					d: a
+				})
+			},
+			circle: function(a, b, e) {
+				return this.path(this.symbols.circle(a, b, e))
+			},
+			g: function(a) {
+				var b;
+				a && (b = {
+					className: db + a,
+					"class": db + a
+				});
+				return this.createElement($a).attr(b)
+			},
+			image: function(a, b, e, c, d) {
+				var g = this.createElement("img").attr({
+					src: a
+				});
+				arguments.length > 1 && g.css({
+					left: b,
+					top: e,
+					width: c,
+					height: d
+				});
+				return g
+			},
+			rect: function(a, b, e, c, g, j) {
+				if (arguments.length > 1) var f = (j || 0) % 2 / 2,
+				a = x(a || 0) + f,
+				b = x(b || 0) + f,
+				e = x((e || 0) - 2 * f),
+				c = x((c || 0) - 2 * f);
+				if (d(a)) b = a.y,
+				e = a.width,
+				c = a.height,
+				g = a.r,
+				a = a.x;
+				return this.symbol("rect", a || 0, b || 0, g || 0, {
+					width: e || 0,
+					height: c || 0
+				})
+			},
+			invertChild: function(a, c) {
+				var e = c.style;
+				m(a, {
+					flip: "x",
+					left: b(e.width) - 10,
+					top: b(e.height) - 10,
+					rotation: - 90
+				})
+			},
+			symbols: {
+				arc: function(a, b, e, c) {
+					var d = c.start,
+					g = c.end,
+					f = Z(d),
+					j = da(d),
+					h = Z(g),
+					n = da(g),
+					c = c.innerR;
+					if (g - d === 0) return ["x"];
+					else g - d == 2 * P && (h = - 0.07 / e);
+					return ["wa", a - e, b - e, a + e, b + e, a + e * f, b + e * j, a + e * h, b + e * n, "at", a - c, b - c, a + c, b + c, a + c * h, b + c * n, a + c * f, b + c * j, "x", "e"]
+				},
+				circle: function(a, b, e) {
+					return ["wa", a - e, b - e, a + e, b + e, a + e, b, a + e, b, "e"]
+				},
+				rect: function(a, b, e, c) {
+					var d = c.width,
+					c = c.height,
+					g = a + d,
+					f = b + c,
+					e = Da(e, d, c);
+					return [Ca, a + e, b, ma, g - e, b, "wa", g - 2 * e, b, g, b + 2 * e, g - e, b, g, b + e, ma, g, f - e, "wa", g - 2 * e, f - 2 * e, g, f, g, f - e, g - e, f, ma, a + e, f, "wa", a, f - 2 * e, a + 2 * e, f, a + e, f, a, f - e, ma, a, b + e, "wa", a, b, a + 2 * e, b + 2 * e, a, b + e, a + e, b, "x", "e"]
+				}
+			}
+		})
+	}
+	var lc = ca ? Fb: W;
+	Q.prototype.callbacks = [];
+	var Ta = function() {};
+	Ta.prototype = {
+		init: function(a, b) {
+			var e;
+			this.series = a;
+			this.applyOptions(b);
+			this.pointAttr = {};
+			if (a.options.colorByPoint) {
+				e = a.chart.options.colors;
+				if (!this.options) this.options = {};
+				this.color = this.options.color = this.color || e[Ia++];
+				Ia >= e.length && (Ia = 0)
+			}
+			a.chart.pointCount++;
+			return this
+		},
+		applyOptions: function(b) {
+			var l = this.series;
+			this.config = b;
+			if (f(b) || b === null) this.y = b;
+			else if (d(b) && ! f(b.length)) a(this, b),
+			this.options = b;
+			else if (c(b[0])) this.name = b[0],
+			this.y = b[1];
+			else if (f(b[0])) this.x = b[0],
+			this.y = b[1];
+			if (this.x === ya) this.x = l.autoIncrement()
+		},
+		destroy: function() {
+			var a = this,
+			b = a.series,
+			e;
+			b.chart.pointCount--;
+			a == b.chart.hoverPoint && a.onMouseOut();
+			b.chart.hoverPoints = null;
+			Va(a);
+			y(["graphic", "tracker", "group", "dataLabel", "connector"], function(b) {
+				a[b] && a[b].destroy()
+			});
+			a.legendItem && a.series.chart.legend.destroyItem(a);
+			for (e in a) a[e] = null
+		},
+		select: function(a, b) {
+			var e = this,
+			c = e.series.chart;
+			e.selected = a = j(a, ! e.selected);
+			e.firePointEvent(a ? "select": "unselect");
+			e.setState(a && "select");
+			b || y(c.getSelectedPoints(), function(a) {
+				if (a.selected && a != e) a.selected = false,
+				a.setState(xa),
+				a.firePointEvent("unselect")
+			})
+		},
+		onMouseOver: function() {
+			var a = this.series.chart,
+			b = a.tooltip,
+			e = a.hoverPoint;
+			e && e != this && e.onMouseOut();
+			this.firePointEvent("mouseOver");
+			b && ! b.shared && b.refresh(this);
+			this.setState(Sa);
+			a.hoverPoint = this
+		},
+		onMouseOut: function() {
+			this.firePointEvent("mouseOut");
+			this.setState();
+			this.series.chart.hoverPoint = null
+		},
+		tooltipFormatter: function(a) {
+			var b = this.series;
+			return ['<span style="color:' + b.color + '">', this.name || b.name, "</span>: ", ! a ? "<b>x = " + (this.name || this.x) + ",</b> ": "", "<b>", ! a ? "y = ": "", this.y, "</b><br/>"].join("")
+		},
+		update: function(a, b, e) {
+			var c = this,
+			d = c.series,
+			g = d.chart;
+			q(e, g);
+			b = j(b, true);
+			c.firePointEvent("update", {
+				options: a
+			},
+			function() {
+				c.applyOptions(a);
+				d.isDirty = true;
+				b && g.redraw()
+			})
+		},
+		remove: function(a, b) {
+			var e = this,
+			c = e.series,
+			d = c.chart,
+			g = c.data;
+			q(b, d);
+			a = j(a, true);
+			e.firePointEvent("remove", null, function() {
+				h(g, e);
+				e.destroy();
+				c.isDirty = true;
+				a && d.redraw()
+			})
+		},
+		firePointEvent: function(a, b, e) {
+			var c = this,
+			d = this.series.options;
+			(d.point.events[a] || c.options && c.options.events && c.options.events[a]) && this.importEvents();
+			a == "click" && d.allowPointSelect && (e = function(a) {
+				c.select(null, a.ctrlKey || a.metaKey || a.shiftKey)
+			});
+			ta(this, a, b, e)
+		},
+		importEvents: function() {
+			if (!this.hasImportedEvents) {
+				var a = ia(this.series.options.point, this.options).events,
+				b;
+				this.events = a;
+				for (b in a) va(this, b, a[b]);
+				this.hasImportedEvents = true
+			}
+		},
+		setState: function(a) {
+			var b = this.series,
+			e = b.options.states,
+			c = ka[b.type].marker && b.options.marker,
+			d = c && ! c.enabled,
+			g = (c = c && c.states[a]) && c.enabled === false,
+			f = b.stateMarkerGraphic,
+			j = b.chart,
+			h = this.pointAttr;
+			a || (a = xa);
+			if (! (a == this.state || this.selected && a != "select" || e[a] && e[a].enabled === false || a && (g || d && ! c.enabled))) {
+				if (this.graphic) this.graphic.attr(h[a]);
+				else {
+					if (a) {
+						if (!f) b.stateMarkerGraphic = f = j.renderer.circle(0, 0, h[a].r).attr(h[a]).add(b.group);
+						f.translate(this.plotX, this.plotY)
+					}
+					if (f) f[a ? "show": "hide"]()
+				}
+				this.state = a
+			}
+		}
+	};
+	var pa = function() {};
+	pa.prototype = {
+		isCartesian: true,
+		type: "line",
+		pointClass: Ta,
+		pointAttrToOptions: {
+			stroke: "lineColor",
+			"stroke-width": "lineWidth",
+			fill: "fillColor",
+			r: "radius"
+		},
+		init: function(b, c) {
+			var e, d;
+			d = b.series.length;
+			this.chart = b;
+			c = this.setOptions(c);
+			a(this, {
+				index: d,
+				options: c,
+				name: c.name || "Series " + (d + 1),
+				state: xa,
+				pointAttr: {},
+				visible: c.visible !== false,
+				selected: c.selected === true
+			});
+			d = c.events;
+			for (e in d) va(this, e, d[e]);
+			if (d && d.click || c.point && c.point.events && c.point.events.click || c.allowPointSelect) b.runTrackerClick = true;
+			this.getColor();
+			this.getSymbol();
+			this.setData(c.data, false)
+		},
+		autoIncrement: function() {
+			var a = this.options,
+			b = this.xIncrement,
+			b = j(b, a.pointStart, 0);
+			this.pointInterval = j(this.pointInterval, a.pointInterval, 1);
+			this.xIncrement = b + this.pointInterval;
+			return b
+		},
+		cleanData: function() {
+			var a = this.chart,
+			b = this.data,
+			c, d, g = a.smallestInterval,
+			f, j;
+			b.sort(function(a, b) {
+				return a.x - b.x
+			});
+			for (j = b.length - 1; j >= 0; j--) b[j - 1] && b[j - 1].x == b[j].x && b.splice(j - 1, 1);
+			for (j = b.length - 1; j >= 0; j--) if (b[j - 1] && (f = b[j].x - b[j - 1].x, d === ya || f < d)) d = f,
+			c = j;
+			if (g === ya || d < g) a.smallestInterval = d;
+			this.closestPoints = c
+		},
+		getSegments: function() {
+			var a = - 1,
+			b = [],
+			c = this.data;
+			y(c, function(d, g) {
+				d.y === null ? (g > a + 1 && b.push(c.slice(a + 1, g)), a = g) : g == c.length - 1 && b.push(c.slice(a + 1, g + 1))
+			});
+			this.segments = b
+		},
+		setOptions: function(a) {
+			var b = this.chart.options.plotOptions;
+			return ia(b[this.type], b.series, a)
+		},
+		getColor: function() {
+			var a = this.chart.options.colors;
+			this.color = this.options.color || a[Ia++] || "#0000ff";
+			Ia >= a.length && (Ia = 0)
+		},
+		getSymbol: function() {
+			var a = this.chart.options.symbols;
+			this.symbol = this.options.marker.symbol || a[Ya++];
+			Ya >= a.length && (Ya = 0)
+		},
+		addPoint: function(a, b, c, d) {
+			var g = this.data,
+			f = this.graph,
+			h = this.area,
+			n = this.chart,
+			a = (new this.pointClass).init(this, a);
+			q(d, n);
+			if (f && c) f.shift = c;
+			if (h) h.shift = c,
+			h.isArea = true;
+			b = j(b, true);
+			g.push(a);
+			c && g[0].remove(false);
+			this.isDirty = true;
+			b && n.redraw()
+		},
+		setData: function(a, b) {
+			var c = this,
+			d = c.data,
+			g = c.initialColor,
+			f = c.chart,
+			h = d && d.length || 0;
+			c.xIncrement = null;
+			n(g) && (Ia = g);
+			for (a = kb(p(a || []), function(a) {
+				return (new c.pointClass).init(c, a)
+			}); h--;) d[h].destroy();
+			c.data = a;
+			c.cleanData();
+			c.getSegments();
+			c.isDirty = true;
+			f.isDirtyBox = true;
+			j(b, true) && f.redraw(false)
+		},
+		remove: function(a, b) {
+			var c = this,
+			d = c.chart,
+			a = j(a, true);
+			if (!c.isRemoving) c.isRemoving = true,
+			ta(c, "remove", null, function() {
+				c.destroy();
+				d.isDirtyLegend = d.isDirtyBox = true;
+				a && d.redraw(b)
+			});
+			c.isRemoving = false
+		},
+		translate: function() {
+			for (var a = this.chart, b = this.options.stacking, c = this.xAxis.categories, d = this.yAxis, g = this.data, f = g.length; f--;) {
+				var j = g[f],
+				h = j.x,
+				p = j.y,
+				o = j.low,
+				m = d.stacks[(p < 0 ? "-": "") + this.stackKey];
+				j.plotX = this.xAxis.translate(h);
+				if (b && this.visible && m[h]) o = m[h],
+				h = o.total,
+				o.cum = o = o.cum - p,
+				p = o + p,
+				b == "percent" && (o = h ? o * 100 / h: 0, p = h ? p * 100 / h: 0),
+				j.percentage = h ? j.y * 100 / h: 0,
+				j.stackTotal = h;
+				if (n(o)) j.yBottom = d.translate(o, 0, 1);
+				if (p !== null) j.plotY = d.translate(p, 0, 1);
+				j.clientX = a.inverted ? a.plotHeight - j.plotX: j.plotX;
+				j.category = c && c[j.x] !== ya ? c[j.x] : j.x
+			}
+		},
+		setTooltipPoints: function(a) {
+			var b = this.chart,
+			c = b.inverted,
+			d = [],
+			g = x((c ? b.plotTop: b.plotLeft) + b.plotSizeX),
+			j,
+			f,
+			h = [];
+			if (a) this.tooltipPoints = null;
+			y(this.segments, function(a) {
+				d = d.concat(a)
+			});
+			this.xAxis && this.xAxis.reversed && (d = d.reverse());
+			y(d, function(a, b) {
+				j = d[b - 1] ? d[b - 1].high + 1: 0;
+				for (f = a.high = d[b + 1] ? ha((a.plotX + (d[b + 1] ? d[b + 1].plotX: g)) / 2) : g; j <= f;) h[c ? g - j++ : j++] = a
+			});
+			this.tooltipPoints = h
+		},
+		onMouseOver: function() {
+			var a = this.chart,
+			b = a.hoverSeries;
+			if (Ha || ! a.mouseIsDown) b && b != this && b.onMouseOut(),
+			this.options.events.mouseOver && ta(this, "mouseOver"),
+			this.tracker && this.tracker.toFront(),
+			this.setState(Sa),
+			a.hoverSeries = this
+		},
+		onMouseOut: function() {
+			var a = this.options,
+			b = this.chart,
+			c = b.tooltip,
+			d = b.hoverPoint;
+			d && d.onMouseOut();
+			this && a.events.mouseOut && ta(this, "mouseOut");
+			c && ! a.stickyTracking && c.hide();
+			this.setState();
+			b.hoverSeries = null
+		},
+		animate: function(a) {
+			var b = this.chart,
+			c = this.clipRect,
+			g = this.options.animation;
+			g && ! d(g) && (g = {});
+			if (a) {
+				if (!c.isAnimating) c.attr("width", 0),
+				c.isAnimating = true
+			} else c.animate({
+				width: b.plotSizeX
+			},
+			g),
+			this.animate = null
+		},
+		drawPoints: function() {
+			var a, b = this.data,
+			c = this.chart,
+			d, g, f, h, n, p;
+			if (this.options.marker.enabled) for (f = b.length; f--;) if (h = b[f], d = h.plotX, g = h.plotY, p = h.graphic, g !== ya && ! isNaN(g)) a = h.pointAttr[h.selected ? "select": xa],
+			n = a.r,
+			p ? p.animate({
+				x: d,
+				y: g,
+				r: n
+			}) : h.graphic = c.renderer.symbol(j(h.marker && h.marker.symbol, this.symbol), d, g, n).attr(a).add(this.group)
+		},
+		convertAttribs: function(a, b, c, d) {
+			var g = this.pointAttrToOptions,
+			f, h, n = {},
+			a = a || {},
+			b = b || {},
+			c = c || {},
+			d = d || {};
+			for (f in g) h = g[f],
+			n[f] = j(a[h], b[f], c[f], d[f]);
+			return n
+		},
+		getAttribs: function() {
+			var a = this,
+			b = ka[a.type].marker ? a.options.marker: a.options,
+			c = b.states,
+			d = c[Sa],
+			g,
+			f = a.color,
+			j = {
+				stroke: f,
+				fill: f
+			},
+			h = a.data,
+			p = [],
+			o,
+			m = a.pointAttrToOptions;
+			a.options.marker ? (d.radius = d.radius || b.radius + 2, d.lineWidth = d.lineWidth || b.lineWidth + 1) : d.color = d.color || La(d.color || f).brighten(d.brightness).get();
+			p[xa] = a.convertAttribs(b, j);
+			y([Sa, "select"], function(b) {
+				p[b] = a.convertAttribs(c[b], p[xa])
+			});
+			a.pointAttr = p;
+			for (f = h.length; f--;) {
+				j = h[f];
+				if ((b = j.options && j.options.marker || j.options) && b.enabled === false) b.radius = 0;
+				g = false;
+				if (j.options) for (var q in m) n(b[m[q]]) && (g = true);
+				if (g) {
+					o = [];
+					c = b.states || {};
+					g = c[Sa] = c[Sa] || {};
+					if (!a.options.marker) g.color = La(g.color || j.options.color).brighten(g.brightness || d.brightness).get();
+					o[xa] = a.convertAttribs(b, p[xa]);
+					o[Sa] = a.convertAttribs(c[Sa], p[Sa], o[xa]);
+					o.select = a.convertAttribs(c.select, p.select, o[xa])
+				} else o = p;
+				j.pointAttr = o
+			}
+		},
+		destroy: function() {
+			var a = this,
+			b = a.chart,
+			c = /\/5[0-9\.]+ Safari\//.test(U),
+			d,
+			g;
+			Va(a);
+			a.legendItem && a.chart.legend.destroyItem(a);
+			y(a.data, function(a) {
+				a.destroy()
+			});
+			y(["area", "graph", "dataLabelsGroup", "group", "tracker"], function(b) {
+				a[b] && (d = c && b == "group" ? "hide": "destroy", a[b][d]())
+			});
+			if (b.hoverSeries == a) b.hoverSeries = null;
+			h(b.series, a);
+			for (g in a) delete a[g]
+		},
+		drawDataLabels: function() {
+			if (this.options.dataLabels.enabled) {
+				var a = this,
+				b, c, d = a.data,
+				g = a.options.dataLabels,
+				f, h = a.dataLabelsGroup,
+				n = a.chart,
+				p = n.inverted,
+				o = a.type,
+				m;
+				if (!h) h = a.dataLabelsGroup = n.renderer.g(db + "data-labels").attr({
+					visibility: a.visible ? Ua: Ra,
+					zIndex: 5
+				}).translate(n.plotLeft, n.plotTop).add();
+				m = g.color;
+				m == "auto" && (m = null);
+				g.style.color = j(m, a.color);
+				y(d, function(d) {
+					var m = d.barX,
+					m = m && m + d.barW / 2 || d.plotX || - 999,
+					s = j(d.plotY, - 999),
+					q = d.dataLabel,
+					t = g.align;
+					f = g.formatter.call({
+						x: d.x,
+						y: d.y,
+						series: a,
+						point: d,
+						percentage: d.percentage,
+						total: d.total || d.stackTotal
+					});
+					b = (p ? n.plotWidth - s: m) + g.x;
+					c = (p ? n.plotHeight - m: s) + g.y;
+					o == "column" && (b += {
+						left: - 1,
+						right: 1
+					} [t] * d.barW / 2 || 0);
+					if (q) q.animate({
+						x: b,
+						y: c
+					});
+					else if (f) q = d.dataLabel = n.renderer.text(f, b, c).attr({
+						align: t,
+						rotation: g.rotation,
+						zIndex: 1
+					}).css(g.style).add(h);
+					p && ! g.y && q.attr({
+						y: c + parseInt(q.styles.lineHeight) * 0.9 - q.getBBox().height / 2
+					})
+				})
+			}
+		},
+		drawGraph: function() {
+			var a = this,
+			b = a.options,
+			c = a.graph,
+			d = [],
+			g,
+			f = a.area,
+			h = a.group,
+			n = b.lineColor || a.color,
+			p = b.lineWidth,
+			o = b.dashStyle,
+			m,
+			q = a.chart.renderer,
+			t = a.yAxis.getThreshold(b.threshold || 0),
+			D = /^area/.test(a.type),
+			w = [],
+			I = [];
+			y(a.segments, function(c) {
+				m = [];
+				y(c, function(e, d) {
+					a.getPointSpline ? m.push.apply(m, a.getPointSpline(c, e, d)) : (m.push(d ? ma: Ca), d && b.step && m.push(e.plotX, c[d - 1].plotY), m.push(e.plotX, e.plotY))
+				});
+				c.length > 1 ? d = d.concat(m) : w.push(c[0]);
+				if (D) {
+					var e = [],
+					g,
+					f = m.length;
+					for (g = 0; g < f; g++) e.push(m[g]);
+					f == 3 && e.push(ma, m[1], m[2]);
+					if (b.stacking && a.type != "areaspline") for (g = c.length - 1; g >= 0; g--) e.push(c[g].plotX, c[g].yBottom);
+					else e.push(ma, c[c.length - 1].plotX, t, ma, c[0].plotX, t);
+					I = I.concat(e)
+				}
+			});
+			a.graphPath = d;
+			a.singlePoints = w;
+			if (D) g = j(b.fillColor, La(a.color).setOpacity(b.fillOpacity || 0.75).get()),
+			f ? f.animate({
+				d: I
+			}) : a.area = a.chart.renderer.path(I).attr({
+				fill: g
+			}).add(h);
+			if (c) c.animate({
+				d: d
+			});
+			else if (p) {
+				c = {
+					stroke: n,
+					"stroke-width": p
+				};
+				if (o) c.dashstyle = o;
+				a.graph = q.path(d).attr(c).add(h).shadow(b.shadow)
+			}
+		},
+		render: function() {
+			var a = this,
+			b = a.chart,
+			c, d, g = a.options,
+			f = g.animation,
+			j = f && a.animate,
+			f = j ? f && f.duration || 500: 0,
+			h = a.clipRect;
+			d = b.renderer;
+			if (!h && (h = a.clipRect = ! b.hasRendered && b.clipRect ? b.clipRect: d.clipRect(0, 0, b.plotSizeX, b.plotSizeY), ! b.clipRect)) b.clipRect = h;
+			if (!a.group) c = a.group = d.g("series"),
+			b.inverted && (d = function() {
+				c.attr({
+					width: b.plotWidth,
+					height: b.plotHeight
+				}).invert()
+			},
+			d(), va(b, "resize", d)),
+			c.clip(a.clipRect).attr({
+				visibility: a.visible ? Ua: Ra,
+				zIndex: g.zIndex
+			}).translate(b.plotLeft, b.plotTop).add(b.seriesGroup);
+			a.drawDataLabels();
+			j && a.animate(true);
+			a.getAttribs();
+			a.drawGraph && a.drawGraph();
+			a.drawPoints();
+			a.options.enableMouseTracking !== false && a.drawTracker();
+			j && a.animate();
+			setTimeout(function() {
+				h.isAnimating = false;
+				if ((c = a.group) && h != b.clipRect && h.renderer) c.clip(a.clipRect = b.clipRect),
+				h.destroy()
+			},
+			f);
+			a.isDirty = false
+		},
+		redraw: function() {
+			var a = this.chart,
+			b = this.group;
+			b && (a.inverted && b.attr({
+				width: a.plotWidth,
+				height: a.plotHeight
+			}), b.animate({
+				translateX: a.plotLeft,
+				translateY: a.plotTop
+			}));
+			this.translate();
+			this.setTooltipPoints(true);
+			this.render()
+		},
+		setState: function(a) {
+			var b = this.options,
+			c = this.graph,
+			d = b.states,
+			b = b.lineWidth,
+			a = a || xa;
+			if (this.state != a) this.state = a,
+			d[a] && d[a].enabled === false || (a && (b = d[a].lineWidth || b + 1), c && ! c.dashstyle && c.attr({
+				"stroke-width": b
+			},
+			a ? 0: 500))
+		},
+		setVisible: function(a, b) {
+			var c = this.chart,
+			d = this.legendItem,
+			g = this.group,
+			f = this.tracker,
+			j = this.dataLabelsGroup,
+			h, n = this.data,
+			p = c.options.chart.ignoreHiddenSeries;
+			h = this.visible;
+			h = (this.visible = a = a === ya ? ! h: a) ? "show": "hide";
+			g && g[h]();
+			if (f) f[h]();
+			else for (g = n.length; g--;) f = n[g],
+			f.tracker && f.tracker[h]();
+			j && j[h]();
+			d && c.legend.colorizeItem(this, a);
+			this.isDirty = true;
+			this.options.stacking && y(c.series, function(a) {
+				if (a.options.stacking && a.visible) a.isDirty = true
+			});
+			if (p) c.isDirtyBox = true;
+			b !== false && c.redraw();
+			ta(this, h)
+		},
+		show: function() {
+			this.setVisible(true)
+		},
+		hide: function() {
+			this.setVisible(false)
+		},
+		select: function(a) {
+			this.selected = a = a === ya ? ! this.selected: a;
+			if (this.checkbox) this.checkbox.checked = a;
+			ta(this, a ? "select": "unselect")
+		},
+		drawTracker: function() {
+			var a = this,
+			b = a.options,
+			c = [].concat(a.graphPath),
+			d = c.length,
+			g = a.chart,
+			f = g.options.tooltip.snap,
+			j = a.tracker,
+			h = b.cursor,
+			h = h && {
+				cursor: h
+			},
+			n = a.singlePoints,
+			p;
+			if (d) for (p = d + 1; p--;) c[p] == Ca && c.splice(p + 1, 0, c[p + 1] - f, c[p + 2], ma),
+			(p && c[p] == Ca || p == d) && c.splice(p, 0, ma, c[p - 2] + f, c[p - 1]);
+			for (p = 0; p < n.length; p++) d = n[p],
+			c.push(Ca, d.plotX - f, d.plotY, ma, d.plotX + f, d.plotY);
+			j ? j.attr({
+				d: c
+			}) : a.tracker = g.renderer.path(c).attr({
+				isTracker: true,
+				stroke: tb,
+				fill: Na,
+				"stroke-width": b.lineWidth + 2 * f,
+				visibility: a.visible ? Ua: Ra,
+				zIndex: 1
+			}).on(Ha ? "touchstart": "mouseover", function() {
+				g.hoverSeries != a && a.onMouseOver()
+			}).on("mouseout", function() {
+				b.stickyTracking || a.onMouseOut()
+			}).css(h).add(g.trackerGroup)
+		}
+	};
+	W = F(pa);
+	Pa.line = W;
+	W = F(pa, {
+		type: "area"
+	});
+	Pa.area = W;
+	W = F(pa, {
+		type: "spline",
+		getPointSpline: function(a, b, c) {
+			var d = b.plotX,
+			g = b.plotY,
+			f = a[c - 1],
+			j = a[c + 1],
+			h,
+			p,
+			n,
+			o;
+			if (c && c < a.length - 1) {
+				a = f.plotY;
+				n = j.plotX;
+				var j = j.plotY,
+				m;
+				h = (1.5 * d + f.plotX) / 2.5;
+				p = (1.5 * g + a) / 2.5;
+				n = (1.5 * d + n) / 2.5;
+				o = (1.5 * g + j) / 2.5;
+				m = (o - p) * (n - d) / (n - h) + g - o;
+				p += m;
+				o += m;
+				p > a && p > g ? (p = G(a, g), o = 2 * g - p) : p < a && p < g && (p = Da(a, g), o = 2 * g - p);
+				o > j && o > g ? (o = G(j, g), p = 2 * g - o) : o < j && o < g && (o = Da(j, g), p = 2 * g - o);
+				b.rightContX = n;
+				b.rightContY = o
+			}
+			c ? (b = ["C", f.rightContX || f.plotX, f.rightContY || f.plotY, h || d, p || g, d, g], f.rightContX = f.rightContY = null) : b = [Ca, d, g];
+			return b
+		}
+	});
+	Pa.spline = W;
+	W = F(W, {
+		type: "areaspline"
+	});
+	Pa.areaspline = W;
+	var Za = F(pa, {
+		type: "column",
+		pointAttrToOptions: {
+			stroke: "borderColor",
+			"stroke-width": "borderWidth",
+			fill: "color",
+			r: "borderRadius"
+		},
+		init: function() {
+			pa.prototype.init.apply(this, arguments);
+			var a = this,
+			b = a.chart;
+			b.hasColumn = true;
+			b.hasRendered && y(b.series, function(b) {
+				if (b.type == a.type) b.isDirty = true
+			})
+		},
+		translate: function() {
+			var b = this,
+			c = b.chart,
+			d = 0,
+			g = b.xAxis.reversed,
+			f = b.xAxis.categories,
+			h = {},
+			p, o;
+			pa.prototype.translate.apply(b);
+			y(c.series, function(a) {
+				if (a.type == b.type) a.options.stacking ? (p = a.stackKey, h[p] === ya && (h[p] = d++), o = h[p]) : o = d++,
+				a.columnIndex = o
+			});
+			var m = b.options,
+			q = b.data,
+			t = b.closestPoints,
+			c = Y(q[1] ? q[t].plotX - q[t - 1].plotX: c.plotSizeX / (f ? f.length: 1)),
+			f = c * m.groupPadding,
+			t = (c - 2 * f) / d,
+			D = m.pointWidth,
+			I = n(D) ? (t - D) / 2: t * m.pointPadding,
+			w = j(D, t - 2 * I),
+			x = I + (f + ((g ? d - b.columnIndex: b.columnIndex) || 0) * t - c / 2) * (g ? - 1: 1),
+			v = b.yAxis.getThreshold(m.threshold || 0),
+			B = j(m.minPointLength, 5);
+			y(q, function(b) {
+				var c = b.plotY,
+				d = b.yBottom || v,
+				e = b.plotX + x,
+				g = gb(Da(c, d)),
+				f = gb(G(c, d) - g),
+				j;
+				Y(f) < B && (B && (f = B, g = Y(g - v) > B ? d - B: v - (c <= v ? B: 0)), j = g - 3);
+				a(b, {
+					barX: e,
+					barY: g,
+					barW: w,
+					barH: f
+				});
+				b.shapeType = "rect";
+				b.shapeArgs = {
+					x: e,
+					y: g,
+					width: w,
+					height: f,
+					r: m.borderRadius
+				};
+				b.trackerArgs = n(j) && ia(b.shapeArgs, {
+					height: G(6, f + 3),
+					y: j
+				})
+			})
+		},
+		getSymbol: function() {},
+		drawGraph: function() {},
+		drawPoints: function() {
+			var a = this,
+			b = a.options,
+			c = a.chart.renderer,
+			d, g;
+			y(a.data, function(f) {
+				var j = f.plotY;
+				if (j !== ya && ! isNaN(j)) d = f.graphic,
+				g = f.shapeArgs,
+				d ? (Eb(d), d.animate(g)) : f.graphic = c[f.shapeType](g).attr(f.pointAttr[f.selected ? "select": xa]).add(a.group).shadow(b.shadow)
+			})
+		},
+		drawTracker: function() {
+			var a = this,
+			b = a.chart,
+			c = b.renderer,
+			d, f, j = + new Date,
+			h = a.options.cursor,
+			p = h && {
+				cursor: h
+			},
+			n;
+			y(a.data, function(h) {
+				f = h.tracker;
+				d = h.trackerArgs || h.shapeArgs;
+				if (h.y !== null) f ? f.attr(d) : h.tracker = c[h.shapeType](d).attr({
+					isTracker: j,
+					fill: tb,
+					visibility: a.visible ? Ua: Ra,
+					zIndex: 1
+				}).on(Ha ? "touchstart": "mouseover", function(c) {
+					n = c.relatedTarget || c.fromElement;
+					b.hoverSeries != a && g(n, "isTracker") != j && a.onMouseOver();
+					h.onMouseOver()
+				}).on("mouseout", function(b) {
+					a.options.stickyTracking || (n = b.relatedTarget || b.toElement, g(n, "isTracker") != j && a.onMouseOut())
+				}).css(p).add(b.trackerGroup)
+			})
+		},
+		animate: function(a) {
+			var b = this,
+			c = b.data;
+			if (!a) y(c, function(a) {
+				var c = a.graphic;
+				c && (c.attr({
+					height: 0,
+					y: b.yAxis.translate(0, 0, 1)
+				}), c.animate({
+					height: a.barH,
+					y: a.barY
+				},
+				b.options.animation))
+			}),
+			b.animate = null
+		},
+		remove: function() {
+			var a = this,
+			b = a.chart;
+			b.hasRendered && y(b.series, function(b) {
+				if (b.type == a.type) b.isDirty = true
+			});
+			pa.prototype.remove.apply(a, arguments)
+		}
+	});
+	Pa.column = Za;
+	W = F(Za, {
+		type: "bar",
+		init: function(a) {
+			a.inverted = this.inverted = true;
+			Za.prototype.init.apply(this, arguments)
+		}
+	});
+	Pa.bar = W;
+	W = F(pa, {
+		type: "scatter",
+		translate: function() {
+			var a = this;
+			pa.prototype.translate.apply(a);
+			y(a.data, function(b) {
+				b.shapeType = "circle";
+				b.shapeArgs = {
+					x: b.plotX,
+					y: b.plotY,
+					r: a.chart.options.tooltip.snap
+				}
+			})
+		},
+		drawTracker: function() {
+			var a = this,
+			b = a.options.cursor,
+			c = b && {
+				cursor: b
+			},
+			d;
+			y(a.data, function(b) { (d = b.graphic) && d.attr({
+					isTracker: true
+				}).on("mouseover", function() {
+					a.onMouseOver();
+					b.onMouseOver()
+				}).on("mouseout", function() {
+					a.options.stickyTracking || a.onMouseOut()
+				}).css(c)
+			})
+		},
+		cleanData: function() {}
+	});
+	Pa.scatter = W;
+	W = F(Ta, {
+		init: function() {
+			Ta.prototype.init.apply(this, arguments);
+			var b = this,
+			c;
+			a(b, {
+				visible: b.visible !== false,
+				name: j(b.name, "Slice")
+			});
+			c = function() {
+				b.slice()
+			};
+			va(b, "select", c);
+			va(b, "unselect", c);
+			return b
+		},
+		setVisible: function(a) {
+			var b = this.series.chart,
+			c = this.tracker,
+			d = this.dataLabel,
+			g = this.connector,
+			f;
+			f = (this.visible = a = a === ya ? ! this.visible: a) ? "show": "hide";
+			this.group[f]();
+			c && c[f]();
+			d && d[f]();
+			g && g[f]();
+			this.legendItem && b.legend.colorizeItem(this, a)
+		},
+		slice: function(a, b, c) {
+			var d = this.series.chart,
+			g = this.slicedTranslation;
+			q(c, d);
+			j(b, true);
+			a = this.sliced = n(a) ? a: ! this.sliced;
+			this.group.animate({
+				translateX: a ? g[0] : d.plotLeft,
+				translateY: a ? g[1] : d.plotTop
+			})
+		}
+	});
+	W = F(pa, {
+		type: "pie",
+		isCartesian: false,
+		pointClass: W,
+		pointAttrToOptions: {
+			stroke: "borderColor",
+			"stroke-width": "borderWidth",
+			fill: "color"
+		},
+		getColor: function() {
+			this.initialColor = Ia
+		},
+		animate: function() {
+			var a = this;
+			y(a.data, function(b) {
+				var c = b.graphic,
+				b = b.shapeArgs,
+				d = - P / 2;
+				c && (c.attr({
+					r: 0,
+					start: d,
+					end: d
+				}), c.animate({
+					r: b.r,
+					start: b.start,
+					end: b.end
+				},
+				a.options.animation))
+			});
+			a.animate = null
+		},
+		translate: function() {
+			var a = 0,
+			c = - 0.25,
+			d = this.options,
+			g = d.slicedOffset,
+			f = g + d.borderWidth,
+			j = d.center,
+			h = this.chart,
+			p = h.plotWidth,
+			n = h.plotHeight,
+			o, m, q, t = this.data,
+			D = 2 * P,
+			I, w = Da(p, n),
+			v,
+			ca,
+			Ba = d.dataLabels.distance;
+			j.push(d.size, d.innerSize || 0);
+			j = kb(j, function(a, c) {
+				return /%$/.test(a) ? [p, n, w, w][c] * b(a) / 100: a
+			});
+			this.getX = function(a, b) {
+				q = N.asin((a - j[1]) / (j[2] / 2 + Ba));
+				return j[0] + (b ? - 1: 1) * Z(q) * (j[2] / 2 + Ba)
+			};
+			this.center = j;
+			y(t, function(b) {
+				a += b.y
+			});
+			y(t, function(b) {
+				I = a ? b.y / a: 0;
+				o = x(c * D * 1E3) / 1E3;
+				c += I;
+				m = x(c * D * 1E3) / 1E3;
+				b.shapeType = "arc";
+				b.shapeArgs = {
+					x: j[0],
+					y: j[1],
+					r: j[2] / 2,
+					innerR: j[3] / 2,
+					start: o,
+					end: m
+				};
+				q = (m + o) / 2;
+				b.slicedTranslation = kb([Z(q) * g + h.plotLeft, da(q) * g + h.plotTop], x);
+				v = Z(q) * j[2] / 2;
+				ca = da(q) * j[2] / 2;
+				b.tooltipPos = [j[0] + v * 0.7, j[1] + ca * 0.7];
+				b.labelPos = [j[0] + v + Z(q) * Ba, j[1] + ca + da(q) * Ba, j[0] + v + Z(q) * f, j[1] + ca + da(q) * f, j[0] + v, j[1] + ca, Ba < 0 ? "center": q < D / 4 ? "left": "right", q];
+				b.percentage = I * 100;
+				b.total = a
+			});
+			this.setTooltipPoints()
+		},
+		render: function() {
+			this.getAttribs();
+			this.drawPoints();
+			this.options.enableMouseTracking !== false && this.drawTracker();
+			this.drawDataLabels();
+			this.options.animation && this.animate && this.animate();
+			this.isDirty = false
+		},
+		drawPoints: function() {
+			var b = this.chart,
+			c = b.renderer,
+			d, g, f, j;
+			y(this.data, function(h) {
+				g = h.graphic;
+				j = h.shapeArgs;
+				f = h.group;
+				if (!f) f = h.group = c.g("point").attr({
+					zIndex: 5
+				}).add();
+				d = h.sliced ? h.slicedTranslation: [b.plotLeft, b.plotTop];
+				f.translate(d[0], d[1]);
+				g ? g.animate(j) : h.graphic = c.arc(j).attr(a(h.pointAttr[xa], {
+					"stroke-linejoin": "round"
+				})).add(h.group);
+				h.visible === false && h.setVisible(false)
+			})
+		},
+		drawDataLabels: function() {
+			var a = this.data,
+			b, c = this.chart,
+			d = this.options.dataLabels,
+			g = j(d.connectorPadding, 10),
+			f = j(d.connectorWidth, 1),
+			h,
+			p,
+			n = d.distance > 0,
+			o,
+			m,
+			q = this.center[1],
+			t = [[], [], [], []],
+			D,
+			I,
+			w,
+			v,
+			x,
+			ca,
+			Ba,
+			F = 4,
+			A;
+			pa.prototype.drawDataLabels.apply(this);
+			y(a, function(a) {
+				var b = a.labelPos[7];
+				t[b < 0 ? 0: b < P / 2 ? 1: b < P ? 2: 3].push(a)
+			});
+			t[1].reverse();
+			t[3].reverse();
+			for (Ba = function(a, b) {
+				return a.y > b.y
+			}; F--;) {
+				a = 0;
+				b = [].concat(t[F]);
+				b.sort(Ba);
+				for (A = b.length; A--;) b[A].rank = A;
+				for (v = 0; v < 2; v++) {
+					m = (ca = F % 3) ? 9999: - 9999;
+					x = ca ? - 1: 1;
+					for (A = 0; A < t[F].length; A++) if (b = t[F][A], h = b.dataLabel) {
+						p = b.labelPos;
+						w = Ua;
+						D = p[0];
+						I = p[1];
+						o || (o = h && h.getBBox().height);
+						if (n) if (v && b.rank < a) w = Ra;
+						else if (!ca && I < m + o || ca && I > m - o) if (I = m + x * o, D = this.getX(I, F > 1), ! ca && I + o > q || ca && I - o < q) v ? w = Ra: a++;
+						b.visible === false && (w = Ra);
+						w == Ua && (m = I);
+						if (v && (h.attr({
+							visibility: w,
+							align: p[6]
+						})[h.moved ? "animate": "attr"]({
+							x: D + d.x + ({
+								left: g,
+								right: - g
+							} [p[6]] || 0),
+							y: I + d.y
+						}), h.moved = true, n && f)) h = b.connector,
+						p = [Ca, D + (p[6] == "left" ? 5: - 5), I, ma, D, I, ma, p[2], p[3], ma, p[4], p[5]],
+						h ? (h.animate({
+							d: p
+						}), h.attr("visibility", w)) : b.connector = h = this.chart.renderer.path(p).attr({
+							"stroke-width": f,
+							stroke: d.connectorColor || "#606060",
+							visibility: w,
+							zIndex: 3
+						}).translate(c.plotLeft, c.plotTop).add()
+					}
+				}
+			}
+		},
+		drawTracker: Za.prototype.drawTracker,
+		getSymbol: function() {}
+	});
+	Pa.pie = W;
+	v.Highcharts = {
+		Chart: Q,
+		dateFormat: Ab,
+		pathAnim: cb,
+		getOptions: function() {
+			return za
+		},
+		numberFormat: Ma,
+		Point: Ta,
+		Color: La,
+		Renderer: lc,
+		seriesTypes: Pa,
+		setOptions: function(a) {
+			za = ia(za, a);
+			w();
+			return za
+		},
+		Series: pa,
+		addEvent: va,
+		createElement: t,
+		discardElement: aa,
+		css: m,
+		each: y,
+		extend: a,
+		map: kb,
+		merge: ia,
+		pick: j,
+		extendClass: F,
+		version: "2.1.2"
+	}
+})();
+var treeio = {
+	put_mce: function(a) { (a ? $("textarea", a) : $("textarea")).each(function() {
+			$(this).hasClass("no-editor") || ($(this).attr("id", a.attr("id") + "-" + $(this).attr("id")), $(this).hasClass("full-editor") ? $(this).tinymce({
+				script_url: "/static/js/tinymce/jscripts/tiny_mce/tiny_mce.js",
+				theme: "advanced",
+				skin: "cirkuit",
+				relative_urls: false,
+				plugins: "safari,table,advhr,inlinepopups,insertdatetime,preview,searchreplace,contextmenu,paste,fullscreen,nonbreaking,visualchars,xhtmlxtras",
+				theme_advanced_buttons1: "bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,formatselect,fontselect,fontsizeselect,|,cut,copy,paste,pastetext,pasteword,|,search,replace",
+				theme_advanced_buttons2: "bullist,numlist,|,outdent,indent,blockquote,|,undo,redo,|,link,unlink,image,cleanup,code,|,insertdate,inserttime,preview,|,forecolor,backcolor,|,cite,abbr,acronym,del,ins",
+				theme_advanced_buttons3: "tablecontrols,|,hr,removeformat,|,sub,sup,|,visualchars,nonbreaking,charmap,advhr,|,fullscreen",
+				theme_advanced_disable: "help,styleselect,anchor,newdocument",
+				theme_advanced_toolbar_location: "top",
+				theme_advanced_toolbar_align: "left",
+				theme_advanced_statusbar_location: "bottom",
+				theme_advanced_resizing: true,
+				theme_advanced_resize_horizontal: true,
+				theme_advanced_resizing_use_cookie: true,
+				theme_advanced_path: false,
+				width: "70%"
+			}) : $(this).tinymce({
+				script_url: "/static/js/tinymce/jscripts/tiny_mce/tiny_mce.js",
+				theme: "advanced",
+				skin: "cirkuit",
+				relative_urls: false,
+				plugins: "safari,table,advhr,inlinepopups,insertdatetime,preview,searchreplace,contextmenu,paste,fullscreen,nonbreaking,visualchars,xhtmlxtras",
+				theme_advanced_statusbar_location: "bottom",
+				theme_advanced_toolbar_location: "top",
+				theme_advanced_toolbar_align: "left",
+				theme_advanced_path: false,
+				theme_advanced_resizing: true,
+				theme_advanced_resize_horizontal: true,
+				theme_advanced_resizing_use_cookie: true,
+				theme_advanced_disable: "justifyleft,justifycenter,justifyright,justifyfull,outdent,indent,image,help,hr,removeformat,formatselect,fontselect,fontsizeselect,styleselect,sub,sup,forecolor,backcolor,forecolorpicker,backcolorpicker,charmap,visualaid,anchor,newdocument,blockquote",
+				theme_advanced_buttons1: "bold,italic,underline,strikethrough,|,undo,redo,|,cut,copy,paste,link,unlink,cleanup,|,bullist,numlist,|,code",
+				theme_advanced_buttons2: "",
+				theme_advanced_buttons3: "",
+				width: "70%"
+			}))
+		})
+	},
+	remove_mce: function(a) { (a ? $("textarea", a) : $("textarea")).each(function() {
+			tinyMCE.execCommand("mceRemoveControl", false, $(this).attr("id"))
+		})
+	},
+	do_ajax: function() {
+		var a = window.location.hash.replace(/#/gi, "");
+		if (!a) a = window.location.pathname;
+		var b = $('.menu-item a[href="#' + a + '"]');
+		if (b.length && ! b.hasClass("active") && (block = $("#module-" + b.attr("id").substring(5)), block.length)) $(".module-block").each(function() {
+			$(this).attr("id") != block.attr("id") ? ($(this).css("display", "none"), $(this).data("active", false)) : (block.css("display", "block"), block.data("active", true))
+		}),
+		document.title = block.data("title"),
+		$(".menu-item a").each(function() {
+			$(this).removeClass("active")
+		}),
+		b.addClass("active"),
+		a = "";
+		a && (a = treeio.prepare_url(a), $("#loading-status").css("display", "block"), $("#loading-status-text").html("Loading..."), $.ajax({
+			url: a,
+			dataType: "json",
+			success: treeio.process_ajax,
+			complete: treeio.process_html,
+			error: treeio.show_error
+		}))
+	},
+	show_error: function() {
+		$("#loading-status-text").html("Something went wrong...")
+	},
+	process_userblock: function(a) {
+		a.response.messages && $("#userblock-messages").each(function() {
+			$(this).html(a.response.messages)
+		})
+	},
+	process_ajax: function(a) {
+		if (a) if (a.popup) treeio.process_popup_data(a);
+		else if (a.redirect) window.location.hash == "#" + a.redirect ? treeio.do_ajax() : window.location.hash = a.redirect;
+		else if (a.redirect_out) window.location = a.redirect_out;
+		else {
+			if (a.response.url) {
+				var b = a.response.url.replace(".ajax", ""),
+				c = window.location.hash.replace("#", "");
+				if (b != c && b.indexOf(c) == - 1 && c.indexOf(b) == - 1) {
+					$("#loading-status").css("display", "none");
+					return
+				}
+			}
+			document.title = a.response.content.title;
+			var b = a.response.content.module_content,
+			c = a.response.modules.active,
+			d = "none";
+			if ($("#module-" + c).length == 0) $("#content").append('<div class="module-block" id="module-' + c + '"></div>');
+			else {
+				var f = $("td.module-sidebar-right", $("#module-" + c));
+				f && (d = f.css("display"))
+			}
+			var h = $("#module-" + c);
+			$(".module-block").each(function() {
+				$(this).attr("id") != h.attr("id") ? ($(this).css("display", "none"), $(this).data("active", false)) : (h.css("display", "block"), h.data("active", true))
+			});
+			treeio.remove_mce($("#module-" + c + " form"));
+			$("#module-" + c).html(b);
+			$("#module-" + c + " form").length && (treeio.prepare_forms(h), treeio.prepare_comments(h), $("#module-" + c + " textarea").length && treeio.put_mce(h));
+			treeio.prepare_tags(h);
+			treeio.prepare_list_actions(h);
+			treeio.prepare_attachments(h);
+			treeio.prepare_invites(h);
+			treeio.prepare_popups(h);
+			treeio.convert_links(h);
+			treeio.prepare_ajax_links(h);
+			treeio.prepare_slider_sidebar(h, d);
+			treeio.showhidejs(h);
+			treeio.prepare_module_stuff(c);
+			treeio.process_notifications(a.response.notifications);
+			$(".menu-item a").each(function() {
+				$(this).removeClass("active")
+			});
+			treeio.process_userblock(a);
+			$("#menu-" + c).addClass("active");
+			$(h).data("title", a.response.content.title);
+			$("#loading-splash").css("display") != "none" && $("#loading-splash").fadeOut();
+			$("#loading-status").css("display", "none")
+		}
+	},
+	process_notifications: function(a) {
+		for (var b in a) {
+			var c = {
+				title: " ",
+				text: a[b].message,
+				image: "/static/notifications/" + a[b].tags + ".png"
+			};
+			if (a[b].title) c.title = a[b].title;
+			if (a[b].image) c.image = a[b].image;
+			$.gritter.add(c)
+		}
+	},
+	process_html: function(a, b) {
+		b == "parsererror" && window.document.write(a.responseText)
+	},
+	prepare_module_stuff: function(a) {
+		try {
+			treeio.modules[a].init()
+		} catch(b) {}
+	},
+	prepare_url: function(a) {
+		if (a.indexOf("!") != - 1 || a.indexOf("?") != - 1) a = a.replace("!", "?"),
+		a.indexOf(".ajax") == - 1 && (a = a.replace("?", ".ajax?"));
+		a.indexOf(".ajax") == - 1 && (a += ".ajax?");
+		return a
+	},
+	showhidejs: function(a) {
+		if (a) var b = $("div.showjs", a),
+		a = $("div.hidejs", a);
+		else b = $("div.showjs"),
+		a = $("div.hidejs");
+		b.each(function() {
+			$(this).css("display", "block")
+		});
+		a.each(function() {
+			$(this).css("display", "none")
+		})
+	},
+	convert_links: function(a) { (a ? $("a", a) : $("a")).each(function() {
+			if ($(this).attr("href") && ! $(this).hasClass("ajax-link-out") && ! $(this).hasClass("ajax-link") && ! $(this).attr("target") && $(this).attr("href").substring(0, 3) != "www" && $(this).attr("href").substring(0, 5) != "http:" && $(this).attr("href").substring(0, 6) != "https:" && $(this).attr("href").substring(0, 4) != "ftp:" && $(this).attr("href").substring(0, 7) != "mailto:" && $(this).attr("href").indexOf("#") == - 1 && ($(this).attr("href", "#" + $(this).attr("href").replace("?", "!")), $.browser.msie && $.browser.version.substr(0, 1) < 7)) {
+				var a = window.location.href.replace(window.location.hash, "");
+				$(this).attr("href", $(this).attr("href").replace(a, ""))
+			}
+		})
+	},
+	add_data: function(a) {
+		var b = $(a.target);
+		a.inner ? b.html(a.content) : a.append ? b.append(a.content) : (a = $(a.content), b.replaceWith(a), b = a);
+		$("form", b).length && (treeio.prepare_forms(b), treeio.prepare_comments(b), $("textarea", b).length && treeio.put_mce(b));
+		treeio.prepare_tags(b);
+		treeio.prepare_list_actions(b);
+		treeio.prepare_attachments(b);
+		treeio.prepare_invites(b);
+		treeio.prepare_popups(b);
+		treeio.convert_links(b);
+		treeio.prepare_ajax_links(b);
+		treeio.showhidejs(b);
+		$("#loading-status").css("display", "none")
+	},
+	prepare_ajax_links: function(a) { (a ? $(".ajax-link", a) : $(".ajax-link")).each(function() {
+			$(this).click(function() {
+				var a = $(this).parents($(this).attr("target")),
+				c = treeio.utils.generate_id();
+				a.attr("id", c);
+				$(this).attr("target", "#" + c);
+				var a = eval($(this).attr("callback")),
+				d = eval("(" + $(this).attr("args") + ")"),
+				c = d ? $.extend({
+					target: "#" + c
+				},
+				d) : {
+					target: "#" + c
+				};
+				$("#loading-status").css("display", "block");
+				$("#loading-status-text").html("Loading...");
+				a(Dajax.process, c);
+				return false
+			})
+		})
+	},
+	prepare_slider_sidebar: function(a, b) {
+		a || (a = $(".module-block"));
+		var c = $("<div></div>").addClass("sidebar-slider");
+		$("td.module-content-inner", a).prepend(c);
+		c.data("sidebar", $("td.module-sidebar-right", a));
+		c.click(function() {
+			var a = $(this).data("sidebar");
+			a && (a.css("display") == "none" ? a.fadeIn() : a.fadeOut())
+		});
+		var d = $("td.module-sidebar-right", a);
+		($("a.projects-action", d).length != 0 || $("a.services-action", d).length != 0) && c.append('<img src="/static/icons/sidebar/status.gif"/><br />');
+		$("form.content-filter-form", d).length != 0 && c.append('<img src="/static/icons/sidebar/filter.gif"/><br />');
+		$("div.permission-links", d).length != 0 && c.append('<img src="/static/icons/sidebar/permission.gif"/><br />');
+		$("div.object-links", d).length != 0 && c.append('<img src="/static/icons/sidebar/link.gif"/><br />');
+		$("div.subscription-users", d).length != 0 && c.append('<img src="/static/icons/sidebar/subscribe.gif"/><br />');
+		$("a.pdf-block-link", d).length != 0 && c.append('<img src="/static/icons/sidebar/export.gif"/><br />');
+		b ? d.css("display", b) : (d.css("display", "none"), c.css({
+			visibility: "hidden"
+		}))
+	},
+	prepare_list_actions: function(a) {
+		$(".content-list-item", a).each(function() {
+			$("span.content-list-item-actions", $(this)).css("visibility", "hidden");
+			$(this).mouseover(function() {
+				$("span.content-list-item-actions", $(this)).css("visibility", "visible")
+			}).mouseout(function() {
+				$("span.content-list-item-actions", $(this)).css("visibility", "hidden")
+			});
+			$("span.content-list-item-actions a", $(this)).addClass("popup-link")
+		})
+	},
+	put_datepicker: function(a) {
+		$("input.datepicker", a).each(function() {
+			var a = {},
+			c = $(this).attr("initial");
+			if (c) c = parseInt(c) * 1E3,
+			a.defaultDate = new Date(c);
+			$(this).datepicker(a)
+		});
+		$("input.datetimepicker", a).each(function() {
+			var a = {
+				stepMinute: 5,
+				hour: 12,
+				minute: 0,
+				firstDay: 1
+			},
+			c = $(this).attr("initial");
+			if (c) c = parseInt(c) * 1E3,
+			c = new Date(c),
+			a.defaultDate = c,
+			a.hour = c.getHours(),
+			a.minute = c.getMinutes(),
+			a.second = c.getSeconds();
+			$(this).datetimepicker(a)
+		})
+	},
+	prepare_mass_form: function(a) {
+		$("input[type=checkbox].group-control", a).each(function() {
+			$(this).data("form", $("ul.mass-form", a));
+			$(this).click(function() {
+				$("input[type=checkbox].group-" + $(this).attr("name")).attr("checked", $(this).attr("checked"));
+				$(this).data("form").fadeTo("fast", 1)
+			})
+		});
+		$("ul.mass-form input[type=submit]", a).remove();
+		$("ul.mass-form", a).each(function() {
+			$(this).css("opacity", 0.6)
+		});
+		$(".content-list-item input[type=checkbox], #sales_table, #reports_table", a).each(function() {
+			$(this).data("form", $("ul.mass-form", a));
+			$(this).click(function() {
+				$(this).data("form").fadeTo("fast", 1)
+			})
+		});
+		$(".mass-form select", a).each(function() {
+			$(this).css("opacity", 0);
+			$(this).change(function() {
+				var a = $("span.wrap-value", $(this).parent()),
+				c = $(this).children("option:selected"); ! c.val() == "" && (a.text(c.text()), c.val() == "delete" || c.val() == "delete_all" ? confirm("Really delete?\n\n(This cannot be undone)") && $(this).parent().submit() : $(this).parent().submit())
+			})
+		});
+		$(".mass-form label", a).each(function() {
+			$(this).next("select").andSelf().wrapAll('<div class="wrap-class" />');
+			$(this).replaceWith('<span class="wrap-label">' + $(this).text() + '&nbsp;<span class="wrap-value"></span></span>')
+		})
+	},
+	prepare_filter_form: function(a) {
+		$("form.content-filter-form input", a).live("change", function() {
+			$(this).parents("form.content-filter-form").submit()
+		});
+		$("form.content-filter-form select", a).live("change", function() {
+			$(this).parents("form.content-filter-form").submit()
+		});
+		$("form.content-filter-form :submit").hide()
+	},
+	prepare_popup_content: function(a) {
+		var b = a.popup_id;
+		if ($("#" + b).length) {
+			var c = $("#" + b);
+			$("a", c).each(function() {
+				if ($(this).attr("href") && ! $(this).hasClass("popup-link") && ! $(this).hasClass("ajax-link-out") && ! $(this).attr("target") && $(this).attr("href").substring(0, 3) != "www" && $(this).attr("href").substring(0, 5) != "http:" && $(this).attr("href").substring(0, 6) != "https:" && $(this).attr("href").substring(0, 4) != "ftp:" && $(this).attr("href").substring(0, 7) != "mailto:") {
+					$(this).attr("href").indexOf(b) == - 1 ? $(this).data("href", "/user/popup/" + b + "/url=" + $(this).attr("href")) : $(this).data("href", $(this).attr("href"));
+					if ($.browser.msie && $.browser.version.substr(0, 1) < 7) {
+						var a = window.location.href.replace(window.location.hash, "");
+						$(this).data("href", $(this).data("href").replace(a, "/"))
+					}
+					$(this).click(function() {
+						$("#loading-status").css("display", "block");
+						url = $(this).data("href");
+						$.ajax({
+							url: url,
+							dataType: "json",
+							success: treeio.process_popup_data
+						});
+						return false
+					})
+				}
+			});
+			treeio.prepare_popups(c);
+			$("form", c).each(function() { (url = $(this).attr("action")) ? url.indexOf("/user/popup/") == - 1 && (url = "/user/popup/" + a.popup_id + "/url=" + url) : url = a.url;
+				$(this).attr("action", url);
+				var b = {
+					beforeSubmit: function() {
+						$("#loading-status").css("display", "block")
+					},
+					url: url,
+					dataType: "json",
+					success: treeio.process_ajax
+				};
+				$(this).ajaxForm(b)
+			});
+			treeio.showhidejs(c);
+			treeio.prepare_ajax_links(c);
+			treeio.prepare_comments(c);
+			treeio.prepare_attachments(c);
+			treeio.prepare_invites(c);
+			treeio.prepare_tags(c);
+			treeio.prepare_autocomplete(c);
+			treeio.prepare_search_duplicates(c);
+			treeio.put_datepicker(c);
+			treeio.prepare_mass_form(c);
+			treeio.put_mce(c)
+		}
+	},
+	process_popup_data: function(a) {
+		if (a.popup) {
+			var b = $("#" + a.popup.popup_id);
+			if (a.popup.object) {
+				if (b.data("field")) {
+					var c = $("#" + b.data("module")),
+					d = $("#" + b.data("field"), c);
+					d.hasClass("autocomplete") ? (d.val(a.popup.object.name), c = $("#" + d.attr("id").replace("autocomplete_", ""), c), c.each(function() {
+						$(this).val(a.popup.object.id)
+					})) : d.hasClass("duplicates") ? (d.val(a.popup.object.name), c = $("#" + d.attr("id").replace("duplicates_", ""), c), c.each(function() {
+						$(this).val(a.popup.object.id)
+					})) : d.append('<option value="' + a.popup.object.id + '" selected="selected">' + a.popup.object.name + "</option>")
+				} else {
+					var f = location.hash.substring(1),
+					f = treeio.prepare_url(f),
+					c = b.parents("div.popup-block-inner");
+					$("#loading-status").css("display", "block");
+					c.length > 0 && $(c).first().each(function() {
+						f = "/user/popup/" + $(this).attr("id") + "/url=" + $(this).parent().data("link").replace("#", "")
+					});
+					$.ajax({
+						url: f,
+						dataType: "json",
+						success: treeio.process_ajax,
+						complete: treeio.process_html
+					})
+				}
+				b.parent().remove()
+			} else a.popup.redirect ? (f = location.hash.substring(1), f = treeio.prepare_url(f), c = b.parents("div.popup-block-inner"), $("#loading-status").css("display", "block"), c.length > 0 && $(c).first().each(function() {
+				f = "/user/popup/" + $(this).attr("id") + "/url=" + $(this).parent().data("link").replace("#", "")
+			}), $.ajax({
+				url: f,
+				dataType: "json",
+				success: treeio.process_ajax,
+				complete: treeio.process_html
+			}), b.parent().remove()) : (c = b.parent().children("div.popup-title-block"), c.children("span.popup-title").html(a.popup.title), c.children("span.popup-subtitle").html(a.popup.subtitle), b.html(a.popup.content), treeio.prepare_popup_content(a.popup), b.parent().fadeIn(300), $("input:text:visible:first", b).focus())
+		}
+		$("#loading-status").css("display", "none")
+	},
+	prepare_popups: function(a) {
+		$("a.popup-link", a).each(function() {
+			$(this).hasClass("popup-link-out") || $(this).click(function() {
+				var b = a.attr("id") + "-popup-" + $(this).attr("id") + "-" + Date.now();
+				if ($("#" + b).length) return false;
+				$("#loading-status").css("display", "block");
+				var c = $("<div></div>").addClass("popup-block").css("display", "none").css("visibility", "visible");
+				c.data("link", $(this).attr("href"));
+				var d = $("<div></div>").addClass("popup-title-block");
+				d.append($("<span></span>").addClass("popup-title"));
+				d.append($("<span></span>").addClass("popup-subtitle"));
+				var f = $("<div></div>").addClass("popup-link-open");
+				f.click(function() {
+					var a = $(this).parent().data("link");
+					if (a) a = a.replace("#", ""),
+					window.location.hash = a,
+					$(this).parent().remove()
+				});
+				var h = $("<div></div>").addClass("popup-close");
+				h.click(function() {
+					$("#" + b).length && $("#" + b).parent().remove()
+				});
+				var n = $("<div></div>").addClass("popup-block-inner");
+				n.attr("id", b);
+				$(this).attr("field") && (n.data("field", $(this).attr("field")), n.data("module", a.attr("id")));
+				c.append(h);
+				c.append(f);
+				c.append(d);
+				c.append(n);
+				a.append(c);
+				d = c.parents("div.popup-block-inner");
+				d.length > 0 ? (d = d.first().offset(), c.position({
+					my: "center top",
+					at: "center top",
+					of: $(this),
+					collision: "flip",
+					offset: "-" + d.left + " -" + d.top + ""
+				})) : c.position({
+					my: "left top",
+					at: "left top",
+					of: $(this),
+					collision: "fit",
+					offset: "-30 -5"
+				});
+				c.draggable({
+					handle: "div.popup-title-block",
+					opacity: 0.5,
+					addClasses: false
+				});
+				url = "/user/popup/" + b + "/url=" + $(this).attr("href").replace("#", "");
+				$.browser.msie && $.browser.version.substr(0, 1) < 7 && (url = "/user/popup/" + b + "/url=/" + $(this).attr("href").replace("#", ""), c = window.location.href.replace(window.location.hash, ""), url = url.replace(c, ""));
+				url = url.replace("//", "/");
+				$.ajax({
+					url: url,
+					dataType: "json",
+					success: treeio.process_popup_data
+				});
+				return false
+			})
+		})
+	},
+	prepare_autocomplete: function(a) {
+		$("input.autocomplete", a).each(function() {
+			$(this).data("hidden_field", $("#id_" + $(this).attr("name").replace("autocomplete_", ""), a));
+			$(this).autocomplete({
+				source: $(this).attr("callback") + ".json",
+				focus: function(a, c) {
+					$(this).val(c.item.label);
+					$(this).data("hidden_field").val(c.item.value);
+					return false
+				},
+				select: function(a, c) {
+					$(this).val(c.item.label);
+					$(this).data("hidden_field").val(c.item.value);
+					return false
+				}
+			});
+			$(this).change(function() {
+				$(this).val() == "" && $(this).data("hidden_field").val("")
+			})
+		});
+		$("input.multicomplete", a).each(function() {
+			$(this).data("hidden_fields", $("#" + $(this).attr("name").replace("multicomplete_", "multi_"), a));
+			$(this).bind("keydown", function(a) {
+				a.keyCode === $.ui.keyCode.TAB && $(this).data("autocomplete").menu.active && a.preventDefault()
+			});
+			$(this).bind("keyup", function(a) {
+				if (a.keyCode === $.ui.keyCode.BACKSPACE || a.keyCode === $.ui.keyCode.DELETE) for (var a = treeio.utils.split(this.value), b = $("input", $(this).data("hidden_fields")), f = 0; f < b.length; f++) {
+					var h = $(b[f]).attr("label");
+					$.inArray(h, a) == - 1 && $(b[f]).remove()
+				}
+			});
+			var b = $(this).attr("callback") + ".json";
+			$(this).autocomplete({
+				source: function(a, d) {
+					$.getJSON(b, {
+						term: treeio.utils.extractLast(a.term)
+					},
+					d)
+				},
+				search: function() {
+					if (treeio.utils.extractLast(this.value).length < 2) return false
+				},
+				focus: function() {
+					return false
+				},
+				select: function(a, b) {
+					var f = treeio.utils.split(this.value);
+					f.pop();
+					f.push(b.item.label);
+					f.push("");
+					var h = $(this).data("hidden_fields"),
+					n = $("<input>");
+					n.attr("type", "hidden").attr("name", $(this).attr("name").replace("multicomplete_", "")).attr("id", "id_" + n.attr("name")).attr("value", b.item.value).attr("label", b.item.label);
+					this.value = f.join(", ");
+					h.append(n);
+					f = treeio.utils.split(this.value);
+					h = $("input", $(this).data("hidden_fields"));
+					for (n = 0; n < h.length; n++) {
+						var g = $(h[n]).attr("label");
+						$.inArray(g, f) == - 1 && $(h[n]).remove()
+					}
+					return false
+				}
+			})
+		})
+	},
+	prepare_search_duplicates: function(a) {
+		$("input.duplicates", a).each(function() {
+			$(this).data("hidden_field", $("#id_" + $(this).attr("name").replace("duplicates_", ""), a));
+			$(this).autocomplete({
+				source: $(this).attr("callback") + ".json",
+				focus: function(a, c) {
+					$(this).val(c.item.label);
+					return false
+				},
+				select: function(a, c) {
+					$(this).val(c.item.label);
+					return false
+				}
+			})
+		})
+	},
+	prepare_attachments: function(a) {
+		$(".delete-attachment", a).each(function() {
+			$(this).click(function() {
+				Dajaxice.treeio.account.attachment_delete(Dajax.process, {
+					attachment_id: $(this).attr("attachment")
+				});
+				return false
+			})
+		});
+		$(".attachment-uploader", a).each(function() {
+			new qq.FileUploader({
+				action: $(this).attr("action"),
+				element: this,
+				multiple: false,
+				onComplete: function(a, c, d) {
+					Dajaxice.treeio.account.attachment(Dajax.process, {
+						object_id: d.object_id,
+						update_id: d.update_id
+					})
+				},
+				onAllComplete: function() {},
+				params: {
+					csrf_token: $(this).attr("csrf"),
+					csrf_name: "csrfmiddlewaretoken",
+					csrf_xname: "X-CSRFToken"
+				},
+				text: treeio_attachment_text
+			})
+		});
+		$(".attachment-record-uploader", a).each(function() {
+			new qq.FileUploader({
+				action: $(this).attr("action"),
+				element: this,
+				multiple: false,
+				onComplete: function(a, c, d) {
+					Dajaxice.treeio.account.attachment(Dajax.process, {
+						object_id: d.object_id,
+						update_id: d.update_id
+					})
+				},
+				onAllComplete: function() {},
+				params: {
+					csrf_token: $(this).attr("csrf"),
+					csrf_name: "csrfmiddlewaretoken",
+					csrf_xname: "X-CSRFToken"
+				},
+				text: treeio_attachment_record_text
+			})
+		})
+	},
+	prepare_invites: function(a) {
+		$(".easy-invite", a).each(function() {
+			$(this).click(function() {
+				Dajaxice.treeio.account.easy_invite(Dajax.process, {
+					emails: $(this).attr("emails")
+				});
+				return false
+			})
+		})
+	},
+	prepare_comments: function(a) {
+		$("a.like-button", a).each(function() {
+			$(this).click(function() {
+				$(this).parent().submit();
+				return false
+			})
+		});
+		$("a.comment-button", a).each(function() {
+			$(this).click(function() {
+				var a = $("div.comments-likes-box-" + $(this).attr("object"));
+				a.toggle();
+				a.css("display") != "none" && $("textarea:visible:first", a).focus();
+				return false
+			})
+		});
+		$("span.comments-likes-toggle", a).each(function() {
+			$(this).click(function() {
+				var a = $("div.comments-likes-box-" + $(this).attr("object"));
+				a.toggle();
+				a.css("display") != "none" && $("textarea:visible:first", a).focus();
+				return false
+			})
+		});
+		$("form.like-form", a).each(function() {
+			var a = "comments-likes-box-" + $(this).attr("object");
+			$("#" + a);
+			$(this).attr("target", a);
+			$(this).submit(function() {
+				var a = $(this).attr("target"),
+				b = $(this).parents("#" + a),
+				a = treeio.utils.generate_id(a);
+				b.attr("id", a);
+				a = {
+					target: "#" + a,
+					form: $(this).serializeObject(),
+					expand: true
+				};
+				Dajaxice.treeio.account.comments_likes(Dajax.process, a);
+				return false
+			})
+		})
+	},
+	prepare_tags: function(a) {
+		$("input#id_multicomplete_tags", a).each(function() {
+			$(this).focus();
+			$(this).focusout(function() {
+				$(this).parent("form").submit()
+			});
+			$(this).parent("form").submit(function() {
+				var a = $(this).attr("target"),
+				c = $(this).parents(a),
+				a = treeio.utils.generate_id();
+				c.attr("id", a);
+				a = {
+					target: "#" + a,
+					object_id: $(this).attr("object"),
+					edit: true,
+					formdata: $(this).serializeObject()
+				};
+				Dajaxice.treeio.account.tags(Dajax.process, a);
+				return false
+			})
+		});
+		$("span.tags-box").each(function() {
+			$("span.tags-box-link", $(this)).css("visibility", "hidden");
+			$(this).hover(function() {
+				$("span.tags-box-link", $(this)).css("visibility", "visible")
+			},
+			function() {
+				$("span.tags-box-link", $(this)).css("visibility", "hidden")
+			})
+		})
+	},
+	prepare_forms: function(a) {
+		$("form", a).each(function() {
+			if (!$(this).hasClass("like-form") && ! $(this).hasClass("tags-form")) { (url = $(this).attr("action")) || (url = location.hash.substring(1));
+				if ($(this).attr("method") == "get") {
+					$(this).attr("action", url);
+					var a = {
+						beforeSubmit: function(a, b) {
+							var f = b.attr("action");
+							f.indexOf("!") != - 1 && (f = f.substring(0, f.indexOf("!")));
+							f += "!" + b.formSerialize();
+							window.location.hash = "#" + f;
+							return false
+						}
+					}
+				} else url = treeio.prepare_url(url),
+				a = {
+					beforeSubmit: function() {
+						$("#loading-status").css("display", "block")
+					},
+					url: url,
+					dataType: "json",
+					success: treeio.process_ajax
+				};
+				$(this).ajaxForm(a)
+			}
+		});
+		treeio.prepare_mass_form(a);
+		treeio.prepare_filter_form(a);
+		treeio.prepare_autocomplete(a);
+		treeio.prepare_search_duplicates(a);
+		treeio.put_datepicker(a)
+	},
+	prepare_dropdown_menus: function() {
+		$("a.menu-dropdown-link").each(function() {
+			$(this).click(function() {
+				var a = $("#" + $(this).attr("dropdown"));
+				$(this).addClass("menu-dropdown-link-active");
+				a.slideDown("fast").show()
+			});
+			$(this).hover(function() {
+				var a = $("#" + $(this).attr("dropdown"));
+				$(this).addClass("menu-dropdown-link-active");
+				a.slideDown("fast").show()
+			});
+			$(this).parent().hover(function() {},
+			function() {
+				var a = $(this).children("a.menu-dropdown-link");
+				$(this).children("#" + a.attr("dropdown")).slideUp("fast");
+				a.removeClass("menu-dropdown-link-active")
+			})
+		})
+	},
+	prepare_toolbar: function() {
+		$("span.hide_toolbar").click(function() {
+			$("#toolbar").slideToggle("fast", function() {
+				$("#toolbar_action").fadeIn("slow")
+			})
+		});
+		$("span.show_toolbar").click(function() {
+			$("#toolbar_action").fadeOut("fast", function() {
+				$("#toolbar").slideToggle("fast")
+			})
+		})
+	}
+};
+treeio.utils = {
+	split: function(a) {
+		return a.split(/,\s*/)
+	},
+	extractLast: function(a) {
+		return treeio.utils.split(a).pop()
+	},
+	generate_id: function(a) {
+		a || (a = "ajax");
+		for (var a = a + "-" + Date.now(), b = 0; $("#" + a).length > 0;) a = a + "-" + b,
+		b++;
+		return a
+	}
+};
+treeio.modules = {
+	"treeio-home": {
+		init: function() {
+			var a = {
+				opacity: 0.6,
+				handle: "div.widget-title",
+				connectWith: "#widget-panel-right",
+				items: "div.widget-block",
+				cursor: "move",
+				update: function() {
+					var a = $(this).attr("callback") + "?" + $(this).sortable("serialize");
+					$.ajax({
+						url: a
+					})
+				},
+				start: function(a, c) {
+					$("#widget-panel-left").addClass("widget-panel-active");
+					$("#widget-panel-right").addClass("widget-panel-active");
+					c.item.addClass("widget-block-moving")
+				},
+				beforeStop: function(a, c) {
+					c.item.removeClass("widget-block-moving")
+				},
+				stop: function() {
+					$("#widget-panel-left").removeClass("widget-panel-active");
+					$("#widget-panel-right").removeClass("widget-panel-active")
+				}
+			};
+			$("#widget-panel-left").sortable(a);
+			a.connectWith = "#widget-panel-left";
+			$("#widget-panel-right").sortable(a)
+		}
+	},
+	"treeio-core": {
+		init: function() {
+			$("div.setup-module-box").length > 0 && $("div.setup-module-box").each(function() {
+				$(this).click(function() {
+					$(this).toggleClass("setup-module-box-active");
+					$("input", $(this)).each(function() {
+						$(this).attr("checked", ! $(this).attr("checked"))
+					})
+				})
+			})
+		}
+	},
+	"treeio-projects": {
+		timer: function() {
+			var a = $(".projects-timeslot");
+			a && (a.each(function() {
+				var a = $(this).data("start"),
+				c = Date.now();
+				a == null && (a = parseInt($(this).attr("diff")), a = c - a * 1E3, $(this).data("start", a));
+				var d = (c - a) / 1E3,
+				a = Math.floor(d / 3600),
+				c = Math.floor((d / 3600 - a) * 60),
+				d = Math.round(((d / 3600 - a) * 60 - c) * 60);
+				a += ":";
+				a += c >= 10 ? c + ":": "0" + c + ":";
+				a += d >= 10 ? d: "0" + d;
+				$(this).html(a)
+			}), window.setTimeout(treeio.modules["treeio-projects"].timer, 1E3))
+		},
+		init: function() {
+			$(".projects-timeslot") && this.timer();
+			var a = $("div.ganttChart");
+			a && this.gantt(a)
+		},
+		gantt: function(a) {
+			a.each(function() {
+				if (ganttData) {
+					$(this).ganttView({
+						data: ganttData,
+						behavior: {
+							onClick: function() {},
+							onResize: function(a) {
+								Dajaxice.treeio.projects.gantt(callback_function, {
+									task: a.id,
+									start: a.start.toString("yyyy-M-d"),
+									end: a.end.toString("yyyy-M-d")
+								})
+							},
+							onDrag: function(a) {
+								Dajaxice.treeio.projects.gantt(callback_function, {
+									task: a.id,
+									start: a.start.toString("yyyy-M-d"),
+									end: a.end.toString("yyyy-M-d")
+								})
+							}
+						}
+					});
+					var a = $("#module-treeio-projects");
+					$(this).ganttView("setSlideWidth", $("td.module-content", a).width() - 60);
+					treeio.prepare_popups($(this));
+					$(window).resize(function() {
+						$("div.ganttChart", a).each(function() {
+							var a = $("#module-treeio-projects");
+							$(this).ganttView("setSlideWidth", $("td.module-content", a).width() - 60)
+						})
+					})
+				}
+			})
+		}
+	},
+	"treeio-reports": {
+		init: function() {}
+	}
+};
+treeio.nuvius = {
+	profile: null,
+	access_popup: false,
+	reload_on_profile: true,
+	fetch_profile: function() {
+		$("#loading-status").css("display", "block");
+		$("#loading-status-text").html("Loading...");
+		$.ajax({
+			url: nuvius_profile_url,
+			dataType: "jsonp",
+			success: treeio.nuvius.load_profile,
+			error: treeio.show_error
+		})
+	},
+	check_profile: function(a) {
+		a ? a.key_valid && (a.username ? $("#nuvius-username").html(a.username) : $("#nuvius-username").html("Anonymous User"), treeio.nuvius.reload_on_profile && treeio.do_ajax()) : treeio.nuvius.profile && (a = nuvius_profile_check_url, a += "?nuvius_id=" + treeio.nuvius.profile.id + "&profile_key=" + treeio.nuvius.profile.key, $.ajax({
+			url: a,
+			dataType: "json",
+			success: treeio.nuvius.check_profile,
+			error: treeio.show_error
+		}))
+	},
+	load_profile: function(a) {
+		$("#loading-status").css("display", "none");
+		if (a.profile) ! a.profile.access_granted && treeio.nuvius.access_popup ? ($.colorbox({
+			href: a.profile.access_url,
+			width: "80%",
+			height: "80%",
+			iframe: true,
+			overlayClose: false,
+			onClosed: treeio.nuvius.fetch_profile
+		}), treeio.nuvius.access_popup = false) : (treeio.nuvius.profile = a.profile, treeio.nuvius.check_profile())
+	},
+	fetch_access: function() {
+		treeio.nuvius.access_popup = true;
+		treeio.nuvius.fetch_profile()
+	},
+	close_iframe: function() {
+		$.colorbox.close()
+	}
+};
+$(function() {
+	$(window).hashchange(treeio.do_ajax);
+	$(window).hashchange();
+	treeio.prepare_dropdown_menus();
+	treeio.prepare_toolbar();
+	treeio.convert_links();
+	treeio.prepare_ajax_links();
+	$(".menu-item a").each(function() {
+		$(this).click(function() {
+			$(this).hasClass("active") && $(this).attr("href") == window.location.hash && $(window).hashchange()
+		})
+	});
+	$("#perspective_switch").each(function() { (url = $(this).attr("action")) || (url = location.hash.substring(1));
+		url = treeio.prepare_url(url);
+		var a = {
+			beforeSubmit: function() {
+				$("#loading-status").css("display", "block")
+			},
+			url: url,
+			dataType: "json",
+			success: treeio.process_ajax
+		};
+		$(this).ajaxForm(a);
+		$(this).children("select").change(function() {
+			$("#perspective_switch").submit()
+		})
+	});
+	$("form#search_form").each(function() { (url = $(this).attr("action")) || (url = location.hash.substring(1));
+		$(this).attr("action", url);
+		$(this).ajaxForm({
+			beforeSubmit: function(a, b) {
+				var c = b.attr("action");
+				c += "!" + b.formSerialize();
+				window.location.hash = "#" + c;
+				return false
+			}
+		})
+	});
+	$(".module-block").data("title", document.title);
+	$(".module-block").each(function() {
+		doc = $(this);
+		$("form").length && (treeio.prepare_forms(doc), treeio.prepare_comments(doc), $("textarea").length && treeio.put_mce(doc), treeio.put_datepicker(doc), treeio.prepare_forms(doc));
+		treeio.prepare_tags();
+		treeio.prepare_slider_sidebar(doc);
+		treeio.prepare_list_actions(doc);
+		treeio.prepare_attachments(doc);
+		treeio.prepare_invites(doc);
+		treeio.prepare_popups(doc);
+		treeio.showhidejs(doc);
+		module_name = $(this).attr("id").substring(7);
+		treeio.prepare_module_stuff(module_name);
+		window.setTimeout("$('#loading-splash').fadeOut();", 5E3)
+	})
+});
+(function(a) {
+	a.flexbox = function(b, c) {
+		function d(a, b) {
+			M && clearTimeout(M);
+			M = setTimeout(function() {
+				f(1, a, "")
+			},
+			b ? c.queryDelay * 5: c.queryDelay)
+		}
+		function f(b, d, g) {
+			d && (g = "");
+			var f = g && g.length > 0 ? g: a.trim(G.val());
+			f.length >= c.minChars || d ? (L.outerHeight() > 0 && L.css("height", L.outerHeight()), L.html("").attr("scrollTop", 0), (d = j(f, b)) ? (m(d.data, f), n(b, d.t)) : (d = {
+				q: f,
+				p: b,
+				s: x,
+				contentType: "application/json; charset=utf-8"
+			},
+			g = function(a, d) {
+				d === true && (f = d);
+				var g = parseInt(a[c.totalProperty]);
+				if (isNaN(g) && c.paging) {
+					c.maxCacheBytes <= 0 && alert('The "maxCacheBytes" configuration option must be greater\nthan zero when implementing client-side paging.');
+					var g = a[c.resultsProperty].length,
+					j = g / x;
+					g % x > 0 && (j = parseInt(++j));
+					for (var h = 1; h <= j; h++) {
+						var p = {};
+						p[c.totalProperty] = g;
+						p[c.resultsProperty] = a[c.resultsProperty].splice(0, x);
+						h === 1 && (q = m(p, f));
+						o(f, h, x, g, p, q)
+					}
+				} else {
+					var q = m(a, f);
+					o(f, b, x, g, a, q)
+				}
+				n(b, g)
+			},
+			typeof c.source === "object" ? c.allowInput ? g(h(c.source, d)) : g(c.source) : c.method.toUpperCase() == "POST" ? a.post(c.source, d, g, "json") : a.getJSON(c.source, d, g))) : q()
+		}
+		function h(a, b) {
+			var d = {};
+			d[c.resultsProperty] = [];
+			for (var g = d[c.totalProperty] = 0, f = 0; f < a[c.resultsProperty].length; f++) a[c.resultsProperty][f].name.toLowerCase().indexOf(b.q.toLowerCase()) === 0 && (d[c.resultsProperty][g++] = a[c.resultsProperty][f], d[c.totalProperty] += 1);
+			c.paging && (g = (b.p - 1) * b.s, d[c.resultsProperty] = d[c.resultsProperty].splice(g, g + b.s > d[c.totalProperty] ? d[c.totalProperty] - g: b.s));
+			return d
+		}
+		function n(a, b) {
+			U.html("").removeClass(c.paging.cssClass);
+			if (c.showResults && c.paging && b > x) {
+				var d = b / x;
+				b % x > 0 && (d = parseInt(++d));
+				p(d, a, b)
+			}
+		}
+		function g() {
+			f(parseInt(a(this).attr("page")), true, G.attr("pq"));
+			return false
+		}
+		function p(b, d, j) {
+			U.addClass(c.paging.cssClass);
+			var h = a("<a/>").attr("href", "#").addClass("page").click(g),
+			p = a("<span></span>").addClass("page"),
+			n = ha.attr("id");
+			d > 1 ? (h.clone(true).attr("id", n + "f").attr("page", 1).html("&lt;&lt;").appendTo(U), h.clone(true).attr("id", n + "p").attr("page", d - 1).html("&lt;").appendTo(U)) : (p.clone(true).html("&lt;&lt;").appendTo(U), p.clone(true).html("&lt;").appendTo(U));
+			if (c.paging.style === "links") {
+				var o = c.paging.maxPageLinks;
+				if (b <= o) for (var m = 1; m <= b; m++) m === d ? p.clone(true).html(d).appendTo(U) : h.clone(true).attr("page", m).html(m).appendTo(U);
+				else {
+					startPage = d + parseInt(o / 2) > b ? b - o + 1: d - parseInt(o / 2);
+					startPage > 1 ? h.clone(true).attr("page", startPage - 1).html("...").appendTo(U) : startPage = 1;
+					for (m = startPage; m < startPage + o; m++) m === d ? p.clone(true).html(m).appendTo(U) : h.clone(true).attr("page", m).html(m).appendTo(U);
+					b > startPage + o && h.clone(true).attr("page", m).html("...").appendTo(U)
+				}
+			} else c.paging.style === "input" && a("<input/>").addClass("box").click(function() {
+				this.select()
+			}).keypress(function(c) {
+				var d = this.value;
+				if (/^13$|^39$|^37$/.test(c.keyCode)) switch (c.preventDefault && c.preventDefault(), c.stopPropagation && c.stopPropagation(), c.cancelBubble = true, c.returnValue = false, c.keyCode) {
+				case 13:
+					/^\d+$/.test(d) && d > 0 && d <= b ? f(d, true) : alert("Please enter a page number between 1 and " + b);
+					break;
+				case 39:
+					a("#" + ha.attr("id") + "n").click();
+					break;
+				case 37:
+					a("#" + ha.attr("id") + "p").click()
+				}
+			}).val(d).appendTo(U);
+			d < b ? (h.clone(true).attr("id", n + "n").attr("page", + d + 1).html("&gt;").appendTo(U), h.clone(true).attr("id", n + "l").attr("page", b).html("&gt;&gt;").appendTo(U)) : (p.clone(true).html("&gt;").appendTo(U), p.clone(true).html("&gt;&gt;").appendTo(U));
+			h = (d - 1) * x + 1;
+			p = h > j - x ? j: h + x - 1;
+			c.paging.showSummary && (d = c.paging.summaryTemplate.applyTemplate({
+				start: h,
+				end: p,
+				total: j,
+				page: d,
+				pages: b
+			}), a("<br/>").appendTo(U), a("<span></span>").addClass(c.paging.summaryClass).html(d).appendTo(U))
+		}
+		function j(a, b) {
+			var c = a + N + b;
+			if (A[c]) for (var d = 0; d < Q.length; d++) if (Q[d] === c) return Q.unshift(Q.splice(d, 1)[0]),
+			A[c];
+			return false
+		}
+		function o(a, b, d, g, f, j) {
+			if (c.maxCacheBytes > 0) {
+				for (; Q.length && v + j > c.maxCacheBytes;) {
+					var h = Q.pop();
+					v -= h.size
+				}
+				h = a + N + b;
+				A[h] = {
+					q: a,
+					p: b,
+					s: d,
+					t: g,
+					size: j,
+					data: f
+				};
+				Q.push(h);
+				v += j
+			}
+		}
+		function m(b, d) {
+			var g = 0,
+			f = 0;
+			if (b) if (parseInt(b[c.totalProperty]) === 0 && c.noResultsText && c.noResultsText.length > 0) L.addClass(c.noResultsClass).html(c.noResultsText),
+			P.show();
+			else {
+				L.removeClass(c.noResultsClass);
+				for (var j = 0; j < b[c.resultsProperty].length; j++) {
+					var h = b[c.resultsProperty][j],
+					p = c.resultTemplate.applyTemplate(h),
+					n = d === p,
+					o = false,
+					m = false,
+					w = h[c.displayValue];
+					if (!n && c.highlightMatches && d !== "") {
+						var v = d,
+						x = w.toLowerCase().indexOf(d.toLowerCase()),
+						x = '<span class="' + c.matchClass + '">' + w.substr(x, d.length) + "</span>";
+						p.match("<(.|\n)*?>") && (m = true, v = "(>)([^<]*?)(" + d + ")((.|\n)*?)(<)", x = '$1$2<span class="' + c.matchClass + '">$3</span>$4$6');
+						p = p.replace(RegExp(v, c.highlightMatchesRegExModifier), x)
+					}
+					c.autoCompleteFirstMatch && ! m && j === 0 && d.length > 0 && w.toLowerCase().indexOf(d.toLowerCase()) === 0 && (G.attr("pq", d), G.val(w), o = t(d.length, G.val().length));
+					if (!c.showResults) return;
+					$row = a("<div></div>").attr("id", h[c.displayValue]).attr("val", h[c.hiddenValue]).addClass("row").html(p).appendTo(L);
+					(n || ++f == 1 && c.selectFirstMatch || o) && $row.addClass(c.selectClass);
+					g += p.length
+				}
+				if (g === 0) q();
+				else return P.parent().css("z-index", 11E3),
+				P.show(),
+				L.children("div").mouseover(function() {
+					L.children("div").removeClass(c.selectClass);
+					a(this).addClass(c.selectClass)
+				}).mouseup(function(a) {
+					a.preventDefault();
+					a.stopPropagation();
+					aa()
+				}),
+				c.maxVisibleRows > 0 && (f = $row.outerHeight() * c.maxVisibleRows, L.css("max-height", f)),
+				g
+			}
+		}
+		function t(a, b) {
+			var c = G[0];
+			if (c.createTextRange) {
+				var d = c.createTextRange();
+				d.moveStart("character", a);
+				d.moveEnd("character", b - c.value.length);
+				d.select()
+			} else c.setSelectionRange && c.setSelectionRange(a, b);
+			c.focus();
+			return true
+		}
+		function q() {
+			G.data("active", false);
+			ha.css("z-index", 0);
+			P.hide()
+		}
+		function w() {
+			if (!P.is(":visible")) return false;
+			var a = L.children("div." + c.selectClass);
+			a.length || (a = false);
+			return a
+		}
+		function aa() {
+			if ($curr = w()) G.val($curr.attr("id")).focus(),
+			gb.val($curr.attr("val")),
+			q(),
+			c.onSelect && (G.attr("hiddenValue", gb.val()), c.onSelect.apply(G[0]))
+		}
+		function F() {
+			try {
+				return document.getBoxObjectFor(document.body),
+				true
+			} catch(a) {
+				return false
+			}
+		}
+		function Ma() {
+			try {
+				return document.body.getBoundingClientRect(),
+				true
+			} catch(a) {
+				return false
+			}
+		}
+		var M = false,
+		Q = [],
+		A = [],
+		v = 0,
+		N = "\u25ca",
+		x = c.paging && c.paging.pageSize ? c.paging.pageSize: 0,
+		ha = a(b).css("position", "relative").css("z-index", 0),
+		gb = a('<input type="hidden"/>').attr("id", ha.attr("id") + "_hidden").attr("name", ha.attr("id")).val(c.initialValue).appendTo(ha),
+		G = a("<input/>").attr("id", ha.attr("id") + "_input").attr("autocomplete", "off").addClass(c.inputClass).css("width", c.width + "px").appendTo(ha).click(function() {
+			c.watermark !== "" && this.value === c.watermark ? this.value = "": this.select()
+		}).focus(function() {
+			a(this).removeClass("watermark")
+		}).blur(function() {
+			setTimeout(function() {
+				G.data("active") || q()
+			},
+			200)
+		}).keydown(function(b) {
+			var g = 0;
+			typeof b.ctrlKey !== "undefined" ? (b.ctrlKey && (g |= 1), b.shiftKey && (g |= 2)) : (b.modifiers & Event.CONTROL_MASK && (g |= 1), b.modifiers & Event.SHIFT_MASK && (g |= 2));
+			if (!/16$|17$/.test(b.keyCode)) {
+				var f = b.keyCode === 9,
+				j = b.keyCode === 27,
+				g = b.keyCode === 9 && g > 0,
+				h = b.keyCode === 8;
+				f && w() && aa();
+				if (/27$|38$|33$|34$/.test(b.keyCode) && P.is(":visible") || /13$|40$/.test(b.keyCode) || ! c.allowInput) switch (b.preventDefault && b.preventDefault(), b.stopPropagation && b.stopPropagation(), b.cancelBubble = true, b.returnValue = false, b.keyCode) {
+				case 38:
+					if (($curr = w()) && $curr.prev().length > 0) {
+						$curr.removeClass(c.selectClass).prev().addClass(c.selectClass);
+						var p = L.attr("scrollTop"),
+						n = $curr[0],
+						o = $curr.parent()[0],
+						m,
+						t,
+						v;
+						if (F()) v = document.getBoxObjectFor(n).height,
+						m = document.getBoxObjectFor(L[0]).y - v * 2,
+						t = document.getBoxObjectFor(n).y - document.getBoxObjectFor(L[0]).y;
+						else if (Ma()) m = o.getBoundingClientRect().top,
+						v = n.getBoundingClientRect(),
+						t = v.top,
+						v = v.bottom - t;
+						t <= m && L.attr("scrollTop", p - v)
+					} else $curr || L.children("div:last-child").addClass(c.selectClass);
+					break;
+				case 40:
+					if (P.is(":visible")) if (($curr = w()) && $curr.next().length > 0) {
+						$curr.removeClass(c.selectClass).next().addClass(c.selectClass);
+						m = L.attr("scrollTop");
+						t = $curr[0];
+						if (F()) p = document.getBoxObjectFor(L[0]).y + L.attr("offsetHeight"),
+						n = document.getBoxObjectFor(t).y + $curr.attr("offsetHeight"),
+						o = document.getBoxObjectFor(t).height;
+						else if (Ma()) p = L[0].getBoundingClientRect().bottom,
+						t = t.getBoundingClientRect(),
+						n = t.bottom,
+						o = n - t.top;
+						n >= p && L.attr("scrollTop", m + o)
+					} else $curr || L.children("div:first-child").addClass(c.selectClass);
+					else d(true);
+					break;
+				case 13:
+					w() ? aa() : d(true);
+					break;
+				case 27:
+					q();
+					break;
+				case 34:
+					if (c.paging) a("#" + ha.attr("id") + "n").click();
+					else if (($curr = w()) && $curr.next().length > 0) {
+						$curr.removeClass(c.selectClass);
+						for (m = 0; m < c.maxVisibleRows; m++) $curr.next().length > 0 && ($curr = $curr.next());
+						$curr.addClass(c.selectClass);
+						m = L.attr("scrollTop");
+						L.attr("scrollTop", m + L.height())
+					} else $curr || L.children("div:first-child").addClass(c.selectClass);
+					break;
+				case 33:
+					if (c.paging) a("#" + ha.attr("id") + "p").click();
+					else if (($curr = w()) && $curr.prev().length > 0) {
+						$curr.removeClass(c.selectClass);
+						for (m = 0; m < c.maxVisibleRows; m++) $curr.prev().length > 0 && ($curr = $curr.prev());
+						$curr.addClass(c.selectClass);
+						m = L.attr("scrollTop");
+						L.attr("scrollTop", m - L.height())
+					} else $curr || L.children("div:last-child").addClass(c.selectClass)
+				} else ! j && ! f && ! g && d(false, h)
+			}
+		});
+		c.initialValue !== "" ? G.val(c.initialValue).removeClass("watermark") : G.val(c.watermark).addClass("watermark");
+		var Da = 0;
+		if (c.showArrow && c.showResults) {
+			var Y = function() {
+				P.is(":visible") ? q() : (G.focus(), c.watermark !== "" && G.val() === c.watermark ? G.val("") : G.select(), M && clearTimeout(M), M = setTimeout(function() {
+					f(1, true, c.arrowQuery)
+				},
+				c.queryDelay))
+			},
+			Da = a("<span></span>").attr("id", ha.attr("id") + "_arrow").addClass(c.arrowClass).addClass("out").hover(function() {
+				a(this).removeClass("out").addClass("over")
+			},
+			function() {
+				a(this).removeClass("over").addClass("out")
+			}).mousedown(function() {
+				a(this).removeClass("over").addClass("active")
+			}).mouseup(function() {
+				a(this).removeClass("active").addClass("over")
+			}).click(Y).appendTo(ha).width();
+			G.css("width", c.width - Da + "px")
+		}
+		if (!c.allowInput) c.selectFirstMatch = false,
+		G.click(Y);
+		var Y = G.outerHeight() - G.height() - 2,
+		Z = G.outerWidth() - 2,
+		da = G.outerHeight();
+		Y === 0 ? (Z += 4, da += 4) : Y !== 4 && (Z += Y, da += Y);
+		var P = a("<div></div>").attr("id", ha.attr("id") + "_ctr").css("width", Z + Da).css("top", da).css("left", 0).addClass(c.containerClass).appendTo(ha).mousedown(function() {
+			G.data("active", true)
+		}).hide(),
+		L = a("<div></div>").addClass(c.contentClass).appendTo(P).scroll(function() {}),
+		U = a("<div></div>").appendTo(P);
+		ha.css("height", G.outerHeight());
+		String.prototype.applyTemplate = function(a) {
+			try {
+				return a === "" ? this: this.replace(/{([^{}]*)}/g, function(b, c) {
+					var d;
+					if (c.indexOf(".") !== - 1) {
+						d = c.split(".");
+						for (var g = a, f = 0; f < d.length; f++) g = g[d[f]];
+						d = g
+					} else d = a[c];
+					if (typeof d === "string" || typeof d === "number") return d;
+					else throw b;
+				})
+			} catch(b) {
+				alert("Invalid JSON property " + b + " found when trying to apply resultTemplate or paging.summaryTemplate.\nPlease check your spelling and try again.")
+			}
+		}
+	};
+	a.fn.flexbox = function(b, c) {
+		if (b) try {
+			var d = a.fn.flexbox.defaults,
+			f = a.extend({},
+			d, c),
+			h;
+			for (h in f) if (d[h] === void 0) throw "Invalid option specified: " + h + "\nPlease check your spelling and try again.";
+			f.source = b;
+			if (c) {
+				f.paging = c.paging || c.paging == null ? a.extend({},
+				d.paging, c.paging) : false;
+				for (h in f.paging) if (d.paging[h] === void 0) throw "Invalid option specified: " + h + "\nPlease check your spelling and try again.";
+				if (c.displayValue && ! c.hiddenValue) f.hiddenValue = c.displayValue
+			}
+			this.each(function() {
+				new a.flexbox(this, f)
+			});
+			return this
+		} catch(n) {
+			typeof n === "object" ? alert(n.message) : alert(n)
+		}
+	};
+	a.fn.flexbox.defaults = {
+		method: "GET",
+		queryDelay: 100,
+		allowInput: true,
+		containerClass: "ffb",
+		contentClass: "content",
+		selectClass: "ffb-sel",
+		inputClass: "ffb-input",
+		arrowClass: "ffb-arrow",
+		matchClass: "ffb-match",
+		noResultsText: "No matching results",
+		noResultsClass: "ffb-no-results",
+		showResults: true,
+		selectFirstMatch: true,
+		autoCompleteFirstMatch: false,
+		highlightMatches: true,
+		highlightMatchesRegExModifier: "i",
+		minChars: 1,
+		showArrow: true,
+		arrowQuery: "",
+		onSelect: false,
+		maxCacheBytes: 32768,
+		resultTemplate: "{name}",
+		displayValue: "name",
+		hiddenValue: "id",
+		initialValue: "",
+		watermark: "",
+		width: 200,
+		resultsProperty: "results",
+		totalProperty: "total",
+		maxVisibleRows: 0,
+		paging: {
+			style: "input",
+			cssClass: "paging",
+			pageSize: 10,
+			maxPageLinks: 5,
+			showSummary: true,
+			summaryClass: "summary",
+			summaryTemplate: "Displaying {start}-{end} of {total} results"
+		}
+	};
+	a.fn.setValue = function(b) {
+		var c = "#" + this.attr("id");
+		a(c + "_hidden," + c + "_input").val(b).removeClass("watermark")
+	}
+})(jQuery);
+$.fx.speeds._default = 500;
+$(function() {
+	$("#open-chat").click(function() {
+		$("#chat-frame").css("display") == "none" ? ($("#chat-frame").fadeIn(300), $("#chat-icon").attr("src", "/static/icons/chat.gif")) : $("#chat-frame").fadeOut(300);
+		return false
+	});
+	$("#chat-close").click(function() {
+		$("#chat-frame").fadeOut(300)
+	})
+});
+var chat = {
+	stringify: function(a) {
+		var b = typeof a;
+		if (b != "object" || a === null) return b == "string" && (a = '"' + a + '"'),
+		String(a);
+		else {
+			var c, d, f = [],
+			h = a && a.constructor == Array;
+			for (c in a) d = a[c],
+			b = typeof d,
+			b == "string" ? d = '"' + d + '"': b == "object" && d !== null && (d = JSON.stringify(d)),
+			f.push((h ? "": '"' + c + '":') + String(d));
+			return (h ? "[": "{") + String(f) + (h ? "]": "}")
+		}
+	},
+	linsearch: function(a, b) {
+		k = false;
+		for (var c = 0; c <= a.length - 1; c++) if (a[c] == b) {
+			k = true;
+			break
+		}
+		return k
+	},
+	check_userslist: function(a, b) {
+		k = true;
+		for (var c = 0; c <= b.length - 1; c++) if (chat.linsearch(a, b[c]) == false) {
+			k = false;
+			break
+		}
+		for (c = 0; c <= a.length - 1; c++) if (chat.linsearch(b, a[c]) == false) {
+			k = false;
+			break
+		}
+		return k
+	},
+	check_conferenceslist: function(a, b) {
+		for (var c = 0; c <= b.length - 1; c++) if (chat.linsearch(a, b[c]) == false) chat.ui.on_close_conference(b[c])
+	},
+	parse_json_conference: function(a) {
+		chat.events.on_conferences_list(a.conferences);
+		chat.events.on_users_list(a.users);
+		chat.events.on_messages(a.new_data);
+		if (a.notifications) a.notifications.length = a.notifications.length || [],
+		a.notifications.length > 0 && treeio.process_notifications(a.notifications)
+	},
+	get_location: function() {
+		return window.location.hash == "" ? "#": "" + window.location.hash
+	},
+	sendJSON: function(a) {
+		a.location = chat.get_location();
+		data = chat.stringify(a);
+		$.ajax({
+			type: "POST",
+			url: chat.option.url,
+			typedata: "json",
+			data: {
+				json: data
+			},
+			timeout: chat.option.timeout,
+			success: function(a) {
+				chat.parse_json_conference(a)
+			}
+		})
+	},
+	connect: function() {
+		chat.sendJSON({
+			cmd: "Connect"
+		});
+		chat.events.on_connect()
+	},
+	disconnect: function() {
+		sendJSON({
+			cmd: "Disconnect"
+		});
+		chat.events.on_disconnect()
+	},
+	send: function(a, b) {
+		json = {
+			cmd: "Message",
+			data: {
+				id: a,
+				text: b
+			}
+		};
+		chat.sendJSON(json)
+	},
+	exit_from_conference: function(a) {
+		json = {
+			cmd: "Exit",
+			data: {
+				id: a
+			}
+		};
+		chat.sendJSON(json)
+	},
+	get_new_messages: function() {
+		json = {
+			cmd: "Get",
+			location: chat.get_location()
+		};
+		data = chat.stringify(json);
+		$.ajax({
+			type: "POST",
+			url: chat.option.url,
+			typedata: "json",
+			data: {
+				json: data
+			},
+			timeout: chat.option.timeout,
+			success: function(a) {
+				chat.parse_json_conference(a)
+			},
+			complete: function() {
+				setTimeout(chat.get_new_messages, chat.option.interval)
+			}
+		})
+	},
+	delete_conference: function(a) {
+		json = {
+			cmd: "Delete",
+			data: {
+				id: a
+			}
+		};
+		chat.sendJSON(json)
+	},
+	remove_users_in_conference: function(a, b) {
+		json = {
+			cmd: "Remove",
+			data: {
+				id: a,
+				users: b
+			}
+		};
+		chat.sendJSON(json)
+	},
+	add_users_in_conference: function(a, b) {
+		json = {
+			cmd: "Add",
+			data: {
+				id: a,
+				users: b
+			}
+		};
+		chat.sendJSON(json)
+	},
+	create_conference: function(a, b) {
+		json = {
+			cmd: "Create",
+			data: {
+				title: a,
+				users: b
+			}
+		};
+		chat.sendJSON(json)
+	}
+};
+chat.events = {
+	on_connect: function() {
+		chat.get_new_messages()
+	},
+	on_disconnect: function() {},
+	on_messages: function() {},
+	on_users_list: function() {},
+	on_conferences_list: function() {}
+};
+chat.option = {
+	interval: 25E3,
+	url: "/chat",
+	timeout: 6E4
+};
+chat.ui = {
+	add_nick_in_input: function(a) {
+		$("#chat-input-msg").val($("#chat-input-msg").val() + a + ": ");
+		$("#chat-input-msg").focus()
+	},
+	get_id_active_conference: function() {
+		activeTab = $("#chat-tabs").tabs("option", "selected");
+		id_conference = $($(".ui-tabs-panel").get()[activeTab]).attr("id");
+		return "" + id_conference
+	},
+	send_msg: function() {
+		chat.send(chat.ui.get_id_active_conference(), $("#chat-input-msg").val());
+		$("#chat-input-msg").val("")
+	},
+	get_json_userlist: function() {
+		data = {
+			results: []
+		};
+		$.each($(".chat-users p"), function() {
+			$(this).text() != "+" && data.results.push({
+				id: $(this).attr("user"),
+				name: $(this).text()
+			})
+		});
+		return data
+	},
+	on_close_conference: function(a) {
+		$("li a[href=#" + a + "]").prev("img").attr("src", "/static/icons/forest.png");
+		delete chat.conferences_dic[a]
+	}
+};
+chat.conferences_dic = {};
+chat.userslist = {
+	results: [],
+	users: []
+};
+chat.events.on_users_list = function(a) {
+	a = a || [];
+	users_list = function() {
+		list = [];
+		if (a) for (var b = 0; b < a.length; b++) list.push(a[b].name);
+		return list
+	} ();
+	$("#chat-title").text("Chat (" + a.length + ")");
+	if (a.length > 0) if (chat.check_userslist(chat.userslist.users, users_list) == false) {
+		$(".chat-users").html("");
+		for (var b = 0; b < a.length; b++) $("<div/>").append($("<p/>", {
+			text: a[b].profile,
+			user: a[b].name
+		}).bind("dblclick", function() {
+			chat.create_conference($(this).text().split(" ", 1), [$(this).attr("user")])
+		})).append($("<span/>").addClass("chat-users-actions").append($("<a/>", {
+			text: "+",
+			user: a[b].name
+		}).addClass("chat-invite-user").bind("click", function() {
+			chat.add_users_in_conference(chat.ui.get_id_active_conference(), [$(this).attr("user")]);
+			$("a.chat-invite-user").hide();
+			$("div.chat-fb-div").hide()
+		})).append(' <a href="' + a[b].location + '">#</a>')).append($("<br/>")).appendTo(".chat-users");
+		a.length == 0 && $(".chat-users").html("<p>No users online</p>");
+		chat.userslist.results = chat.ui.get_json_userlist().results;
+		$(".chat-fb").html("");
+		$(".chat-fb").flexbox(chat.ui.get_json_userlist(), {
+			width: 100,
+			maxVisibleRows: 10,
+			onSelect: function() {
+				chat.add_users_in_conference(chat.ui.get_id_active_conference(), [$(this).attr("hiddenvalue")])
+			}
+		})
+	} else for (b = 0; b < a.length; b++) $("a[user='" + a[b].name + "'] + a").attr("href", a[b].location);
+	else $(".chat-users").html(""),
+	$(".chat-users").append($("<p/>", {
+		text: "No users online"
+	}));
+	chat.userslist.users = users_list
+};
+chat.events.on_conferences_list = function(a) {
+	function b(a) {
+		list = [];
+		a = a || [];
+		if (a.length > 0) for (var b = 0; b < a.length; b++) list.push(a[b].username);
+		return list
+	}
+	function c() {
+		$("<p/>").text("Between you,").appendTo("#" + conference.id + " .chat-with");
+		for (var a = 0; a < conference.users.length; a++) user = conference.users[a],
+		$("<p/>").text(user.profile.split(" ", 1)[0]).appendTo("#" + conference.id + " .chat-with");
+		$("<p/>").append($("<a/>", {
+			text: "Invite more people"
+		}).attr("class", "chat-invite").bind("click", function() {
+			$("#" + chat.ui.get_id_active_conference() + " .chat-fb-div").toggle();
+			$("a.chat-invite-user").toggle();
+			$("#" + chat.ui.get_id_active_conference() + " .chat-fb #_input").focus()
+		})).appendTo("#" + conference.id + " .chat-with");
+		conference.users.length == 2 && $("a[href='#" + conference.id + "']").text(conference.users[0].profile.split(" ", 1)[0] + " and " + conference.users[1].profile.split(" ", 1)[0]);
+		conference.users.length > 2 && $("a[href='#" + conference.id + "']").text(conference.users[0].profile.split(" ", 1)[0] + ", " + conference.users[1].profile.split(" ", 1)[0] + ", ...")
+	}
+	a = a || [];
+	my_list_conferences = [];
+	list_conferences = function(a) {
+		list = [];
+		a = a || [];
+		if (a.length > 0) for (var b = 0; b < a.length; b++) list.push(a[b].id);
+		return list
+	} (a);
+	for (var d in chat.conferences_dic) my_list_conferences.push(d);
+	chat.check_conferenceslist(list_conferences, my_list_conferences);
+	if (a.length > 0) for (d = 0; d < a.length; d++) conference = a[d],
+	id = conference.id,
+	list_users = b(conference.users),
+	chat.conferences_dic[id] ? chat.check_userslist(chat.conferences_dic[conference.id].users, list_users) == false && ($("#" + conference.id + " .chat-with").html(""), c()) : ($("#chat-tabs").tabs("add", "#" + conference.id, conference.title), chat.conferences_dic[id] = {},
+	chat.conferences_dic[id].active = true, chat.conferences_dic[id].users = [], $("<div/>").attr("class", "chat-with small").appendTo("#" + conference.id), $("<div/>").attr("class", "chat-fb-div").append($("<div/>").attr("class", "chat-fb").flexbox(chat.userslist, {
+		width: 100,
+		maxVisibleRows: 10,
+		onSelect: function() {
+			chat.add_users_in_conference(chat.ui.get_id_active_conference(), [$(this).attr("hiddenvalue")])
+		}
+	})).append($("<div/>").attr("class", "ui-icon ui-icon-close vertical").bind("click", function() {
+		$(this).parent().hide();
+		$("a.chat-invite-user").hide()
+	})).appendTo("#" + conference.id), $("<div/>").attr("class", "chat-body").appendTo("#" + conference.id), c()),
+	chat.conferences_dic[conference.id].users = b(conference.users)
+};
+chat.events.on_messages = function(a) {
+	a = a || [];
+	if (a.length > 0) {
+		for (var b = 0; b < a.length; b++) {
+			new_msg = a[b];
+			for (var c in new_msg) {
+				msg = new_msg[c].messages;
+				for (var d = 0; d < msg.length; d++) text = msg[d].text,
+				date = msg[d].date,
+				time = msg[d].time,
+				user = msg[d].user,
+				profile = msg[d].profile,
+				$("<div/>").attr("class", "message").append($("<div/>", {
+					text: "[" + time + "]"
+				}).attr("class", "time")).append($("<div/>", {
+					user: user,
+					text: "<" + profile + "> "
+				}).attr("class", "nick").bind("click", function() {
+					chat.ui.add_nick_in_input($(this).text().slice(1, - 2))
+				})).append($("<div/>", {
+					text: " " + text
+				}).attr("class", "text")).appendTo("#" + c + " .chat-body");
+				msg.length > 0 && $("li a[href=#" + c + "]").prev("img").fadeIn(100).fadeOut(100).fadeIn(100).fadeOut(100).fadeIn(100).fadeOut(100).fadeIn(100);
+				$("#" + c + " .chat-body").animate({
+					scrollTop: $("#" + c + " .chat-body").attr("scrollHeight")
+				},
+				1E3)
+			}
+		}
+		$("#chat-frame").css("display") == "none" && $("#chat-icon").attr("src", "/static/icons/chat-active.gif").fadeOut(100).fadeIn(100).fadeOut(100).fadeIn(100).fadeOut(100).fadeIn(100)
+	}
+};
+$(function() {
+	$("#chat-tabs").tabs({
+		tabTemplate: "<li><img src='/static/icons/forest-active.png' class='margin-bottom' style='float: left;'><a href='#{href}'>#{label}</a><span class='ui-icon ui-icon-close'>Remove Tab</span></li>"
+	});
+	$("#chat-tabs li span.ui-icon-close").live("click", function() {
+		delete chat.conferences_dic[chat.ui.get_id_active_conference()];
+		chat.exit_from_conference(chat.ui.get_id_active_conference());
+		var a = $("li", $("#chat-tabs")).index($(this).parent());
+		$("#chat-tabs").tabs("remove", a)
+	});
+	$("#chat-input-msg").keypress(function(a) {
+		if (a.which == "13") return chat.ui.send_msg(),
+		false
+	});
+	$("#chat-btn-send").click(chat.ui.send_msg);
+	chat.connect();
+	$(".chat-fb").flexbox(chat.ui.get_json_userlist(), {
+		width: 100,
+		maxVisibleRows: 10,
+		onSelect: function() {
+			chat.add_users_in_conference(chat.ui.get_id_active_conference(), [$(this).attr("hiddenvalue")])
+		}
+	})
+});
+$(function() {
+	var a = $("#tab_title"),
+	b = $("#chat-dialog").dialog({
+		autoOpen: false,
+		modal: true,
+		buttons: {
+			Invite: function() {
+				users = [];
+				$.each($(".chat-dialog-users input:checked"), function() {
+					users.push($(this).attr("name"))
+				});
+				users.length > 0 && chat.add_users_in_conference(chat.ui.get_id_active_conference(), users);
+				$(this).dialog("close")
+			},
+			Cancel: function() {
+				$(this).dialog("close")
+			}
+		},
+		open: function() {
+			$(".chat-dialog-users").html("");
+			$.each($(".chat-users p"), function() {
+				$("<input>", {
+					name: $(this).attr("user"),
+					type: "CHECKBOX"
+				}).appendTo($(".chat-dialog-users"));
+				$(".chat-dialog-users").append($(this).text()).append($("<br/>"))
+			});
+			a.focus()
+		},
+		close: function() {
+			c[0].reset()
+		}
+	}),
+	c = $("form", b).submit(function() {
+		b.dialog("close");
+		return false
+	})
+});
+Date.CultureInfo = {
+	name: "en-US",
+	englishName: "English (United States)",
+	nativeName: "English (United States)",
+	dayNames: "Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday".split(","),
+	abbreviatedDayNames: "Sun,Mon,Tue,Wed,Thu,Fri,Sat".split(","),
+	shortestDayNames: "Su,Mo,Tu,We,Th,Fr,Sa".split(","),
+	firstLetterDayNames: "S,M,T,W,T,F,S".split(","),
+	monthNames: "January,February,March,April,May,June,July,August,September,October,November,December".split(","),
+	abbreviatedMonthNames: "Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec".split(","),
+	amDesignator: "AM",
+	pmDesignator: "PM",
+	firstDayOfWeek: 0,
+	twoDigitYearMax: 2029,
+	dateElementOrder: "mdy",
+	formatPatterns: {
+		shortDate: "M/d/yyyy",
+		longDate: "dddd, MMMM dd, yyyy",
+		shortTime: "h:mm tt",
+		longTime: "h:mm:ss tt",
+		fullDateTime: "dddd, MMMM dd, yyyy h:mm:ss tt",
+		sortableDateTime: "yyyy-MM-ddTHH:mm:ss",
+		universalSortableDateTime: "yyyy-MM-dd HH:mm:ssZ",
+		rfc1123: "ddd, dd MMM yyyy HH:mm:ss GMT",
+		monthDay: "MMMM dd",
+		yearMonth: "MMMM, yyyy"
+	},
+	regexPatterns: {
+		jan: /^jan(uary)?/i,
+		feb: /^feb(ruary)?/i,
+		mar: /^mar(ch)?/i,
+		apr: /^apr(il)?/i,
+		may: /^may/i,
+		jun: /^jun(e)?/i,
+		jul: /^jul(y)?/i,
+		aug: /^aug(ust)?/i,
+		sep: /^sep(t(ember)?)?/i,
+		oct: /^oct(ober)?/i,
+		nov: /^nov(ember)?/i,
+		dec: /^dec(ember)?/i,
+		sun: /^su(n(day)?)?/i,
+		mon: /^mo(n(day)?)?/i,
+		tue: /^tu(e(s(day)?)?)?/i,
+		wed: /^we(d(nesday)?)?/i,
+		thu: /^th(u(r(s(day)?)?)?)?/i,
+		fri: /^fr(i(day)?)?/i,
+		sat: /^sa(t(urday)?)?/i,
+		future: /^next/i,
+		past: /^last|past|prev(ious)?/i,
+		add: /^(\+|aft(er)?|from|hence)/i,
+		subtract: /^(\-|bef(ore)?|ago)/i,
+		yesterday: /^yes(terday)?/i,
+		today: /^t(od(ay)?)?/i,
+		tomorrow: /^tom(orrow)?/i,
+		now: /^n(ow)?/i,
+		millisecond: /^ms|milli(second)?s?/i,
+		second: /^sec(ond)?s?/i,
+		minute: /^mn|min(ute)?s?/i,
+		hour: /^h(our)?s?/i,
+		week: /^w(eek)?s?/i,
+		month: /^m(onth)?s?/i,
+		day: /^d(ay)?s?/i,
+		year: /^y(ear)?s?/i,
+		shortMeridian: /^(a|p)/i,
+		longMeridian: /^(a\.?m?\.?|p\.?m?\.?)/i,
+		timezone: /^((e(s|d)t|c(s|d)t|m(s|d)t|p(s|d)t)|((gmt)?\s*(\+|\-)\s*\d\d\d\d?)|gmt|utc)/i,
+		ordinalSuffix: /^\s*(st|nd|rd|th)/i,
+		timeContext: /^\s*(\:|a(?!u|p)|p)/i
+	},
+	timezones: [{
+		name: "UTC",
+		offset: "-000"
+	},
+	{
+		name: "GMT",
+		offset: "-000"
+	},
+	{
+		name: "EST",
+		offset: "-0500"
+	},
+	{
+		name: "EDT",
+		offset: "-0400"
+	},
+	{
+		name: "CST",
+		offset: "-0600"
+	},
+	{
+		name: "CDT",
+		offset: "-0500"
+	},
+	{
+		name: "MST",
+		offset: "-0700"
+	},
+	{
+		name: "MDT",
+		offset: "-0600"
+	},
+	{
+		name: "PST",
+		offset: "-0800"
+	},
+	{
+		name: "PDT",
+		offset: "-0700"
+	}]
+};
+(function() {
+	var a = Date,
+	b = a.prototype,
+	c = a.CultureInfo,
+	d = function(a, b) {
+		b || (b = 2);
+		return ("000" + a).slice(b * - 1)
+	};
+	b.clearTime = function() {
+		this.setHours(0);
+		this.setMinutes(0);
+		this.setSeconds(0);
+		this.setMilliseconds(0);
+		return this
+	};
+	b.setTimeToNow = function() {
+		var a = new Date;
+		this.setHours(a.getHours());
+		this.setMinutes(a.getMinutes());
+		this.setSeconds(a.getSeconds());
+		this.setMilliseconds(a.getMilliseconds());
+		return this
+	};
+	a.today = function() {
+		return (new Date).clearTime()
+	};
+	a.compare = function(a, b) {
+		if (isNaN(a) || isNaN(b)) throw Error(a + " - " + b);
+		else if (a instanceof Date && b instanceof Date) return a < b ? - 1: a > b ? 1: 0;
+		else throw new TypeError(a + " - " + b);
+	};
+	a.equals = function(a, b) {
+		return a.compareTo(b) === 0
+	};
+	a.getDayNumberFromName = function(a) {
+		for (var b = c.dayNames, d = c.abbreviatedDayNames, f = c.shortestDayNames, a = a.toLowerCase(), h = 0; h < b.length; h++) if (b[h].toLowerCase() == a || d[h].toLowerCase() == a || f[h].toLowerCase() == a) return h;
+		return - 1
+	};
+	a.getMonthNumberFromName = function(a) {
+		for (var b = c.monthNames, d = c.abbreviatedMonthNames, a = a.toLowerCase(), f = 0; f < b.length; f++) if (b[f].toLowerCase() == a || d[f].toLowerCase() == a) return f;
+		return - 1
+	};
+	a.isLeapYear = function(a) {
+		return a % 4 === 0 && a % 100 !== 0 || a % 400 === 0
+	};
+	a.getDaysInMonth = function(b, c) {
+		return [31, a.isLeapYear(b) ? 29: 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31][c]
+	};
+	a.getTimezoneAbbreviation = function(a) {
+		for (var b = c.timezones, d = 0; d < b.length; d++) if (b[d].offset === a) return b[d].name;
+		return null
+	};
+	a.getTimezoneOffset = function(a) {
+		for (var b = c.timezones, d = 0; d < b.length; d++) if (b[d].name === a.toUpperCase()) return b[d].offset;
+		return null
+	};
+	b.clone = function() {
+		return new Date(this.getTime())
+	};
+	b.compareTo = function(a) {
+		return Date.compare(this, a)
+	};
+	b.equals = function(a) {
+		return Date.equals(this, a || new Date)
+	};
+	b.between = function(a, b) {
+		return this.getTime() >= a.getTime() && this.getTime() <= b.getTime()
+	};
+	b.isAfter = function(a) {
+		return this.compareTo(a || new Date) === 1
+	};
+	b.isBefore = function(a) {
+		return this.compareTo(a || new Date) === - 1
+	};
+	b.isToday = function() {
+		return this.isSameDay(new Date)
+	};
+	b.isSameDay = function(a) {
+		return this.clone().clearTime().equals(a.clone().clearTime())
+	};
+	b.addMilliseconds = function(a) {
+		this.setMilliseconds(this.getMilliseconds() + a);
+		return this
+	};
+	b.addSeconds = function(a) {
+		return this.addMilliseconds(a * 1E3)
+	};
+	b.addMinutes = function(a) {
+		return this.addMilliseconds(a * 6E4)
+	};
+	b.addHours = function(a) {
+		return this.addMilliseconds(a * 36E5)
+	};
+	b.addDays = function(a) {
+		this.setDate(this.getDate() + a);
+		return this
+	};
+	b.addWeeks = function(a) {
+		return this.addDays(a * 7)
+	};
+	b.addMonths = function(b) {
+		var c = this.getDate();
+		this.setDate(1);
+		this.setMonth(this.getMonth() + b);
+		this.setDate(Math.min(c, a.getDaysInMonth(this.getFullYear(), this.getMonth())));
+		return this
+	};
+	b.addYears = function(a) {
+		return this.addMonths(a * 12)
+	};
+	b.add = function(a) {
+		if (typeof a == "number") return this._orient = a,
+		this;
+		a.milliseconds && this.addMilliseconds(a.milliseconds);
+		a.seconds && this.addSeconds(a.seconds);
+		a.minutes && this.addMinutes(a.minutes);
+		a.hours && this.addHours(a.hours);
+		a.weeks && this.addWeeks(a.weeks);
+		a.months && this.addMonths(a.months);
+		a.years && this.addYears(a.years);
+		a.days && this.addDays(a.days);
+		return this
+	};
+	var f, h, n;
+	b.getWeek = function() {
+		var a, b, c, d, m;
+		f = ! f ? this.getFullYear() : f;
+		h = ! h ? this.getMonth() + 1: h;
+		n = ! n ? this.getDate() : n;
+		h <= 2 ? (a = f - 1, b = (a / 4 | 0) - (a / 100 | 0) + (a / 400 | 0), c = b - (((a - 1) / 4 | 0) - ((a - 1) / 100 | 0) + ((a - 1) / 400 | 0)), d = 0, m = n - 1 + 31 * (h - 1)) : (a = f, b = (a / 4 | 0) - (a / 100 | 0) + (a / 400 | 0), c = b - (((a - 1) / 4 | 0) - ((a - 1) / 100 | 0) + ((a - 1) / 400 | 0)), d = c + 1, m = n + (153 * (h - 3) + 2) / 5 + 58 + c);
+		a = (a + b) % 7;
+		d = m + 3 - (m + a - d) % 7 | 0;
+		f = h = n = null;
+		return d < 0 ? 53 - ((a - c) / 5 | 0) : d > 364 + c ? 1: (d / 7 | 0) + 1
+	};
+	b.getISOWeek = function() {
+		f = this.getUTCFullYear();
+		h = this.getUTCMonth() + 1;
+		n = this.getUTCDate();
+		return d(this.getWeek())
+	};
+	b.setWeek = function(a) {
+		return this.moveToDayOfWeek(1).addWeeks(a - this.getWeek())
+	};
+	a._validate = function(a, b, c, d) {
+		if (typeof a == "undefined") return false;
+		else if (typeof a != "number") throw new TypeError(a + " is not a Number.");
+		else if (a < b || a > c) throw new RangeError(a + " is not a valid value for " + d + ".");
+		return true
+	};
+	a.validateMillisecond = function(b) {
+		return a._validate(b, 0, 999, "millisecond")
+	};
+	a.validateSecond = function(b) {
+		return a._validate(b, 0, 59, "second")
+	};
+	a.validateMinute = function(b) {
+		return a._validate(b, 0, 59, "minute")
+	};
+	a.validateHour = function(b) {
+		return a._validate(b, 0, 23, "hour")
+	};
+	a.validateDay = function(b, c, d) {
+		return a._validate(b, 1, a.getDaysInMonth(c, d), "day")
+	};
+	a.validateMonth = function(b) {
+		return a._validate(b, 0, 11, "month")
+	};
+	a.validateYear = function(b) {
+		return a._validate(b, 0, 9999, "year")
+	};
+	b.set = function(b) {
+		a.validateMillisecond(b.millisecond) && this.addMilliseconds(b.millisecond - this.getMilliseconds());
+		a.validateSecond(b.second) && this.addSeconds(b.second - this.getSeconds());
+		a.validateMinute(b.minute) && this.addMinutes(b.minute - this.getMinutes());
+		a.validateHour(b.hour) && this.addHours(b.hour - this.getHours());
+		a.validateMonth(b.month) && this.addMonths(b.month - this.getMonth());
+		a.validateYear(b.year) && this.addYears(b.year - this.getFullYear());
+		a.validateDay(b.day, this.getFullYear(), this.getMonth()) && this.addDays(b.day - this.getDate());
+		b.timezone && this.setTimezone(b.timezone);
+		b.timezoneOffset && this.setTimezoneOffset(b.timezoneOffset);
+		b.week && a._validate(b.week, 0, 53, "week") && this.setWeek(b.week);
+		return this
+	};
+	b.moveToFirstDayOfMonth = function() {
+		return this.set({
+			day: 1
+		})
+	};
+	b.moveToLastDayOfMonth = function() {
+		return this.set({
+			day: a.getDaysInMonth(this.getFullYear(), this.getMonth())
+		})
+	};
+	b.moveToNthOccurrence = function(a, b) {
+		var c = 0;
+		if (b > 0) c = b - 1;
+		else if (b === - 1) return this.moveToLastDayOfMonth(),
+		this.getDay() !== a && this.moveToDayOfWeek(a, - 1),
+		this;
+		return this.moveToFirstDayOfMonth().addDays( - 1).moveToDayOfWeek(a, 1).addWeeks(c)
+	};
+	b.moveToDayOfWeek = function(a, b) {
+		var c = (a - this.getDay() + 7 * (b || 1)) % 7;
+		return this.addDays(c === 0 ? c + 7 * (b || 1) : c)
+	};
+	b.moveToMonth = function(a, b) {
+		var c = (a - this.getMonth() + 12 * (b || 1)) % 12;
+		return this.addMonths(c === 0 ? c + 12 * (b || 1) : c)
+	};
+	b.getOrdinalNumber = function() {
+		return Math.ceil((this.clone().clearTime() - new Date(this.getFullYear(), 0, 1)) / 864E5) + 1
+	};
+	b.getTimezone = function() {
+		return a.getTimezoneAbbreviation(this.getUTCOffset())
+	};
+	b.setTimezoneOffset = function(a) {
+		var b = this.getTimezoneOffset();
+		return this.addMinutes(Number(a) * - 6 / 10 - b)
+	};
+	b.setTimezone = function(b) {
+		return this.setTimezoneOffset(a.getTimezoneOffset(b))
+	};
+	b.hasDaylightSavingTime = function() {
+		return Date.today().set({
+			month: 0,
+			day: 1
+		}).getTimezoneOffset() !== Date.today().set({
+			month: 6,
+			day: 1
+		}).getTimezoneOffset()
+	};
+	b.isDaylightSavingTime = function() {
+		return this.hasDaylightSavingTime() && (new Date).getTimezoneOffset() === Date.today().set({
+			month: 6,
+			day: 1
+		}).getTimezoneOffset()
+	};
+	b.getUTCOffset = function() {
+		var a = this.getTimezoneOffset() * - 10 / 6;
+		return a < 0 ? (a = (a - 1E4).toString(), a.charAt(0) + a.substr(2)) : (a = (a + 1E4).toString(), "+" + a.substr(1))
+	};
+	b.getElapsed = function(a) {
+		return (a || new Date) - this
+	};
+	if (!b.toISOString) b.toISOString = function() {
+		function a(b) {
+			return b < 10 ? "0" + b: b
+		}
+		return '"' + this.getUTCFullYear() + "-" + a(this.getUTCMonth() + 1) + "-" + a(this.getUTCDate()) + "T" + a(this.getUTCHours()) + ":" + a(this.getUTCMinutes()) + ":" + a(this.getUTCSeconds()) + 'Z"'
+	};
+	b._toString = b.toString;
+	b.toString = function(a) {
+		var b = this;
+		if (a && a.length == 1) {
+			var f = c.formatPatterns;
+			b.t = b.toString;
+			switch (a) {
+			case "d":
+				return b.t(f.shortDate);
+			case "D":
+				return b.t(f.longDate);
+			case "F":
+				return b.t(f.fullDateTime);
+			case "m":
+				return b.t(f.monthDay);
+			case "r":
+				return b.t(f.rfc1123);
+			case "s":
+				return b.t(f.sortableDateTime);
+			case "t":
+				return b.t(f.shortTime);
+			case "T":
+				return b.t(f.longTime);
+			case "u":
+				return b.t(f.universalSortableDateTime);
+			case "y":
+				return b.t(f.yearMonth)
+			}
+		}
+		var h = function(a) {
+			switch (a * 1) {
+			case 1:
+			case 21:
+			case 31:
+				return "st";
+			case 2:
+			case 22:
+				return "nd";
+			case 3:
+			case 23:
+				return "rd";
+			default:
+				return "th"
+			}
+		};
+		return a ? a.replace(/(\\)?(dd?d?d?|MM?M?M?|yy?y?y?|hh?|HH?|mm?|ss?|tt?|S)/g, function(a) {
+			if (a.charAt(0) === "\\") return a.replace("\\", "");
+			b.h = b.getHours;
+			switch (a) {
+			case "hh":
+				return d(b.h() < 13 ? b.h() === 0 ? 12: b.h() : b.h() - 12);
+			case "h":
+				return b.h() < 13 ? b.h() === 0 ? 12: b.h() : b.h() - 12;
+			case "HH":
+				return d(b.h());
+			case "H":
+				return b.h();
+			case "mm":
+				return d(b.getMinutes());
+			case "m":
+				return b.getMinutes();
+			case "ss":
+				return d(b.getSeconds());
+			case "s":
+				return b.getSeconds();
+			case "yyyy":
+				return d(b.getFullYear(), 4);
+			case "yy":
+				return d(b.getFullYear());
+			case "dddd":
+				return c.dayNames[b.getDay()];
+			case "ddd":
+				return c.abbreviatedDayNames[b.getDay()];
+			case "dd":
+				return d(b.getDate());
+			case "d":
+				return b.getDate();
+			case "MMMM":
+				return c.monthNames[b.getMonth()];
+			case "MMM":
+				return c.abbreviatedMonthNames[b.getMonth()];
+			case "MM":
+				return d(b.getMonth() + 1);
+			case "M":
+				return b.getMonth() + 1;
+			case "t":
+				return b.h() < 12 ? c.amDesignator.substring(0, 1) : c.pmDesignator.substring(0, 1);
+			case "tt":
+				return b.h() < 12 ? c.amDesignator: c.pmDesignator;
+			case "S":
+				return h(b.getDate());
+			default:
+				return a
+			}
+		}):
+		this._toString()
+	}
+})();
+(function() {
+	var a = Date,
+	b = a.prototype,
+	c = a.CultureInfo,
+	d = Number.prototype;
+	b._orient = 1;
+	b._nth = null;
+	b._is = false;
+	b._same = false;
+	b._isSecond = false;
+	d._dateElement = "day";
+	b.next = function() {
+		this._orient = 1;
+		return this
+	};
+	a.next = function() {
+		return a.today().next()
+	};
+	b.last = b.prev = b.previous = function() {
+		this._orient = - 1;
+		return this
+	};
+	a.last = a.prev = a.previous = function() {
+		return a.today().last()
+	};
+	b.is = function() {
+		this._is = true;
+		return this
+	};
+	b.same = function() {
+		this._same = true;
+		this._isSecond = false;
+		return this
+	};
+	b.today = function() {
+		return this.same().day()
+	};
+	b.weekday = function() {
+		return this._is ? (this._is = false, ! this.is().sat() && ! this.is().sun()) : false
+	};
+	b.at = function(b) {
+		return typeof b === "string" ? a.parse(this.toString("d") + " " + b) : this.set(b)
+	};
+	d.fromNow = d.after = function(a) {
+		var b = {};
+		b[this._dateElement] = this;
+		return (!a ? new Date: a.clone()).add(b)
+	};
+	d.ago = d.before = function(a) {
+		var b = {};
+		b[this._dateElement] = this * - 1;
+		return (!a ? new Date: a.clone()).add(b)
+	};
+	var f = "sunday monday tuesday wednesday thursday friday saturday".split(/\s/),
+	h = "january february march april may june july august september october november december".split(/\s/),
+	n = "Millisecond Second Minute Hour Day Week Month Year".split(/\s/),
+	g = "Milliseconds Seconds Minutes Hours Date Week Month FullYear".split(/\s/),
+	p = "final first second third fourth fifth".split(/\s/);
+	b.toObject = function() {
+		for (var a = {}, b = 0; b < n.length; b++) a[n[b].toLowerCase()] = this["get" + g[b]]();
+		return a
+	};
+	a.fromObject = function(a) {
+		a.week = null;
+		return Date.today().set(a)
+	};
+	for (var j = function(b) {
+		return function() {
+			if (this._is) return this._is = false,
+			this.getDay() == b;
+			if (this._nth !== null) {
+				this._isSecond && this.addSeconds(this._orient * - 1);
+				this._isSecond = false;
+				var c = this._nth;
+				this._nth = null;
+				var d = this.clone().moveToLastDayOfMonth();
+				this.moveToNthOccurrence(b, c);
+				if (this > d) throw new RangeError(a.getDayName(b) + " does not occur " + c + " times in the month of " + a.getMonthName(d.getMonth()) + " " + d.getFullYear() + ".");
+				return this
+			}
+			return this.moveToDayOfWeek(b, this._orient)
+		}
+	},
+	o = function(b) {
+		return function() {
+			var d = a.today(),
+			f = b - d.getDay();
+			b === 0 && c.firstDayOfWeek === 1 && d.getDay() !== 0 && (f += 7);
+			return d.addDays(f)
+		}
+	},
+	m = 0; m < f.length; m++) a[f[m].toUpperCase()] = a[f[m].toUpperCase().substring(0, 3)] = m,
+	a[f[m]] = a[f[m].substring(0, 3)] = o(m),
+	b[f[m]] = b[f[m].substring(0, 3)] = j(m);
+	f = function(a) {
+		return function() {
+			return this._is ? (this._is = false, this.getMonth() === a) : this.moveToMonth(a, this._orient)
+		}
+	};
+	j = function(b) {
+		return function() {
+			return a.today().set({
+				month: b,
+				day: 1
+			})
+		}
+	};
+	for (o = 0; o < h.length; o++) a[h[o].toUpperCase()] = a[h[o].toUpperCase().substring(0, 3)] = o,
+	a[h[o]] = a[h[o].substring(0, 3)] = j(o),
+	b[h[o]] = b[h[o].substring(0, 3)] = f(o);
+	f = function(a) {
+		return function(b) {
+			if (this._isSecond) return this._isSecond = false,
+			this;
+			if (this._same) {
+				this._same = this._is = false;
+				for (var c = this.toObject(), b = (b || new Date).toObject(), d = "", f = a.toLowerCase(), g = n.length - 1; g > - 1; g--) {
+					d = n[g].toLowerCase();
+					if (c[d] != b[d]) return false;
+					if (f == d) break
+				}
+				return true
+			}
+			a.substring(a.length - 1) != "s" && (a += "s");
+			return this["add" + a](this._orient)
+		}
+	};
+	j = function(a) {
+		return function() {
+			this._dateElement = a;
+			return this
+		}
+	};
+	for (o = 0; o < n.length; o++) h = n[o].toLowerCase(),
+	b[h] = b[h + "s"] = f(n[o]),
+	d[h] = d[h + "s"] = j(h);
+	b._ss = f("Second");
+	d = function(a) {
+		return function(b) {
+			if (this._same) return this._ss(b);
+			if (b || b === 0) return this.moveToNthOccurrence(b, a);
+			this._nth = a;
+			return a === 2 && (b === void 0 || b === null) ? (this._isSecond = true, this.addSeconds(this._orient)) : this
+		}
+	};
+	for (h = 0; h < p.length; h++) b[p[h]] = h === 0 ? d( - 1) : d(h)
+})();
+(function() {
+	Date.Parsing = {
+		Exception: function(a) {
+			this.message = "Parse error at '" + a.substring(0, 10) + " ...'"
+		}
+	};
+	for (var a = Date.Parsing, b = a.Operators = {
+		rtoken: function(b) {
+			return function(c) {
+				var d = c.match(b);
+				if (d) return [d[0], c.substring(d[0].length)];
+				else throw new a.Exception(c);
+			}
+		},
+		token: function() {
+			return function(a) {
+				return b.rtoken(RegExp("^s*" + a + "s*"))(a)
+			}
+		},
+		stoken: function(a) {
+			return b.rtoken(RegExp("^" + a))
+		},
+		until: function(a) {
+			return function(b) {
+				for (var c = [], d = null; b.length;) {
+					try {
+						d = a.call(this, b)
+					} catch(f) {
+						c.push(d[0]);
+						b = d[1];
+						continue
+					}
+					break
+				}
+				return [c, b]
+			}
+		},
+		many: function(a) {
+			return function(b) {
+				for (var c = [], d = null; b.length;) {
+					try {
+						d = a.call(this, b)
+					} catch(f) {
+						break
+					}
+					c.push(d[0]);
+					b = d[1]
+				}
+				return [c, b]
+			}
+		},
+		optional: function(a) {
+			return function(b) {
+				var c = null;
+				try {
+					c = a.call(this, b)
+				} catch(d) {
+					return [null, b]
+				}
+				return [c[0], c[1]]
+			}
+		},
+		not: function(b) {
+			return function(c) {
+				try {
+					b.call(this, c)
+				} catch(d) {
+					return [null, c]
+				}
+				throw new a.Exception(c);
+			}
+		},
+		ignore: function(a) {
+			return a ? function(b) {
+				var c = null,
+				c = a.call(this, b);
+				return [null, c[1]]
+			}: null
+		},
+		product: function() {
+			for (var a = arguments[0], c = Array.prototype.slice.call(arguments, 1), d = [], f = 0; f < a.length; f++) d.push(b.each(a[f], c));
+			return d
+		},
+		cache: function(b) {
+			var c = {},
+			d = null;
+			return function(f) {
+				try {
+					d = c[f] = c[f] || b.call(this, f)
+				} catch(j) {
+					d = c[f] = j
+				}
+				if (d instanceof a.Exception) throw d;
+				else return d
+			}
+		},
+		any: function() {
+			var b = arguments;
+			return function(c) {
+				for (var d = null, f = 0; f < b.length; f++) if (b[f] != null) {
+					try {
+						d = b[f].call(this, c)
+					} catch(j) {
+						d = null
+					}
+					if (d) return d
+				}
+				throw new a.Exception(c);
+			}
+		},
+		each: function() {
+			var b = arguments;
+			return function(c) {
+				for (var d = [], f = null, j = 0; j < b.length; j++) if (b[j] != null) {
+					try {
+						f = b[j].call(this, c)
+					} catch(o) {
+						throw new a.Exception(c);
+					}
+					d.push(f[0]);
+					c = f[1]
+				}
+				return [d, c]
+			}
+		},
+		all: function() {
+			var a = a;
+			return a.each(a.optional(arguments))
+		},
+		sequence: function(c, d, f) {
+			d = d || b.rtoken(/^\s*/);
+			f = f || null;
+			return c.length == 1 ? c[0] : function(b) {
+				for (var j = null, o = null, m = [], t = 0; t < c.length; t++) {
+					try {
+						j = c[t].call(this, b)
+					} catch(q) {
+						break
+					}
+					m.push(j[0]);
+					try {
+						o = d.call(this, j[1])
+					} catch(w) {
+						o = null;
+						break
+					}
+					b = o[1]
+				}
+				if (!j) throw new a.Exception(b);
+				if (o) throw new a.Exception(o[1]);
+				if (f) try {
+					j = f.call(this, j[1])
+				} catch(aa) {
+					throw new a.Exception(j[1]);
+				}
+				return [m, j ? j[1] : b]
+			}
+		},
+		between: function(a, c, d) {
+			var d = d || a,
+			f = b.each(b.ignore(a), c, b.ignore(d));
+			return function(a) {
+				a = f.call(this, a);
+				return [[a[0][0], r[0][2]], a[1]]
+			}
+		},
+		list: function(a, c, d) {
+			c = c || b.rtoken(/^\s*/);
+			d = d || null;
+			return a instanceof Array ? b.each(b.product(a.slice(0, - 1), b.ignore(c)), a.slice( - 1), b.ignore(d)) : b.each(b.many(b.each(a, b.ignore(c))), px, b.ignore(d))
+		},
+		set: function(c, d, f) {
+			d = d || b.rtoken(/^\s*/);
+			f = f || null;
+			return function(p) {
+				for (var j = null, o = null, m = null, t = [[], p], q = false, w = 0; w < c.length; w++) {
+					j = o = null;
+					q = c.length == 1;
+					try {
+						j = c[w].call(this, p)
+					} catch(aa) {
+						continue
+					}
+					m = [[j[0]], j[1]];
+					if (j[1].length > 0 && ! q) try {
+						o = d.call(this, j[1])
+					} catch(F) {
+						q = true
+					} else q = true; ! q && o[1].length === 0 && (q = true);
+					if (!q) {
+						j = [];
+						for (q = 0; q < c.length; q++) w != q && j.push(c[q]);
+						j = b.set(j, d).call(this, o[1]);
+						j[0].length > 0 && (m[0] = m[0].concat(j[0]), m[1] = j[1])
+					}
+					m[1].length < t[1].length && (t = m);
+					if (t[1].length === 0) break
+				}
+				if (t[0].length === 0) return t;
+				if (f) {
+					try {
+						o = f.call(this, t[1])
+					} catch(Ma) {
+						throw new a.Exception(t[1]);
+					}
+					t[1] = o[1]
+				}
+				return t
+			}
+		},
+		forward: function(a, b) {
+			return function(c) {
+				return a[b].call(this, c)
+			}
+		},
+		replace: function(a, b) {
+			return function(c) {
+				c = a.call(this, c);
+				return [b, c[1]]
+			}
+		},
+		process: function(a, b) {
+			return function(c) {
+				c = a.call(this, c);
+				return [b.call(this, c[0]), c[1]]
+			}
+		},
+		min: function(b, c) {
+			return function(d) {
+				var f = c.call(this, d);
+				if (f[0].length < b) throw new a.Exception(d);
+				return f
+			}
+		}
+	},
+	c = function(a) {
+		return function() {
+			var b = null,
+			c = [];
+			arguments.length > 1 ? b = Array.prototype.slice.call(arguments) : arguments[0] instanceof Array && (b = arguments[0]);
+			if (b) for (var d = b.shift(); 0 < d.length;) return b.unshift(d[0]),
+			c.push(a.apply(null, b)),
+			b.shift(),
+			c;
+			else return a.apply(null, arguments)
+		}
+	},
+	d = "optional not ignore cache".split(/\s/), f = 0; f < d.length; f++) b[d[f]] = c(b[d[f]]);
+	c = function(a) {
+		return function() {
+			return arguments[0] instanceof Array ? a.apply(null, arguments[0]) : a.apply(null, arguments)
+		}
+	};
+	d = "each any all".split(/\s/);
+	for (f = 0; f < d.length; f++) b[d[f]] = c(b[d[f]])
+})();
+(function() {
+	var a = Date,
+	b = a.CultureInfo,
+	c = function(a) {
+		for (var b = [], d = 0; d < a.length; d++) a[d] instanceof Array ? b = b.concat(c(a[d])) : a[d] && b.push(a[d]);
+		return b
+	};
+	a.Grammar = {};
+	a.Translator = {
+		hour: function(a) {
+			return function() {
+				this.hour = Number(a)
+			}
+		},
+		minute: function(a) {
+			return function() {
+				this.minute = Number(a)
+			}
+		},
+		second: function(a) {
+			return function() {
+				this.second = Number(a)
+			}
+		},
+		meridian: function(a) {
+			return function() {
+				this.meridian = a.slice(0, 1).toLowerCase()
+			}
+		},
+		timezone: function(a) {
+			return function() {
+				var b = a.replace(/[^\d\+\-]/g, "");
+				b.length ? this.timezoneOffset = Number(b) : this.timezone = a.toLowerCase()
+			}
+		},
+		day: function(a) {
+			var b = a[0];
+			return function() {
+				this.day = Number(b.match(/\d+/)[0])
+			}
+		},
+		month: function(a) {
+			return function() {
+				this.month = a.length == 3 ? "jan feb mar apr may jun jul aug sep oct nov dec".indexOf(a) / 4: Number(a) - 1
+			}
+		},
+		year: function(a) {
+			return function() {
+				var c = Number(a);
+				this.year = a.length > 2 ? c: c + (c + 2E3 < b.twoDigitYearMax ? 2E3: 1900)
+			}
+		},
+		rday: function(a) {
+			return function() {
+				switch (a) {
+				case "yesterday":
+					this.days = - 1;
+					break;
+				case "tomorrow":
+					this.days = 1;
+					break;
+				case "today":
+					this.days = 0;
+					break;
+				case "now":
+					this.days = 0,
+					this.now = true
+				}
+			}
+		},
+		finishExact: function(b) {
+			for (var b = b instanceof Array ? b: [b], c = 0; c < b.length; c++) b[c] && b[c].call(this);
+			b = new Date;
+			if ((this.hour || this.minute) && ! this.month && ! this.year && ! this.day) this.day = b.getDate();
+			if (!this.year) this.year = b.getFullYear();
+			if (!this.month && this.month !== 0) this.month = b.getMonth();
+			if (!this.day) this.day = 1;
+			if (!this.hour) this.hour = 0;
+			if (!this.minute) this.minute = 0;
+			if (!this.second) this.second = 0;
+			if (this.meridian && this.hour) if (this.meridian == "p" && this.hour < 12) this.hour += 12;
+			else if (this.meridian == "a" && this.hour == 12) this.hour = 0;
+			if (this.day > a.getDaysInMonth(this.year, this.month)) throw new RangeError(this.day + " is not a valid value for days.");
+			b = new Date(this.year, this.month, this.day, this.hour, this.minute, this.second);
+			this.timezone ? b.set({
+				timezone: this.timezone
+			}) : this.timezoneOffset && b.set({
+				timezoneOffset: this.timezoneOffset
+			});
+			return b
+		},
+		finish: function(b) {
+			b = b instanceof Array ? c(b) : [b];
+			if (b.length === 0) return null;
+			for (var d = 0; d < b.length; d++) typeof b[d] == "function" && b[d].call(this);
+			b = a.today();
+			if (this.now && ! this.unit && ! this.operator) return new Date;
+			else this.now && (b = new Date);
+			var d = !! (this.days && this.days !== null || this.orient || this.operator),
+			f,
+			g,
+			h;
+			h = this.orient == "past" || this.operator == "subtract" ? - 1: 1; ! this.now && "hour minute second".indexOf(this.unit) != - 1 && b.setTimeToNow();
+			if ((this.month || this.month === 0) && "year day hour minute second".indexOf(this.unit) != - 1) this.value = this.month + 1,
+			this.month = null,
+			d = true;
+			if (!d && this.weekday && ! this.day && ! this.days) {
+				f = Date[this.weekday]();
+				this.day = f.getDate();
+				if (!this.month) this.month = f.getMonth();
+				this.year = f.getFullYear()
+			}
+			if (d && this.weekday && this.unit != "month") this.unit = "day",
+			f = a.getDayNumberFromName(this.weekday) - b.getDay(),
+			g = 7,
+			this.days = f ? (f + h * g) % g: h * g;
+			if (this.month && this.unit == "day" && this.operator) this.value = this.month + 1,
+			this.month = null;
+			if (this.value != null && this.month != null && this.year != null) this.day = this.value * 1;
+			if (this.month && ! this.day && this.value && (b.set({
+				day: this.value * 1
+			}), ! d)) this.day = this.value * 1;
+			if (!this.month && this.value && this.unit == "month" && ! this.now) this.month = this.value,
+			d = true;
+			if (d && (this.month || this.month === 0) && this.unit != "year") this.unit = "month",
+			f = this.month - b.getMonth(),
+			g = 12,
+			this.months = f ? (f + h * g) % g: h * g,
+			this.month = null;
+			if (!this.unit) this.unit = "day";
+			if (!this.value && this.operator && this.operator !== null && this[this.unit + "s"] && this[this.unit + "s"] !== null) this[this.unit + "s"] = this[this.unit + "s"] + (this.operator == "add" ? 1: - 1) + (this.value || 0) * h;
+			else if (this[this.unit + "s"] == null || this.operator != null) {
+				if (!this.value) this.value = 1;
+				this[this.unit + "s"] = this.value * h
+			}
+			if (this.meridian && this.hour) if (this.meridian == "p" && this.hour < 12) this.hour += 12;
+			else if (this.meridian == "a" && this.hour == 12) this.hour = 0;
+			if (this.weekday && ! this.day && ! this.days && (f = Date[this.weekday](), this.day = f.getDate(), f.getMonth() !== b.getMonth())) this.month = f.getMonth();
+			if ((this.month || this.month === 0) && ! this.day) this.day = 1;
+			if (!this.orient && ! this.operator && this.unit == "week" && this.value && ! this.day && ! this.month) return Date.today().setWeek(this.value);
+			if (d && this.timezone && this.day && this.days) this.day = this.days;
+			return d ? b.add(this) : b.set(this)
+		}
+	};
+	var d = a.Parsing.Operators,
+	f = a.Grammar,
+	h = a.Translator,
+	n;
+	f.datePartDelimiter = d.rtoken(/^([\s\-\.\,\/\x27]+)/);
+	f.timePartDelimiter = d.stoken(":");
+	f.whiteSpace = d.rtoken(/^\s*/);
+	f.generalDelimiter = d.rtoken(/^(([\s\,]|at|@|on)+)/);
+	var g = {};
+	f.ctoken = function(a) {
+		var c = g[a];
+		if (!c) {
+			for (var c = b.regexPatterns, f = a.split(/\s+/), h = [], n = 0; n < f.length; n++) h.push(d.replace(d.rtoken(c[f[n]]), f[n]));
+			c = g[a] = d.any.apply(null, h)
+		}
+		return c
+	};
+	f.ctoken2 = function(a) {
+		return d.rtoken(b.regexPatterns[a])
+	};
+	f.h = d.cache(d.process(d.rtoken(/^(0[0-9]|1[0-2]|[1-9])/), h.hour));
+	f.hh = d.cache(d.process(d.rtoken(/^(0[0-9]|1[0-2])/), h.hour));
+	f.H = d.cache(d.process(d.rtoken(/^([0-1][0-9]|2[0-3]|[0-9])/), h.hour));
+	f.HH = d.cache(d.process(d.rtoken(/^([0-1][0-9]|2[0-3])/), h.hour));
+	f.m = d.cache(d.process(d.rtoken(/^([0-5][0-9]|[0-9])/), h.minute));
+	f.mm = d.cache(d.process(d.rtoken(/^[0-5][0-9]/), h.minute));
+	f.s = d.cache(d.process(d.rtoken(/^([0-5][0-9]|[0-9])/), h.second));
+	f.ss = d.cache(d.process(d.rtoken(/^[0-5][0-9]/), h.second));
+	f.hms = d.cache(d.sequence([f.H, f.m, f.s], f.timePartDelimiter));
+	f.t = d.cache(d.process(f.ctoken2("shortMeridian"), h.meridian));
+	f.tt = d.cache(d.process(f.ctoken2("longMeridian"), h.meridian));
+	f.z = d.cache(d.process(d.rtoken(/^((\+|\-)\s*\d\d\d\d)|((\+|\-)\d\d\:?\d\d)/), h.timezone));
+	f.zz = d.cache(d.process(d.rtoken(/^((\+|\-)\s*\d\d\d\d)|((\+|\-)\d\d\:?\d\d)/), h.timezone));
+	f.zzz = d.cache(d.process(f.ctoken2("timezone"), h.timezone));
+	f.timeSuffix = d.each(d.ignore(f.whiteSpace), d.set([f.tt, f.zzz]));
+	f.time = d.each(d.optional(d.ignore(d.stoken("T"))), f.hms, f.timeSuffix);
+	f.d = d.cache(d.process(d.each(d.rtoken(/^([0-2]\d|3[0-1]|\d)/), d.optional(f.ctoken2("ordinalSuffix"))), h.day));
+	f.dd = d.cache(d.process(d.each(d.rtoken(/^([0-2]\d|3[0-1])/), d.optional(f.ctoken2("ordinalSuffix"))), h.day));
+	f.ddd = f.dddd = d.cache(d.process(f.ctoken("sun mon tue wed thu fri sat"), function(a) {
+		return function() {
+			this.weekday = a
+		}
+	}));
+	f.M = d.cache(d.process(d.rtoken(/^(1[0-2]|0\d|\d)/), h.month));
+	f.MM = d.cache(d.process(d.rtoken(/^(1[0-2]|0\d)/), h.month));
+	f.MMM = f.MMMM = d.cache(d.process(f.ctoken("jan feb mar apr may jun jul aug sep oct nov dec"), h.month));
+	f.y = d.cache(d.process(d.rtoken(/^(\d\d?)/), h.year));
+	f.yy = d.cache(d.process(d.rtoken(/^(\d\d)/), h.year));
+	f.yyy = d.cache(d.process(d.rtoken(/^(\d\d?\d?\d?)/), h.year));
+	f.yyyy = d.cache(d.process(d.rtoken(/^(\d\d\d\d)/), h.year));
+	n = function() {
+		return d.each(d.any.apply(null, arguments), d.not(f.ctoken2("timeContext")))
+	};
+	f.day = n(f.d, f.dd);
+	f.month = n(f.M, f.MMM);
+	f.year = n(f.yyyy, f.yy);
+	f.orientation = d.process(f.ctoken("past future"), function(a) {
+		return function() {
+			this.orient = a
+		}
+	});
+	f.operator = d.process(f.ctoken("add subtract"), function(a) {
+		return function() {
+			this.operator = a
+		}
+	});
+	f.rday = d.process(f.ctoken("yesterday tomorrow today now"), h.rday);
+	f.unit = d.process(f.ctoken("second minute hour day week month year"), function(a) {
+		return function() {
+			this.unit = a
+		}
+	});
+	f.value = d.process(d.rtoken(/^\d\d?(st|nd|rd|th)?/), function(a) {
+		return function() {
+			this.value = a.replace(/\D/g, "")
+		}
+	});
+	f.expression = d.set([f.rday, f.operator, f.value, f.unit, f.orientation, f.ddd, f.MMM]);
+	n = function() {
+		return d.set(arguments, f.datePartDelimiter)
+	};
+	f.mdy = n(f.ddd, f.month, f.day, f.year);
+	f.ymd = n(f.ddd, f.year, f.month, f.day);
+	f.dmy = n(f.ddd, f.day, f.month, f.year);
+	f.date = function(a) {
+		return (f[b.dateElementOrder] || f.mdy).call(this, a)
+	};
+	f.format = d.process(d.many(d.any(d.process(d.rtoken(/^(dd?d?d?|MM?M?M?|yy?y?y?|hh?|HH?|mm?|ss?|tt?|zz?z?)/), function(b) {
+		if (f[b]) return f[b];
+		else throw a.Parsing.Exception(b);
+	}), d.process(d.rtoken(/^[^dMyhHmstz]+/), function(a) {
+		return d.ignore(d.stoken(a))
+	}))), function(a) {
+		return d.process(d.each.apply(null, a), h.finishExact)
+	});
+	var p = {};
+	f.formats = function(a) {
+		if (a instanceof Array) {
+			for (var b = [], c = 0; c < a.length; c++) b.push(p[a[c]] = p[a[c]] || f.format(a[c])[0]);
+			return d.any.apply(null, b)
+		} else return p[a] = p[a] || f.format(a)[0]
+	};
+	f._formats = f.formats('"yyyy-MM-ddTHH:mm:ssZ";yyyy-MM-ddTHH:mm:ssZ;yyyy-MM-ddTHH:mm:ssz;yyyy-MM-ddTHH:mm:ss;yyyy-MM-ddTHH:mmZ;yyyy-MM-ddTHH:mmz;yyyy-MM-ddTHH:mm;ddd, MMM dd, yyyy H:mm:ss tt;ddd MMM d yyyy HH:mm:ss zzz;MMddyyyy;ddMMyyyy;Mddyyyy;ddMyyyy;Mdyyyy;dMyyyy;yyyy;Mdyy;dMyy;d'.split(";"));
+	f._start = d.process(d.set([f.date, f.time, f.expression], f.generalDelimiter, f.whiteSpace), h.finish);
+	f.start = function(a) {
+		try {
+			var b = f._formats.call({},
+			a);
+			if (b[1].length === 0) return b
+		} catch(c) {}
+		return f._start.call({},
+		a)
+	};
+	a._parse = a.parse;
+	a.parse = function(b) {
+		var c = null;
+		if (!b) return null;
+		if (b instanceof Date) return b;
+		try {
+			c = a.Grammar.start.call({},
+			b.replace(/^\s*(\S*(\s+\S+)*)\s*$/, "$1"))
+		} catch(d) {
+			return null
+		}
+		return c[1].length === 0 ? c[0] : null
+	};
+	a.getParseFunction = function(b) {
+		var c = a.Grammar.formats(b);
+		return function(a) {
+			var b = null;
+			try {
+				b = c.call({},
+				a)
+			} catch(d) {
+				return null
+			}
+			return b[1].length === 0 ? b[0] : null
+		}
+	};
+	a.parseExact = function(b, c) {
+		return a.getParseFunction(c)(b)
+	}
+})();
+(function(a) {
+	function b(b) {
+		function c() {
+			var b = h.getBoundaryDatesFromData(j.data, Math.floor(j.slideWidth / j.cellWidth + 5));
+			j.start = b[0];
+			j.end = b[1];
+			p.each(function() {
+				var b = a(this),
+				c = a("<div>", {
+					"class": "ganttview"
+				});
+				(new d(c, j)).render();
+				b.append(c);
+				c = a("div.ganttview-vtheader", b).outerWidth() + a("div.ganttview-slide-container", b).outerWidth();
+				b.css("width", c + 2 + "px");
+				(new f(b, j)).apply()
+			})
+		}
+		var p = this,
+		j = a.extend(true, {
+			showWeekends: true,
+			cellWidth: 21,
+			cellHeight: 31,
+			slideWidth: 400,
+			vHeaderWidth: 100,
+			behavior: {
+				clickable: true,
+				draggable: true,
+				resizable: true
+			}
+		},
+		b);
+		j.data ? c() : j.dataUrl && a.getJSON(j.dataUrl, function(a) {
+			j.data = a;
+			c()
+		})
+	}
+	function c(a, c) {
+		if (a == "setSlideWidth") {
+			var d = $("div.ganttview", this);
+			$("div#ganttChart", this);
+			d.each(function() {
+				var a = $("div.ganttview-vtheader", d).outerWidth();
+				$(d).width(c + 1);
+				$("div.ganttview-slide-container", this).width(c - a);
+				b()
+			})
+		}
+		$("#ganttChart").width(c)
+	}
+	a.fn.ganttView = function() {
+		var a = Array.prototype.slice.call(arguments);
+		a.length == 1 && typeof a[0] == "object" && b.call(this, a[0]);
+		a.length == 2 && typeof a[0] == "string" && c.call(this, a[0], a[1])
+	};
+	$(window).resize(function() {
+		$("#ganttChart").ganttView("setSlideWidth", $("div.module-block").width() - $("td.module-sidebar").width() - 60)
+	});
+	var d = function(b, c) {
+		function d(b, c, f) {
+			c = {
+				id: c.id,
+				name: c.name
+			};
+			a.extend(c, f);
+			b.data("block-data", c)
+		}
+		var f = "Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec".split(",");
+		return {
+			render: function() {
+				for (var o = c.data, m = c.cellHeight, t = a("<div>", {
+					"class": "ganttview-vtheader"
+				}), q = 0; q < o.length; q++) {
+					var w = a("<div>", {
+						"class": "ganttview-vtheader-item"
+					});
+					w.append(a("<div>", {
+						"class": "ganttview-vtheader-item-name",
+						css: {
+							height: o[q].series.length * m + "px"
+						}
+					}).append(o[q].name));
+					var aa = a("<div>", {
+						"class": "ganttview-vtheader-series"
+					}),
+					F = o[q].start,
+					Ma = o[q].end;
+					typeof F !== "undefined" && F !== false && typeof Ma !== "undefined" && Ma !== false && (aa.append(a("<div>", {
+						"class": "ganttview-vtheader-series-name"
+					}).append("")), w.append(aa));
+					for (F = 0; F < o[q].series.length; F++) aa.append(a("<div>", {
+						"class": "ganttview-vtheader-series-name"
+					}).append(o[q].series[F].name));
+					w.append(aa);
+					t.append(w)
+				}
+				b.append(t);
+				o = a("<div>", {
+					"class": "ganttview-slide-container",
+					css: {
+						width: c.slideWidth + "px"
+					}
+				});
+				q = c.start;
+				m = c.end;
+				t = [];
+				t[q.getFullYear()] = [];
+				for (t[q.getFullYear()][q.getMonth()] = [q]; q.compareTo(m) == - 1;) q = q.clone().addDays(1),
+				t[q.getFullYear()] || (t[q.getFullYear()] = []),
+				t[q.getFullYear()][q.getMonth()] || (t[q.getFullYear()][q.getMonth()] = []),
+				t[q.getFullYear()][q.getMonth()].push(q);
+				var m = dates = t,
+				t = c.cellWidth,
+				q = a("<div>", {
+					"class": "ganttview-hzheader"
+				}),
+				w = a("<div>", {
+					"class": "ganttview-hzheader-months"
+				}),
+				aa = a("<div>", {
+					"class": "ganttview-hzheader-days"
+				}),
+				F = 0,
+				M;
+				for (M in m) for (var Q in m[M]) {
+					Ma = m[M][Q].length * t;
+					F += Ma;
+					w.append(a("<div>", {
+						"class": "ganttview-hzheader-month",
+						css: {
+							width: Ma - 1 + "px"
+						}
+					}).append(f[Q] + "/" + M));
+					for (var A in m[M][Q]) aa.append(a("<div>", {
+						"class": "ganttview-hzheader-day"
+					}).append(m[M][Q][A].getDate()))
+				}
+				w.css("width", F + "px");
+				aa.css("width", F + "px");
+				q.append(w).append(aa);
+				o.append(q);
+				M = c.data;
+				m = dates;
+				t = c.cellWidth;
+				q = c.showWeekends;
+				Q = a("<div>", {
+					"class": "ganttview-grid"
+				});
+				A = a("<div>", {
+					"class": "ganttview-grid-row"
+				});
+				for (var v in m) for (var N in m[v]) for (var x in m[v][N]) w = a("<div>", {
+					"class": "ganttview-grid-row-cell"
+				}),
+				h.isWeekend(m[v][N][x]) && q && w.addClass("ganttview-weekend"),
+				A.append(w);
+				v = a("div.ganttview-grid-row-cell", A).length * t;
+				A.css("width", v + "px");
+				Q.css("width", v + "px");
+				for (v = 0; v < M.length; v++) {
+					N = M[v].start;
+					x = M[v].end;
+					typeof N !== "undefined" && N !== false && typeof x !== "undefined" && x !== false && Q.append(A.clone());
+					for (N = 0; N < M[v].series.length; N++) Q.append(A.clone())
+				}
+				o.append(Q);
+				v = c.data;
+				N = a("<div>", {
+					"class": "ganttview-blocks"
+				});
+				for (x = 0; x < v.length; x++) {
+					M = v[x].start;
+					Q = v[x].end;
+					typeof M !== "undefined" && M !== false && typeof Q !== "undefined" && Q !== false && N.append(a("<div>", {
+						"class": "ganttview-block-container"
+					}));
+					for (M = 0; M < v[x].series.length; M++) N.append(a("<div>", {
+						"class": "ganttview-block-container"
+					}))
+				}
+				o.append(N);
+				v = c.data;
+				N = c.cellWidth;
+				x = c.start;
+				M = a("div.ganttview-blocks div.ganttview-block-container", o);
+				for (A = Q = 0; A < v.length; A++) {
+					t = v[A].start;
+					m = v[A].end;
+					typeof t !== "undefined" && t !== false && typeof m !== "undefined" && m !== false && (m = h.daysBetween(t, m) + 1, w = h.daysBetween(x, t), w = a("<div>", {
+						"class": "ganttview-block",
+						title: v[A].label + ", " + m + " days",
+						css: {
+							width: m * N - 9 + "px",
+							"margin-left": w * N + 3 + "px"
+						}
+					}), d(w, v[A], [""]), v[A].color && w.css("background-color", v[A].color), w.append(a("<div>", {
+						"class": "ganttview-block-text"
+					}).text(m)), a(M[Q]).append(w), Q += 1);
+					for (t = 0; t < v[A].series.length; t++) q = v[A].series[t],
+					m = h.daysBetween(q.start, q.end) + 1,
+					w = h.daysBetween(x, q.start),
+					w = a("<div>", {
+						"class": "ganttview-block",
+						title: q.label + ", " + m + " days",
+						css: {
+							width: m * N - 9 + "px",
+							"margin-left": w * N + 3 + "px"
+						}
+					}),
+					d(w, v[A], q),
+					v[A].series[t].color && w.css("background-color", v[A].series[t].color),
+					w.append(a("<div>", {
+						"class": "ganttview-block-text"
+					}).text(m)),
+					a(M[Q]).append(w),
+					Q += 1
+				}
+				b.append(o);
+				o = b.parent();
+				a("div.ganttview-grid-row div.ganttview-grid-row-cell:last-child", o).addClass("last");
+				a("div.ganttview-hzheader-days div.ganttview-hzheader-day:last-child", o).addClass("last");
+				a("div.ganttview-hzheader-months div.ganttview-hzheader-month:last-child", o).addClass("last")
+			}
+		}
+	},
+	f = function(b, c) {
+		function d(b, c) {
+			a("div.ganttview-block", b).live("click", function() {
+				c && c(a(this).data("block-data"))
+			})
+		}
+		function f(b, c, d, g) {
+			a("div.ganttview-block", b).resizable({
+				grid: c,
+				handles: "e,w",
+				stop: function() {
+					var f = a(this);
+					m(b, f, c, d);
+					g && g(f.data("block-data"))
+				}
+			})
+		}
+		function h(b, c, d, f) {
+			a("div.ganttview-block", b).draggable({
+				axis: "x",
+				grid: [c, c],
+				stop: function() {
+					var g = a(this);
+					m(b, g, c, d);
+					f && f(g.data("block-data"))
+				}
+			})
+		}
+		function m(b, c, d, f) {
+			var b = a("div.ganttview-slide-container", b),
+			g = b.scrollLeft(),
+			b = c.offset().left - b.offset().left - 1 + g,
+			g = Math.round(b / d),
+			f = f.clone().addDays(g);
+			c.data("block-data").start = f;
+			g = c.outerWidth();
+			d = Math.round(g / d) - 1;
+			c.data("block-data").end = f.clone().addDays(d);
+			a("div.ganttview-block-text", c).text(d + 1);
+			c.css("top", "").css("left", "").css("position", "relative").css("margin-left", b + "px")
+		}
+		return {
+			apply: function() {
+				c.behavior.clickable && d(b, c.behavior.onClick);
+				c.behavior.resizable && f(b, c.cellWidth, c.start, c.behavior.onResize);
+				c.behavior.draggable && h(b, c.cellWidth, c.start, c.behavior.onDrag)
+			}
+		}
+	},
+	h = {
+		daysBetween: function(a, b) {
+			if (!a || ! b) return 0;
+			a = Date.parse(a);
+			b = Date.parse(b);
+			if (a.getYear() == 1901 || b.getYear() == 8099) return 0;
+			for (var c = 0, d = a.clone(); d.compareTo(b) == - 1;) c += 1,
+			d.addDays(1);
+			return c
+		},
+		isWeekend: function(a) {
+			return a.getDay() % 6 == 0
+		},
+		getBoundaryDatesFromData: function(a, b) {
+			var c = new Date;
+			maxEnd = new Date;
+			for (var d = 0; d < a.length; d++) for (var f = 0; f < a[d].series.length; f++) {
+				var m = Date.parse(a[d].series[f].start),
+				t = Date.parse(a[d].series[f].end);
+				d == 0 && f == 0 && (c = m, maxEnd = t);
+				c.compareTo(m) == 1 && (c = m);
+				maxEnd.compareTo(t) == - 1 && (maxEnd = t)
+			}
+			h.daysBetween(c, maxEnd) < b && (maxEnd = c.clone().addDays(b));
+			return [c, maxEnd]
+		}
+	}
+})(jQuery);
+var qq = qq || {};
+qq.extend = function(a, b) {
+	for (var c in b) a[c] = b[c]
+};
+qq.indexOf = function(a, b, c) {
+	if (a.indexOf) return a.indexOf(b, c);
+	var c = c || 0,
+	d = a.length;
+	for (c < 0 && (c += d); c < d; c++) if (c in a && a[c] === b) return c;
+	return - 1
+};
+qq.getUniqueId = function() {
+	var a = 0;
+	return function() {
+		return a++
+	}
+} ();
+qq.attach = function(a, b, c) {
+	a.addEventListener ? a.addEventListener(b, c, false) : a.attachEvent && a.attachEvent("on" + b, c)
+};
+qq.detach = function(a, b, c) {
+	a.removeEventListener ? a.removeEventListener(b, c, false) : a.attachEvent && a.detachEvent("on" + b, c)
+};
+qq.preventDefault = function(a) {
+	a.preventDefault ? a.preventDefault() : a.returnValue = false
+};
+qq.insertBefore = function(a, b) {
+	b.parentNode.insertBefore(a, b)
+};
+qq.remove = function(a) {
+	a.parentNode.removeChild(a)
+};
+qq.contains = function(a, b) {
+	return a == b ? true: a.contains ? a.contains(b) : !! (b.compareDocumentPosition(a) & 8)
+};
+qq.toElement = function() {
+	var a = document.createElement("div");
+	return function(b) {
+		a.innerHTML = b;
+		b = a.firstChild;
+		a.removeChild(b);
+		return b
+	}
+} ();
+qq.css = function(a, b) {
+	if (b.opacity != null && typeof a.style.opacity != "string" && typeof a.filters != "undefined") b.filter = "alpha(opacity=" + Math.round(100 * b.opacity) + ")";
+	qq.extend(a.style, b)
+};
+qq.hasClass = function(a, b) {
+	return RegExp("(^| )" + b + "( |$)").test(a.className)
+};
+qq.addClass = function(a, b) {
+	qq.hasClass(a, b) || (a.className += " " + b)
+};
+qq.removeClass = function(a, b) {
+	a.className = a.className.replace(RegExp("(^| )" + b + "( |$)"), " ").replace(/^\s+|\s+$/g, "")
+};
+qq.setText = function(a, b) {
+	a.innerText = b;
+	a.textContent = b
+};
+qq.children = function(a) {
+	for (var b = [], a = a.firstChild; a;) a.nodeType == 1 && b.push(a),
+	a = a.nextSibling;
+	return b
+};
+qq.getByClass = function(a, b) {
+	if (a.querySelectorAll) return a.querySelectorAll("." + b);
+	for (var c = [], d = a.getElementsByTagName("*"), f = d.length, h = 0; h < f; h++) qq.hasClass(d[h], b) && c.push(d[h]);
+	return c
+};
+qq.obj2url = function(a, b, c) {
+	var d = [],
+	f = "&",
+	h = function(a, c) {
+		var f = b ? /\[\]$/.test(b) ? b: b + "[" + c + "]": c;
+		f != "undefined" && c != "undefined" && d.push(typeof a === "object" ? qq.obj2url(a, f, true) : Object.prototype.toString.call(a) === "[object Function]" ? encodeURIComponent(f) + "=" + encodeURIComponent(a()) : encodeURIComponent(f) + "=" + encodeURIComponent(a))
+	};
+	if (!c && b) f = /\?/.test(b) ? /\?$/.test(b) ? "": "&": "?",
+	d.push(b),
+	d.push(qq.obj2url(a));
+	else if (Object.prototype.toString.call(a) === "[object Array]" && typeof a != "undefined") for (var n = 0, c = a.length; n < c; ++n) h(a[n], n);
+	else if (typeof a != "undefined" && a !== null && typeof a === "object") for (n in a) h(a[n], n);
+	else d.push(encodeURIComponent(b) + "=" + encodeURIComponent(a));
+	return d.join(f).replace(/^&/, "").replace(/%20/g, "+")
+};
+qq = qq || {};
+qq.FileUploaderBasic = function(a) {
+	this._options = {
+		debug: false,
+		action: "/server/upload",
+		params: {},
+		button: null,
+		multiple: true,
+		maxConnections: 3,
+		allowedExtensions: [],
+		sizeLimit: 0,
+		minSizeLimit: 0,
+		onSubmit: function() {},
+		onProgress: function() {},
+		onComplete: function() {},
+		onAllComplete: function() {},
+		onCancel: function() {},
+		messages: {
+			typeError: "{file} has invalid extension. Only {extensions} are allowed.",
+			sizeError: "{file} is too large, maximum file size is {sizeLimit}.",
+			minSizeError: "{file} is too small, minimum file size is {minSizeLimit}.",
+			emptyError: "{file} is empty, please select files again without it.",
+			onLeave: "The files are being uploaded, if you leave now the upload will be cancelled."
+		},
+		showMessage: function(a) {
+			alert(a)
+		}
+	};
+	qq.extend(this._options, a);
+	this._filesInProgress = 0;
+	this._handler = this._createUploadHandler();
+	if (this._options.button) this._button = this._createUploadButton(this._options.button);
+	this._preventLeaveInProgress()
+};
+qq.FileUploaderBasic.prototype = {
+	setParams: function(a) {
+		this._options.params = a
+	},
+	getInProgress: function() {
+		return this._filesInProgress
+	},
+	_createUploadButton: function(a) {
+		var b = this;
+		return new qq.UploadButton({
+			element: a,
+			multiple: this._options.multiple && qq.UploadHandlerXhr.isSupported(),
+			onChange: function(a) {
+				b._onInputChange(a)
+			}
+		})
+	},
+	_createUploadHandler: function() {
+		var a = this,
+		b;
+		b = qq.UploadHandlerXhr.isSupported() ? "UploadHandlerXhr": "UploadHandlerForm";
+		return new qq[b]({
+			debug: this._options.debug,
+			action: this._options.action,
+			maxConnections: this._options.maxConnections,
+			onProgress: function(b, d, f, h) {
+				a._onProgress(b, d, f, h);
+				a._options.onProgress(b, d, f, h)
+			},
+			onComplete: function(b, d, f) {
+				a._onComplete(b, d, f);
+				a._options.onComplete(b, d, f)
+			},
+			onAllComplete: function(b) {
+				a._options.onAllComplete(b)
+			},
+			onCancel: function(b, d) {
+				a._onCancel(b, d);
+				a._options.onCancel(b, d)
+			}
+		})
+	},
+	_preventLeaveInProgress: function() {},
+	_onSubmit: function() {
+		this._filesInProgress++
+	},
+	_onProgress: function() {},
+	_onComplete: function(a, b, c) {
+		this._filesInProgress--;
+		c.error && this._options.showMessage(c.error)
+	},
+	_onCancel: function() {
+		this._filesInProgress--
+	},
+	_onInputChange: function(a) {
+		this._handler instanceof qq.UploadHandlerXhr ? this._uploadFileList(a.files) : this._validateFile(a) && this._uploadFile(a);
+		this._button.reset()
+	},
+	_uploadFileList: function(a) {
+		for (var b = 0; b < a.length; b++) if (!this._validateFile(a[b])) return;
+		for (b = 0; b < a.length; b++) this._uploadFile(a[b])
+	},
+	_uploadFile: function(a) {
+		var a = this._handler.add(a),
+		b = this._handler.getName(a);
+		this._options.onSubmit(a, b) !== false && (this._onSubmit(a, b), this._handler.upload(a, this._options.params))
+	},
+	_validateFile: function(a) {
+		var b, c;
+		a.value ? b = a.value.replace(/.*(\/|\\)/, "") : (b = a.fileName != null ? a.fileName: a.name, c = a.fileSize != null ? a.fileSize: a.size);
+		if (this._isAllowedExtension(b)) if (c === 0) return this._error("emptyError", b),
+		false;
+		else if (c && this._options.sizeLimit && c > this._options.sizeLimit) return this._error("sizeError", b),
+		false;
+		else {
+			if (c && c < this._options.minSizeLimit) return this._error("minSizeError", b),
+			false
+		} else return this._error("typeError", b),
+		false;
+		return true
+	},
+	_error: function(a, b) {
+		var c = this._options.messages[a],
+		d = this._formatFileName(b),
+		c = c.replace("{file}", d),
+		d = this._options.allowedExtensions.join(", "),
+		c = c.replace("{extensions}", d),
+		d = this._formatSize(this._options.sizeLimit),
+		c = c.replace("{sizeLimit}", d),
+		d = this._formatSize(this._options.minSizeLimit),
+		c = c.replace("{minSizeLimit}", d);
+		this._options.showMessage(c)
+	},
+	_formatFileName: function(a) {
+		a.length > 33 && (a = a.slice(0, 19) + "..." + a.slice( - 13));
+		return a
+	},
+	_isAllowedExtension: function(a) {
+		var a = - 1 !== a.indexOf(".") ? a.replace(/.*[.]/, "").toLowerCase() : "",
+		b = this._options.allowedExtensions;
+		if (!b.length) return true;
+		for (var c = 0; c < b.length; c++) if (b[c].toLowerCase() == a) return true;
+		return false
+	},
+	_formatSize: function(a) {
+		var b = - 1;
+		do a /= 1024,
+		b++;
+		while (a > 99);
+		return Math.max(a, 0.1).toFixed(1) + "kB,MB,GB,TB,PB,EB".split(",")[b]
+	}
+};
+qq.FileUploader = function(a) {
+	qq.FileUploaderBasic.apply(this, arguments);
+	qq.extend(this._options, {
+		element: null,
+		listElement: null,
+		template: '<span class="qq-uploader"><span class="qq-upload-button">' + a.text.attach + '</span><ul class="qq-upload-list"></ul></span>',
+		fileTemplate: '<li><span class="qq-upload-file"></span><span class="qq-upload-spinner"></span><span class="qq-upload-size"></span><a class="qq-upload-cancel" href="#">' + a.text.cancel + '</a><span class="qq-upload-failed-text">' + a.text.failed + "</span></li>",
+		classes: {
+			button: "qq-upload-button",
+			list: "qq-upload-list",
+			file: "qq-upload-file",
+			spinner: "qq-upload-spinner",
+			size: "qq-upload-size",
+			cancel: "qq-upload-cancel",
+			success: "qq-upload-success",
+			fail: "qq-upload-fail"
+		}
+	});
+	qq.extend(this._options, a);
+	this._element = this._options.element;
+	this._element.innerHTML = this._options.template;
+	this._listElement = this._options.listElement || this._find(this._element, "list");
+	this._classes = this._options.classes;
+	this._button = this._createUploadButton(this._find(this._element, "button"));
+	this._bindCancelEvent();
+	this._setupDragDrop()
+};
+qq.extend(qq.FileUploader.prototype, qq.FileUploaderBasic.prototype);
+qq.extend(qq.FileUploader.prototype, {
+	_find: function(a, b) {
+		var c = qq.getByClass(a, this._options.classes[b])[0];
+		if (!c) throw Error("element not found " + b);
+		return c
+	},
+	_setupDragDrop: function() {},
+	_onSubmit: function(a, b) {
+		qq.FileUploaderBasic.prototype._onSubmit.apply(this, arguments);
+		this._addToList(a, b)
+	},
+	_onProgress: function(a, b, c, d) {
+		qq.FileUploaderBasic.prototype._onProgress.apply(this, arguments);
+		var f = this._find(this._getItemByFileId(a), "size");
+		f.style.display = "inline";
+		var h;
+		h = c != d ? Math.round(c / d * 100) + "% from " + this._formatSize(d) : this._formatSize(d);
+		qq.setText(f, h)
+	},
+	_onComplete: function(a, b, c) {
+		qq.FileUploaderBasic.prototype._onComplete.apply(this, arguments);
+		var d = this._getItemByFileId(a);
+		qq.remove(this._find(d, "cancel"));
+		qq.remove(this._find(d, "spinner"));
+		c.success ? $(d).slideUp(300) : qq.innerHTML = ""
+	},
+	_addToList: function(a, b) {
+		var c = qq.toElement(this._options.fileTemplate);
+		c.qqFileId = a;
+		var d = this._find(c, "file");
+		qq.setText(d, this._formatFileName(b));
+		qq.setText(d, this._formatFileName(b));
+		this._find(c, "size").style.display = "none";
+		this._listElement.appendChild(c)
+	},
+	_getItemByFileId: function(a) {
+		for (var b = this._listElement.firstChild; b;) {
+			if (b.qqFileId == a) return b;
+			b = b.nextSibling
+		}
+	},
+	_bindCancelEvent: function() {
+		var a = this;
+		qq.attach(this._listElement, "click", function(b) {
+			var b = b || window.event,
+			c = b.target || b.srcElement;
+			if (qq.hasClass(c, a._classes.cancel)) qq.preventDefault(b),
+			b = c.parentNode,
+			a._handler.cancel(b.qqFileId),
+			qq.remove(b)
+		})
+	}
+});
+qq.UploadDropZone = function() {};
+qq.UploadButton = function(a) {
+	this._options = {
+		element: null,
+		multiple: false,
+		name: "file",
+		onChange: function() {},
+		hoverClass: "qq-upload-button-hover",
+		focusClass: "qq-upload-button-focus"
+	};
+	qq.extend(this._options, a);
+	this._element = this._options.element;
+	qq.css(this._element, {
+		position: "relative",
+		overflow: "hidden",
+		direction: "ltr"
+	});
+	this._input = this._createInput()
+};
+qq.UploadButton.prototype = {
+	getInput: function() {
+		return this._input
+	},
+	reset: function() {
+		this._input.parentNode && qq.remove(this._input);
+		qq.removeClass(this._element, this._options.focusClass);
+		this._input = this._createInput()
+	},
+	_createInput: function() {
+		var a = document.createElement("input");
+		this._options.multiple && a.setAttribute("multiple", "multiple");
+		a.setAttribute("type", "file");
+		a.setAttribute("name", this._options.name);
+		qq.css(a, {
+			position: "absolute",
+			right: 0,
+			top: "6px",
+			fontFamily: "Arial",
+			fontSize: "2px",
+			margin: 0,
+			padding: 0,
+			cursor: "pointer",
+			opacity: 0
+		});
+		this._element.appendChild(a);
+		var b = this;
+		qq.attach(a, "change", function() {
+			b._options.onChange(a)
+		});
+		qq.attach(a, "mouseover", function() {
+			qq.addClass(b._element, b._options.hoverClass)
+		});
+		qq.attach(a, "mouseout", function() {
+			qq.removeClass(b._element, b._options.hoverClass)
+		});
+		qq.attach(a, "focus", function() {
+			qq.addClass(b._element, b._options.focusClass)
+		});
+		qq.attach(a, "blur", function() {
+			qq.removeClass(b._element, b._options.focusClass)
+		});
+		window.attachEvent && a.setAttribute("tabIndex", "-1");
+		return a
+	}
+};
+qq.UploadHandlerAbstract = function(a) {
+	this._options = {
+		debug: false,
+		action: "/upload.php",
+		maxConnections: 999,
+		onProgress: function() {},
+		onComplete: function() {},
+		onAllComplete: function() {},
+		onCancel: function() {}
+	};
+	qq.extend(this._options, a);
+	this._queue = [];
+	this._params = [];
+	this._completed_files = []
+};
+qq.UploadHandlerAbstract.prototype = {
+	log: function(a) {
+		this._options.debug && window.console && console.log("[uploader] " + a)
+	},
+	add: function() {},
+	upload: function(a, b) {
+		var c = this._queue.push(a),
+		d = {};
+		qq.extend(d, b);
+		this._params[a] = d;
+		c <= this._options.maxConnections && this._upload(a, this._params[a])
+	},
+	cancel: function(a) {
+		this._cancel(a);
+		this._dequeue(a)
+	},
+	cancelAll: function() {
+		for (var a = 0; a < this._queue.length; a++) this._cancel(this._queue[a]);
+		this._queue = []
+	},
+	getName: function() {},
+	getSize: function() {},
+	getQueue: function() {
+		return this._queue
+	},
+	_upload: function() {},
+	_cancel: function() {},
+	_dequeue: function(a) {
+		this._queue.splice(qq.indexOf(this._queue, a), 1);
+		a = this._options.maxConnections;
+		this._queue.length >= a && (a = this._queue[a - 1], this._upload(a, this._params[a]));
+		this._queue.length == 0 && this._onAllComplete()
+	},
+	_onAllComplete: function() {
+		this._options.onAllComplete(this._completed_files)
+	}
+};
+qq.UploadHandlerForm = function(a) {
+	qq.UploadHandlerAbstract.apply(this, arguments);
+	this._inputs = {}
+};
+qq.extend(qq.UploadHandlerForm.prototype, qq.UploadHandlerAbstract.prototype);
+qq.extend(qq.UploadHandlerForm.prototype, {
+	add: function(a) {
+		a.setAttribute("name", "qqfile");
+		var b = "qq-upload-handler-iframe" + qq.getUniqueId();
+		this._inputs[b] = a;
+		a.parentNode && qq.remove(a);
+		return b
+	},
+	getName: function(a) {
+		return this._inputs[a].value.replace(/.*(\/|\\)/, "")
+	},
+	_cancel: function(a) {
+		this._options.onCancel(a, this.getName(a));
+		delete this._inputs[a];
+		if (a = document.getElementById(a)) a.setAttribute("src", "javascript:false;"),
+		qq.remove(a)
+	},
+	_upload: function(a, b) {
+		var c = this._inputs[a];
+		if (!c) throw Error("file with passed id was not added, or already uploaded or cancelled");
+		var d = this.getName(a),
+		f = this._createIframe(a),
+		h = this._createForm(f, b);
+		h.appendChild(c);
+		var n = this;
+		this._attachLoadEvent(f, function() {
+			n.log("iframe loaded");
+			var b = n._getIframeContentJSON(f);
+			n._options.onComplete(a, d, b);
+			n._dequeue(a);
+			delete n._inputs[a];
+			setTimeout(function() {
+				qq.remove(f)
+			},
+			1)
+		});
+		h.submit();
+		qq.remove(h);
+		return a
+	},
+	_attachLoadEvent: function(a, b) {
+		qq.attach(a, "load", function() {
+			a.parentNode && (!a.contentDocument || ! (a.contentDocument.body && a.contentDocument.body.innerHTML == "false")) && b()
+		})
+	},
+	_getIframeContentJSON: function(a) {
+		var a = a.contentDocument ? a.contentDocument: a.contentWindow.document,
+		b;
+		this.log("converting iframe's innerHTML to JSON");
+		this.log("innerHTML = " + a.body.innerHTML);
+		var c = document.createElement("div");
+		c.innerHTML = a.body.innerHTML;
+		a = c.textContent;
+		try {
+			b = eval("(" + a + ")")
+		} catch(d) {
+			b = $.parseJSON(a)
+		}
+		return b
+	},
+	_createIframe: function(a) {
+		var b = qq.toElement('<iframe src="javascript:false;" name="' + a + '" />');
+		b.setAttribute("id", a);
+		b.style.display = "none";
+		document.body.appendChild(b);
+		return b
+	},
+	_createForm: function(a, b) {
+		var c = null,
+		c = b.csrf_token && b.csrf_name ? qq.toElement('<form method="post" enctype="multipart/form-data">' + ('<input type="hidden" name="' + b.csrf_name + '" value="' + b.csrf_token + '" />') + "</form>") : qq.toElement('<form method="post" enctype="multipart/form-data"></form>');
+		delete b.csrf_token;
+		delete b.csrf_name;
+		delete b.csrf_xname;
+		var d = qq.obj2url(b, this._options.action);
+		c.setAttribute("action", d);
+		c.setAttribute("target", a.name);
+		c.style.display = "none";
+		document.body.appendChild(c);
+		return c
+	}
+});
+qq.UploadHandlerXhr = function(a) {
+	qq.UploadHandlerAbstract.apply(this, arguments);
+	this._files = [];
+	this._xhrs = [];
+	this._loaded = []
+};
+qq.UploadHandlerXhr.isSupported = function() {
+	var a = document.createElement("input");
+	a.type = "file";
+	return "multiple" in a && typeof File != "undefined" && typeof(new XMLHttpRequest).upload != "undefined"
+};
+qq.extend(qq.UploadHandlerXhr.prototype, qq.UploadHandlerAbstract.prototype);
+qq.extend(qq.UploadHandlerXhr.prototype, {
+	add: function(a) {
+		if (! (a instanceof File)) throw Error("Passed obj is not a File (in qq.UploadHandlerXhr)");
+		return this._files.push(a) - 1
+	},
+	getName: function(a) {
+		a = this._files[a];
+		return a.fileName != null ? a.fileName: a.name
+	},
+	getSize: function(a) {
+		a = this._files[a];
+		return a.fileSize != null ? a.fileSize: a.size
+	},
+	getLoaded: function(a) {
+		return this._loaded[a] || 0
+	},
+	_upload: function(a, b) {
+		var c = this._files[a],
+		d = this.getName(a);
+		this.getSize(a);
+		this._loaded[a] = 0;
+		var f = this._xhrs[a] = new XMLHttpRequest,
+		h = this;
+		f.upload.onprogress = function(b) {
+			if (b.lengthComputable) h._loaded[a] = b.loaded,
+			h._options.onProgress(a, d, b.loaded, b.total)
+		};
+		f.onreadystatechange = function() {
+			f.readyState == 4 && h._onComplete(a, f)
+		};
+		var b = b || {},
+		n = false,
+		g = false;
+		if (b.csrf_token && b.csrf_xname) n = b.csrf_token,
+		g = b.csrf_xname,
+		delete b.csrf_token,
+		delete b.csrf_xname,
+		delete b.csrf_name;
+		b.qqfile = d;
+		var p = qq.obj2url(b, this._options.action);
+		f.open("POST", p, true);
+		f.setRequestHeader("X-Requested-With", "XMLHttpRequest");
+		f.setRequestHeader("X-File-Name", encodeURIComponent(d));
+		f.setRequestHeader("Content-Type", "application/octet-stream");
+		n && f.setRequestHeader(g, n);
+		f.send(c)
+	},
+	_onComplete: function(a, b) {
+		if (this._files[a]) {
+			var c = this.getName(a),
+			d = this.getSize(a);
+			this._options.onProgress(a, c, d, d);
+			if (b.status == 200 || b.status == 201) {
+				this.log("xhr - server response received");
+				this.log("responseText = " + b.responseText);
+				var f;
+				try {
+					f = eval("(" + b.responseText + ")")
+				} catch(h) {
+					f = {}
+				}
+				this._completed_files.push({
+					file: this._files[a],
+					response: f
+				});
+				this._options.onComplete(a, c, f)
+			} else this._completed_files.push({
+				file: this._files[a],
+				response: {}
+			}),
+			this._options.onComplete(a, c, {});
+			this._files[a] = null;
+			this._xhrs[a] = null;
+			this._dequeue(a)
+		}
+	},
+	_cancel: function(a) {
+		this._options.onCancel(a, this.getName(a));
+		this._files[a] = null;
+		this._xhrs[a] && (this._xhrs[a].abort(), this._xhrs[a] = null)
+	}
+});
+(function(a) {
+	a.fn.tipsy = function(b) {
+		b = a.extend({},
+		a.fn.tipsy.defaults, b);
+		return this.each(function() {
+			var c = a.fn.tipsy.elementOptions(this, b);
+			a(this).hover(function() {
+				a.data(this, "cancel.tipsy", true);
+				var b = a.data(this, "active.tipsy");
+				b || (b = a('<div class="tipsy"><div class="tipsy-inner"/></div>'), b.css({
+					position: "absolute",
+					zIndex: 1E5
+				}), a.data(this, "active.tipsy", b));
+				if (a(this).attr("title") || typeof a(this).attr("original-title") != "string") a(this).attr("original-title", a(this).attr("title") || "").removeAttr("title");
+				var f;
+				typeof c.title == "string" ? f = a(this).attr(c.title == "title" ? "original-title": c.title) : typeof c.title == "function" && (f = c.title.call(this));
+				b.find(".tipsy-inner")[c.html ? "html": "text"](f || c.fallback);
+				f = a.extend({},
+				a(this).offset(), {
+					width: this.offsetWidth,
+					height: this.offsetHeight
+				});
+				b.get(0).className = "tipsy";
+				b.remove().css({
+					top: 0,
+					left: 0,
+					visibility: "hidden",
+					display: "block"
+				}).appendTo(document.body);
+				var h = b[0].offsetWidth,
+				n = b[0].offsetHeight;
+				switch ((typeof c.gravity == "function" ? c.gravity.call(this) : c.gravity).charAt(0)) {
+				case "n":
+					b.css({
+						top:
+						f.top + f.height,
+						left: f.left + f.width / 2 - h / 2
+					}).addClass("tipsy-north");
+					break;
+				case "s":
+					b.css({
+						top:
+						f.top - n,
+						left: f.left + f.width / 2 - h / 2
+					}).addClass("tipsy-south");
+					break;
+				case "e":
+					b.css({
+						top:
+						f.top + f.height / 2 - n / 2,
+						left: f.left - h
+					}).addClass("tipsy-east");
+					break;
+				case "w":
+					b.css({
+						top:
+						f.top + f.height / 2 - n / 2,
+						left: f.left + f.width
+					}).addClass("tipsy-west")
+				}
+				c.fade ? b.css({
+					opacity: 0,
+					display: "block",
+					visibility: "visible"
+				}).animate({
+					opacity: 0.8
+				}) : b.css({
+					visibility: "visible"
+				})
+			},
+			function() {
+				a.data(this, "cancel.tipsy", false);
+				var b = this;
+				setTimeout(function() {
+					if (!a.data(this, "cancel.tipsy")) {
+						var f = a.data(b, "active.tipsy");
+						c.fade ? f.stop().fadeOut(function() {
+							a(this).remove()
+						}) : f.remove()
+					}
+				},
+				100)
+			})
+		})
+	};
+	a.fn.tipsy.elementOptions = function(b, c) {
+		return a.metadata ? a.extend({},
+		c, a(b).metadata()) : c
+	};
+	a.fn.tipsy.defaults = {
+		fade: false,
+		fallback: "",
+		gravity: "n",
+		html: false,
+		title: "title"
+	};
+	a.fn.tipsy.autoNS = function() {
+		return a(this).offset().top > a(document).scrollTop() + a(window).height() / 2 ? "s": "n"
+	};
+	a.fn.tipsy.autoWE = function() {
+		return a(this).offset().left > a(document).scrollLeft() + a(window).width() / 2 ? "e": "w"
+	}
+})(jQuery);
+
diff --git a/data/treeio/treeio/static/js/chat.js b/data/treeio/treeio/static/js/chat.js
new file mode 100644
index 0000000..11b8fc3
--- /dev/null
+++ b/data/treeio/treeio/static/js/chat.js
@@ -0,0 +1,561 @@
+$.fx.speeds._default = 500;
+$(function() {
+
+    $("#open-chat").click(function() {
+      var chatframe = $('#chat-frame');
+      if (chatframe.css('display') == 'none') {
+        $("#chat-frame").fadeIn(300);
+        $('#chat-icon').attr('src', "/static/icons/chat.gif");
+      } else {
+        $('#chat-frame').fadeOut(300);
+      }
+      return false;
+    });
+    $('#chat-close').click(function() {
+      $('#chat-frame').fadeOut(300);
+    })
+});
+
+var chat = {
+    /* json object to string */
+    'stringify': function(obj) {
+        var t = typeof (obj);
+        if (t != "object" || obj === null) {
+            // simple data type
+            if (t == "string") obj = '"' + obj + '"';
+            return String(obj);
+        }
+        else {
+            // recurse array or object
+            var n, v, json = [], arr = (obj && obj.constructor == Array);
+            for (n in obj) {
+                v = obj[n];
+                t = typeof(v);
+                if (t == "string") v = '"' + v + '"';
+                else if (t == "object" && v !== null) v = JSON.stringify(v);
+                json.push((arr ? "" : '"' + n + '":') + String(v));
+            }
+            return (arr ? "[" : "{") + String(json) + (arr ? "]" : "}");
+        }
+    },
+
+    'linsearch': function(v, t) {
+        k = false;
+        for (var i = 0; i <= v.length-1; i++)
+            if (v[i] == t) {
+                k = true;
+                break
+            }
+        return k
+    },
+
+    // checking new userslist, if userslist is updated then return False, if not updated then return True
+    'check_userslist': function(old_userslist, new_userlist) {
+        k = true;
+
+        for (var i = 0; i <= new_userlist.length -1; i++) {
+            if (chat.linsearch(old_userslist, new_userlist[i]) == false) {
+                k = false;
+                break
+            }
+        }
+        for (var i = 0; i <= old_userslist.length -1; i++) {
+            if (chat.linsearch(new_userlist, old_userslist[i]) == false) {
+                k = false;
+                break
+            }
+        }
+        return k
+    },
+
+    // checking - if owner conference is closed him then chat.on_close_conference
+    'check_conferenceslist': function(old_conferenceslist, new_conferenceslist) {
+
+        for (var i = 0; i <= new_conferenceslist.length -1; i++) {
+            if (chat.linsearch(old_conferenceslist, new_conferenceslist[i]) == false) {
+                chat.ui.on_close_conference(new_conferenceslist[i]);
+            }
+        }
+    },
+
+    'parse_json_conference': function(json){
+        chat.events.on_conferences_list(json.conferences);
+        chat.events.on_users_list(json.users);
+        chat.events.on_messages(json.new_data);
+        if (json.notifications) {
+          json.notifications.length = json.notifications.length || []
+          if (json.notifications.length > 0){
+              treeio.process_notifications(json.notifications);
+          }          
+        }
+    },
+
+    'get_location': function(){
+        if (window.location.hash == ""){
+            return "#";
+        } else {
+            return ""+window.location.hash;
+        }
+    },
+
+    'sendJSON': function(json) {
+        json["location"] = chat.get_location();
+        data = chat.stringify(json);
+        $.ajax({
+            type: "POST",
+            url: chat.option.url,
+            typedata: "json",
+            data: {"json":data},
+            timeout: chat.option.timeout,
+            success: function(data) {
+                chat.parse_json_conference(data)
+            }
+        });
+    },
+
+    'connect' : function() {
+        chat.sendJSON({"cmd":"Connect"});
+        chat.events.on_connect();
+    },
+
+    'disconnect': function(){
+        sendJSON({"cmd":"Disconnect"});
+        chat.events.on_disconnect();
+    },
+
+    'send': function(id_conference, text) {
+        json = {
+            "cmd":"Message",
+            "data":{
+                "id":id_conference,
+                "text":text
+            }
+        };
+        chat.sendJSON(json);
+    },
+
+    'exit_from_conference': function(id_conference) {
+        json = {
+            "cmd":"Exit",
+            "data":{
+                "id":id_conference
+            }
+        };
+        chat.sendJSON(json);
+    },
+
+    'get_new_messages': function() {
+        json = {
+            "cmd":"Get",
+            "location": chat.get_location()
+        };
+
+        data = chat.stringify(json);
+        $.ajax({
+            type: "POST",
+            url: chat.option.url,
+            typedata: "json",
+            data: {"json":data},
+            timeout: chat.option.timeout,
+            success: function(data) {
+                chat.parse_json_conference(data)
+            },
+            complete: function() { //called when the request finishes
+                setTimeout(chat.get_new_messages, chat.option.interval);
+            }
+        });
+    },
+
+    'delete_conference': function(id_conference) {
+        json = {
+            "cmd":"Delete",
+            "data":{
+                "id":id_conference
+            }
+        };
+        chat.sendJSON(json);
+    },
+
+    'remove_users_in_conference': function(id_conference, users) {
+        json = {
+            "cmd":"Remove",
+            "data":{
+                "id": id_conference,
+                "users":users
+            }
+        };
+        chat.sendJSON(json);
+    },
+
+    'add_users_in_conference': function(id_conference, users) {
+        json = {
+            "cmd":"Add",
+            "data":{
+                "id":id_conference,
+                "users": users
+            }
+        };
+        chat.sendJSON(json);
+    },
+
+    'create_conference': function(title, users) {
+        json = {
+            "cmd":"Create",
+            "data":{
+                "title": title,
+                "users": users
+            }
+        };
+        chat.sendJSON(json);
+    }
+};
+
+chat.events = {
+    'on_connect': function() {
+        chat.get_new_messages();
+    },
+
+    'on_disconnect': function() {
+    },
+
+    'on_messages': function(messages) {
+    },
+
+    'on_users_list': function(users) {
+    },
+
+    'on_conferences_list': function(conferences) {
+    }
+};
+
+chat.option = {
+    'interval': 25000,
+    'url': "/chat",
+    'timeout': 60000
+};
+
+chat.ui = {
+    /* add nick in input */
+    'add_nick_in_input': function(nick) {
+        $("#chat-input-msg").val(($("#chat-input-msg").val() + nick + ": "));
+        $("#chat-input-msg").focus();
+    },
+
+    /* return id_conference in active_tab */
+    'get_id_active_conference': function() {
+        activeTab = $("#chat-tabs").tabs("option", "selected");
+        id_conference = $($(".ui-tabs-panel").get()[activeTab]).attr("id");
+        return '' + id_conference;
+    },
+
+    'send_msg': function() {
+        chat.send(chat.ui.get_id_active_conference(), $("#chat-input-msg").val());
+        $("#chat-input-msg").val('');
+    },
+    /// return JSON user_list
+    'get_json_userlist': function() {
+        data = {};
+        data["results"]=[];
+        $.each($('.chat-users p'), function() {
+            if ($(this).text() != '+') {
+                data["results"].push({
+                    "id": $(this).attr('user'),
+                    "name": $(this).text()
+                })
+            }
+        });
+        return data
+    },
+
+    'on_close_conference': function(id) { // if owner conference is closed him
+        $('li a[href=#'+id+']').prev('img').attr('src', '/static/icons/forest.png');
+        delete chat.conferences_dic[id];
+    }
+};
+
+chat.conferences_dic = {};
+chat.userslist = {"results":[], 'users':[]};
+
+chat.events.on_users_list = function(users) {
+
+    users = users || [];
+
+    function get_list_users() { // json userslist to list
+        list = [];
+        if (users) {
+            for (var itr = 0; itr < users.length; itr++) {
+                list.push(users[itr].name);
+            };
+        }
+        return list;
+    };
+    users_list = get_list_users();
+
+    $('#chat-title').text('Chat (' + users.length +')'); // displays the number of online users
+    if (users.length > 0) {
+        if (chat.check_userslist(chat.userslist.users, users_list) == false) {
+
+            /* Update user list BEGIN*/
+            $('.chat-users').html('');
+            for (var i = 0; i < users.length; i++) {
+                $('<div/>')
+                .append($('<p/>', {
+                    text: users[i]['profile'],
+                    user: users[i]['name']
+                    }).bind('dblclick', function(){chat.create_conference($(this).text().split(' ',1),[$(this).attr('user')])}))
+                .append($('<span/>').addClass('chat-users-actions')
+                  .append($('<a/>', {
+                      text: '+',
+                      user: users[i]['name']
+                      }).addClass('chat-invite-user').bind('click', function(){chat.add_users_in_conference(chat.ui.get_id_active_conference(),[$(this).attr('user')]); $('a.chat-invite-user').hide(); $('div.chat-fb-div').hide(); }))
+                  .append(' <a href="' + users[i]['location'] + '">#</a>'))
+                .append($('<br/>')).appendTo('.chat-users');
+            }
+            if (users.length == 0) {
+                $('.chat-users').html('<p>No users online</p>');
+            }
+            /* Update user list END*/
+
+            /* Update combobox users BEGIN */
+            chat.userslist.results = chat.ui.get_json_userlist()["results"];
+            $('.chat-fb').html('');
+            $('.chat-fb').flexbox(chat.ui.get_json_userlist(), {
+                width:100,
+                maxVisibleRows: 10,
+                onSelect: function() {
+                    chat.add_users_in_conference(chat.ui.get_id_active_conference(), [$(this).attr('hiddenvalue')]);
+                }
+            });
+            /* Update combobox users END */
+        } else {
+            for (var i = 0; i < users.length; i++) {
+                $("a[user='"+users[i]['name']+"'] + a").attr('href',users[i]['location'])
+            }
+        }
+    } else {
+        $('.chat-users').html('');
+        $('.chat-users').append($('<p/>', {
+            text: 'No users online'
+        }));
+    }
+    chat.userslist.users = users_list;
+};
+
+chat.events.on_conferences_list = function(conferences) {
+
+    conferences = conferences || [];
+
+    my_list_conferences = [];
+    list_conferences = get_list_conferences(conferences);
+    for (var key in chat.conferences_dic) {
+        my_list_conferences.push(key)
+    }
+    chat.check_conferenceslist(list_conferences, my_list_conferences); // check - if owner conference is closed him then chat.on_close_conference
+
+    function get_list_users(list_json) { // json userslist to list
+        list = [];
+        list_json = list_json || [];
+        if (list_json.length>0){
+            for (var itr = 0; itr < list_json.length; itr++) {
+                list.push(list_json[itr].username);
+            }
+        }
+        return list;
+    }
+
+    function get_list_conferences(list_json) { // json userslist to list
+        list = [];
+        list_json = list_json || [];
+        if (list_json.length>0){
+            for (var itr = 0; itr < list_json.length; itr++) {
+                list.push(list_json[itr].id);
+            }
+        }
+        return list;
+    }
+
+    function update_users() {
+        $('<p/>').text('Between you,').appendTo('#' + conference.id + ' .chat-with');
+
+        for (var u = 0; u < conference.users.length; u++) {
+            user = conference.users[u];
+            $('<p/>').text(user.profile.split(' ',1)[0]).appendTo('#' + conference.id + ' .chat-with');
+        }
+
+        $('<p/>').append($('<a/>',{
+            text:'Invite more people'
+        }).attr('class','chat-invite').bind('click',function(){
+            $('#'+chat.ui.get_id_active_conference()+' .chat-fb-div').toggle();
+            $('a.chat-invite-user').toggle();
+            $('#'+chat.ui.get_id_active_conference()+' .chat-fb #_input').focus();
+        })).appendTo('#' + conference.id + ' .chat-with');
+
+        if (conference.users.length == 2){
+            $("a[href='#"+conference.id+"']").text(conference.users[0].profile.split(' ',1)[0]+' and '+conference.users[1].profile.split(' ',1)[0]);
+        }
+
+        if (conference.users.length > 2){
+            $("a[href='#"+conference.id+"']").text(conference.users[0].profile.split(' ',1)[0]+', '+conference.users[1].profile.split(' ',1)[0]+', ...');
+        }
+    }
+
+    if (conferences.length > 0) {
+        for (var i = 0; i < conferences.length; i++) {
+            conference = conferences[i];
+            id = conference.id;
+            list_users = get_list_users(conference.users);
+            if (chat.conferences_dic[id]) {
+                if (chat.check_userslist(chat.conferences_dic[conference.id]['users'], list_users) == false) { // if in userslist new data, then update
+                    $('#' + conference.id + ' .chat-with').html('');
+                    update_users();
+                }
+                chat.conferences_dic[conference.id]['users'] = get_list_users(conference.users);
+            } else {
+
+                $("#chat-tabs").tabs("add", '#' + conference.id, conference.title);
+                chat.conferences_dic[id] = {};
+                chat.conferences_dic[id].active = true;
+                chat.conferences_dic[id].users = [];
+
+                $('<div/>').attr('class','chat-with small').appendTo('#' + conference.id);
+
+                $('<div/>').attr('class','chat-fb-div')
+                .append($('<div/>').attr('class','chat-fb').flexbox(chat.userslist, {
+                    width:100,
+                    maxVisibleRows: 10,
+                    onSelect: function() {
+                        chat.add_users_in_conference(chat.ui.get_id_active_conference(), [$(this).attr('hiddenvalue')]);
+                    }
+                }))
+                .append($('<div/>').attr('class','ui-icon ui-icon-close vertical').bind('click', function(){$(this).parent().hide(); $('a.chat-invite-user').hide();}))
+                .appendTo('#' + conference.id);
+
+                $('<div/>').attr('class','chat-body').appendTo('#' + conference.id);
+
+                update_users();
+
+                chat.conferences_dic[conference.id]['users'] = get_list_users(conference.users);
+            }
+        }
+    }
+};
+
+
+
+chat.events.on_messages = function(data) {
+    data = data || []
+    if (data.length > 0) {
+        for (var itr = 0; itr < data.length; itr++) {
+            new_msg = data[itr];
+            for (var key in new_msg) {
+                msg = new_msg[key].messages;
+                for (var i = 0; i < msg.length; i++) {
+                    text = msg[i].text;
+                    date = msg[i].date;
+                    time = msg[i].time;
+                    user = msg[i].user;
+                    profile = msg[i].profile;
+                    $('<div/>').attr('class','message')
+                    .append($('<div/>', {
+                        text: '[' + time + ']'
+                    }).attr('class','time'))
+                    .append($('<div/>', {
+                        user: user,
+                        text: '<' + profile + '> '
+                    }).attr('class','nick').bind('click', function(){chat.ui.add_nick_in_input($(this).text().slice(1, -2))}))
+                    .append($('<div/>', {
+                        text: ' ' + text
+                    }).attr('class','text'))
+                    .appendTo('#' + key + ' .chat-body');
+                }
+                if (msg.length > 0) {
+                    $('li a[href=#'+key+']').prev('img').fadeIn(100).fadeOut(100).fadeIn(100).fadeOut(100).fadeIn(100).fadeOut(100).fadeIn(100);
+                }
+                $('#' + key + " .chat-body").animate({ scrollTop: $('#' + key + " .chat-body").attr("scrollHeight") }, 1000);
+            }
+        }
+        var chatframe = $('#chat-frame');
+        if (chatframe.css('display') == 'none'){
+            $('#chat-icon').attr('src', "/static/icons/chat-active.gif").fadeOut(100).fadeIn(100).fadeOut(100).fadeIn(100).fadeOut(100).fadeIn(100);
+        }
+    }
+};
+
+$(function() {
+    $("#chat-tabs").tabs({
+        tabTemplate: "<li><img src='/static/icons/forest-active.png' class='margin-bottom' style='float: left;'><a href='#{href}'>#{label}</a><span class='ui-icon ui-icon-close'>Remove Tab</span></li>"
+    });
+    $("#chat-tabs li span.ui-icon-close").live("click", function() {
+        delete chat.conferences_dic[chat.ui.get_id_active_conference()];
+        chat.exit_from_conference(chat.ui.get_id_active_conference());
+        var index = $("li", $('#chat-tabs')).index($(this).parent());
+        $('#chat-tabs').tabs("remove", index);
+    });
+
+    $("#chat-input-msg").keypress(function(e) {
+        if (e.which == '13') {
+            chat.ui.send_msg();
+            return false;
+        }
+    });
+
+    $("#chat-btn-send").click(chat.ui.send_msg);
+
+    chat.connect();
+
+    $('.chat-fb').flexbox(chat.ui.get_json_userlist(), {
+        width:100,
+        maxVisibleRows: 10,
+        onSelect: function(){
+            chat.add_users_in_conference(chat.ui.get_id_active_conference(), [$(this).attr('hiddenvalue')]);
+        }
+    });
+
+});
+
+$(function() {
+
+    var $tab_title_input = $("#tab_title");
+
+    var $dialog = $("#chat-dialog").dialog({
+        autoOpen: false,
+        modal: true,
+        buttons: {
+            Invite: function() {
+                users = [];
+                $.each($('.chat-dialog-users input:checked'), function(){
+                    users.push($(this).attr('name'));
+                });
+                if (users.length > 0){
+                    chat.add_users_in_conference(chat.ui.get_id_active_conference(), users);
+                }
+
+                $(this).dialog("close");
+            },
+            Cancel: function() {
+                $(this).dialog("close");
+            }
+        },
+        open: function() {
+            $('.chat-dialog-users').html('');
+            $.each($('.chat-users p'), function() {
+                $('<input>', {
+                    name: $(this).attr('user'),
+                    type: 'CHECKBOX'
+                }).appendTo($('.chat-dialog-users'));
+                $('.chat-dialog-users')
+                        .append($(this).text())
+                        .append($('<br/>'));
+            });
+            $tab_title_input.focus();
+        },
+        close: function() {
+            $form[ 0 ].reset();
+        }
+    });
+
+    var $form = $("form", $dialog).submit(function() {
+        $dialog.dialog("close");
+        return false;
+    });
+});
diff --git a/data/treeio/treeio/static/js/colorbox/example1/index.html b/data/treeio/treeio/static/js/colorbox/example1/index.html
new file mode 100644
index 0000000..8f10b93
--- /dev/null
+++ b/data/treeio/treeio/static/js/colorbox/example1/index.html
@@ -0,0 +1,95 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset='utf-8'/>
+		<title>Colorbox Examples</title>
+		<style>
+			body{font:12px/1.2 Verdana, sans-serif; padding:0 10px;}
+			a:link, a:visited{text-decoration:none; color:#416CE5; border-bottom:1px solid #416CE5;}
+			h2{font-size:13px; margin:15px 0 0 0;}
+		</style>
+		<link rel="stylesheet" href="colorbox.css" />
+		<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
+		<script src="../jquery.colorbox.js"></script>
+		<script>
+			$(document).ready(function(){
+				//Examples of how to assign the Colorbox event to elements
+				$(".group1").colorbox({rel:'group1'});
+				$(".group2").colorbox({rel:'group2', transition:"fade"});
+				$(".group3").colorbox({rel:'group3', transition:"none", width:"75%", height:"75%"});
+				$(".group4").colorbox({rel:'group4', slideshow:true});
+				$(".ajax").colorbox();
+				$(".youtube").colorbox({iframe:true, innerWidth:640, innerHeight:390});
+				$(".vimeo").colorbox({iframe:true, innerWidth:500, innerHeight:409});
+				$(".iframe").colorbox({iframe:true, width:"80%", height:"80%"});
+				$(".inline").colorbox({inline:true, width:"50%"});
+				$(".callbacks").colorbox({
+					onOpen:function(){ alert('onOpen: colorbox is about to open'); },
+					onLoad:function(){ alert('onLoad: colorbox has started to load the targeted content'); },
+					onComplete:function(){ alert('onComplete: colorbox has displayed the loaded content'); },
+					onCleanup:function(){ alert('onCleanup: colorbox has begun the close process'); },
+					onClosed:function(){ alert('onClosed: colorbox has completely closed'); }
+				});
+
+				$('.non-retina').colorbox({rel:'group5', transition:'none'})
+				$('.retina').colorbox({rel:'group5', transition:'none', retinaImage:true, retinaUrl:true});
+				
+				//Example of preserving a JavaScript event for inline calls.
+				$("#click").click(function(){ 
+					$('#click').css({"background-color":"#f00", "color":"#fff", "cursor":"inherit"}).text("Open this window again and this message will still be here.");
+					return false;
+				});
+			});
+		</script>
+	</head>
+	<body>
+		<h1>Colorbox Demonstration</h1>
+		<h2>Elastic Transition</h2>
+		<p><a class="group1" href="../content/ohoopee1.jpg" title="Me and my grandfather on the Ohoopee.">Grouped Photo 1</a></p>
+		<p><a class="group1" href="../content/ohoopee2.jpg" title="On the Ohoopee as a child">Grouped Photo 2</a></p>
+		<p><a class="group1" href="../content/ohoopee3.jpg" title="On the Ohoopee as an adult">Grouped Photo 3</a></p>
+		
+		<h2>Fade Transition</h2>
+		<p><a class="group2" href="../content/ohoopee1.jpg" title="Me and my grandfather on the Ohoopee">Grouped Photo 1</a></p>
+		<p><a class="group2" href="../content/ohoopee2.jpg" title="On the Ohoopee as a child">Grouped Photo 2</a></p>
+		<p><a class="group2" href="../content/ohoopee3.jpg" title="On the Ohoopee as an adult">Grouped Photo 3</a></p>
+		
+		<h2>No Transition + fixed width and height (75% of screen size)</h2>
+		<p><a class="group3" href="../content/ohoopee1.jpg" title="Me and my grandfather on the Ohoopee.">Grouped Photo 1</a></p>
+		<p><a class="group3" href="../content/ohoopee2.jpg" title="On the Ohoopee as a child">Grouped Photo 2</a></p>
+		<p><a class="group3" href="../content/ohoopee3.jpg" title="On the Ohoopee as an adult">Grouped Photo 3</a></p>
+		
+		<h2>Slideshow</h2>
+		<p><a class="group4"  href="../content/ohoopee1.jpg" title="Me and my grandfather on the Ohoopee.">Grouped Photo 1</a></p>
+		<p><a class="group4"  href="../content/ohoopee2.jpg" title="On the Ohoopee as a child">Grouped Photo 2</a></p>
+		<p><a class="group4"  href="../content/ohoopee3.jpg" title="On the Ohoopee as an adult">Grouped Photo 3</a></p>
+		
+		<h2>Other Content Types</h2>
+		<p><a class='ajax' href="../content/ajax.html" title="Homer Defined">Outside HTML (Ajax)</a></p>
+		<p><a class='youtube' href="http://www.youtube.com/embed/VOJyrQa_WR4?rel=0&amp;wmode=transparent">Flash / Video (Iframe/Direct Link To YouTube)</a></p>
+		<p><a class='vimeo' href="http://player.vimeo.com/video/2285902" title="R&ouml;yksopp: Remind Me">Flash / Video (Iframe/Direct Link To Vimeo)</a></p>
+		<p><a class='iframe' href="http://wikipedia.com">Outside Webpage (Iframe)</a></p>
+		<p><a class='inline' href="#inline_content">Inline HTML</a></p>
+		
+		<h2>Demonstration of using callbacks</h2>
+		<p><a class='callbacks' href="../content/marylou.jpg" title="Marylou on Cumberland Island">Example with alerts</a>. Callbacks and event-hooks allow users to extend functionality without having to rewrite parts of the plugin.</p>
+		
+
+		<h2>Retina Images</h2>
+		<p><a class="retina" href="../content/daisy.jpg" title="Retina">Retina</a></p>
+		<p><a class="non-retina" href="../content/daisy.jpg" title="Non-Retina">Non-Retina</a></p>
+
+		<!-- This contains the hidden content for inline calls -->
+		<div style='display:none'>
+			<div id='inline_content' style='padding:10px; background:#fff;'>
+			<p><strong>This content comes from a hidden element on this page.</strong></p>
+			<p>The inline option preserves bound JavaScript events and changes, and it puts the content back where it came from when it is closed.</p>
+			<p><a id="click" href="#" style='padding:5px; background:#ccc;'>Click me, it will be preserved!</a></p>
+			
+			<p><strong>If you try to open a new Colorbox while it is already open, it will update itself with the new content.</strong></p>
+			<p>Updating Content Example:<br />
+			<a class="ajax" href="../content/ajax.html">Click here to load new content</a></p>
+			</div>
+		</div>
+	</body>
+</html>
\ No newline at end of file
diff --git a/data/treeio/treeio/static/js/colorbox/example2/index.html b/data/treeio/treeio/static/js/colorbox/example2/index.html
new file mode 100644
index 0000000..8f10b93
--- /dev/null
+++ b/data/treeio/treeio/static/js/colorbox/example2/index.html
@@ -0,0 +1,95 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset='utf-8'/>
+		<title>Colorbox Examples</title>
+		<style>
+			body{font:12px/1.2 Verdana, sans-serif; padding:0 10px;}
+			a:link, a:visited{text-decoration:none; color:#416CE5; border-bottom:1px solid #416CE5;}
+			h2{font-size:13px; margin:15px 0 0 0;}
+		</style>
+		<link rel="stylesheet" href="colorbox.css" />
+		<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
+		<script src="../jquery.colorbox.js"></script>
+		<script>
+			$(document).ready(function(){
+				//Examples of how to assign the Colorbox event to elements
+				$(".group1").colorbox({rel:'group1'});
+				$(".group2").colorbox({rel:'group2', transition:"fade"});
+				$(".group3").colorbox({rel:'group3', transition:"none", width:"75%", height:"75%"});
+				$(".group4").colorbox({rel:'group4', slideshow:true});
+				$(".ajax").colorbox();
+				$(".youtube").colorbox({iframe:true, innerWidth:640, innerHeight:390});
+				$(".vimeo").colorbox({iframe:true, innerWidth:500, innerHeight:409});
+				$(".iframe").colorbox({iframe:true, width:"80%", height:"80%"});
+				$(".inline").colorbox({inline:true, width:"50%"});
+				$(".callbacks").colorbox({
+					onOpen:function(){ alert('onOpen: colorbox is about to open'); },
+					onLoad:function(){ alert('onLoad: colorbox has started to load the targeted content'); },
+					onComplete:function(){ alert('onComplete: colorbox has displayed the loaded content'); },
+					onCleanup:function(){ alert('onCleanup: colorbox has begun the close process'); },
+					onClosed:function(){ alert('onClosed: colorbox has completely closed'); }
+				});
+
+				$('.non-retina').colorbox({rel:'group5', transition:'none'})
+				$('.retina').colorbox({rel:'group5', transition:'none', retinaImage:true, retinaUrl:true});
+				
+				//Example of preserving a JavaScript event for inline calls.
+				$("#click").click(function(){ 
+					$('#click').css({"background-color":"#f00", "color":"#fff", "cursor":"inherit"}).text("Open this window again and this message will still be here.");
+					return false;
+				});
+			});
+		</script>
+	</head>
+	<body>
+		<h1>Colorbox Demonstration</h1>
+		<h2>Elastic Transition</h2>
+		<p><a class="group1" href="../content/ohoopee1.jpg" title="Me and my grandfather on the Ohoopee.">Grouped Photo 1</a></p>
+		<p><a class="group1" href="../content/ohoopee2.jpg" title="On the Ohoopee as a child">Grouped Photo 2</a></p>
+		<p><a class="group1" href="../content/ohoopee3.jpg" title="On the Ohoopee as an adult">Grouped Photo 3</a></p>
+		
+		<h2>Fade Transition</h2>
+		<p><a class="group2" href="../content/ohoopee1.jpg" title="Me and my grandfather on the Ohoopee">Grouped Photo 1</a></p>
+		<p><a class="group2" href="../content/ohoopee2.jpg" title="On the Ohoopee as a child">Grouped Photo 2</a></p>
+		<p><a class="group2" href="../content/ohoopee3.jpg" title="On the Ohoopee as an adult">Grouped Photo 3</a></p>
+		
+		<h2>No Transition + fixed width and height (75% of screen size)</h2>
+		<p><a class="group3" href="../content/ohoopee1.jpg" title="Me and my grandfather on the Ohoopee.">Grouped Photo 1</a></p>
+		<p><a class="group3" href="../content/ohoopee2.jpg" title="On the Ohoopee as a child">Grouped Photo 2</a></p>
+		<p><a class="group3" href="../content/ohoopee3.jpg" title="On the Ohoopee as an adult">Grouped Photo 3</a></p>
+		
+		<h2>Slideshow</h2>
+		<p><a class="group4"  href="../content/ohoopee1.jpg" title="Me and my grandfather on the Ohoopee.">Grouped Photo 1</a></p>
+		<p><a class="group4"  href="../content/ohoopee2.jpg" title="On the Ohoopee as a child">Grouped Photo 2</a></p>
+		<p><a class="group4"  href="../content/ohoopee3.jpg" title="On the Ohoopee as an adult">Grouped Photo 3</a></p>
+		
+		<h2>Other Content Types</h2>
+		<p><a class='ajax' href="../content/ajax.html" title="Homer Defined">Outside HTML (Ajax)</a></p>
+		<p><a class='youtube' href="http://www.youtube.com/embed/VOJyrQa_WR4?rel=0&amp;wmode=transparent">Flash / Video (Iframe/Direct Link To YouTube)</a></p>
+		<p><a class='vimeo' href="http://player.vimeo.com/video/2285902" title="R&ouml;yksopp: Remind Me">Flash / Video (Iframe/Direct Link To Vimeo)</a></p>
+		<p><a class='iframe' href="http://wikipedia.com">Outside Webpage (Iframe)</a></p>
+		<p><a class='inline' href="#inline_content">Inline HTML</a></p>
+		
+		<h2>Demonstration of using callbacks</h2>
+		<p><a class='callbacks' href="../content/marylou.jpg" title="Marylou on Cumberland Island">Example with alerts</a>. Callbacks and event-hooks allow users to extend functionality without having to rewrite parts of the plugin.</p>
+		
+
+		<h2>Retina Images</h2>
+		<p><a class="retina" href="../content/daisy.jpg" title="Retina">Retina</a></p>
+		<p><a class="non-retina" href="../content/daisy.jpg" title="Non-Retina">Non-Retina</a></p>
+
+		<!-- This contains the hidden content for inline calls -->
+		<div style='display:none'>
+			<div id='inline_content' style='padding:10px; background:#fff;'>
+			<p><strong>This content comes from a hidden element on this page.</strong></p>
+			<p>The inline option preserves bound JavaScript events and changes, and it puts the content back where it came from when it is closed.</p>
+			<p><a id="click" href="#" style='padding:5px; background:#ccc;'>Click me, it will be preserved!</a></p>
+			
+			<p><strong>If you try to open a new Colorbox while it is already open, it will update itself with the new content.</strong></p>
+			<p>Updating Content Example:<br />
+			<a class="ajax" href="../content/ajax.html">Click here to load new content</a></p>
+			</div>
+		</div>
+	</body>
+</html>
\ No newline at end of file
diff --git a/data/treeio/treeio/static/js/colorbox/example3/index.html b/data/treeio/treeio/static/js/colorbox/example3/index.html
new file mode 100644
index 0000000..8f10b93
--- /dev/null
+++ b/data/treeio/treeio/static/js/colorbox/example3/index.html
@@ -0,0 +1,95 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset='utf-8'/>
+		<title>Colorbox Examples</title>
+		<style>
+			body{font:12px/1.2 Verdana, sans-serif; padding:0 10px;}
+			a:link, a:visited{text-decoration:none; color:#416CE5; border-bottom:1px solid #416CE5;}
+			h2{font-size:13px; margin:15px 0 0 0;}
+		</style>
+		<link rel="stylesheet" href="colorbox.css" />
+		<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
+		<script src="../jquery.colorbox.js"></script>
+		<script>
+			$(document).ready(function(){
+				//Examples of how to assign the Colorbox event to elements
+				$(".group1").colorbox({rel:'group1'});
+				$(".group2").colorbox({rel:'group2', transition:"fade"});
+				$(".group3").colorbox({rel:'group3', transition:"none", width:"75%", height:"75%"});
+				$(".group4").colorbox({rel:'group4', slideshow:true});
+				$(".ajax").colorbox();
+				$(".youtube").colorbox({iframe:true, innerWidth:640, innerHeight:390});
+				$(".vimeo").colorbox({iframe:true, innerWidth:500, innerHeight:409});
+				$(".iframe").colorbox({iframe:true, width:"80%", height:"80%"});
+				$(".inline").colorbox({inline:true, width:"50%"});
+				$(".callbacks").colorbox({
+					onOpen:function(){ alert('onOpen: colorbox is about to open'); },
+					onLoad:function(){ alert('onLoad: colorbox has started to load the targeted content'); },
+					onComplete:function(){ alert('onComplete: colorbox has displayed the loaded content'); },
+					onCleanup:function(){ alert('onCleanup: colorbox has begun the close process'); },
+					onClosed:function(){ alert('onClosed: colorbox has completely closed'); }
+				});
+
+				$('.non-retina').colorbox({rel:'group5', transition:'none'})
+				$('.retina').colorbox({rel:'group5', transition:'none', retinaImage:true, retinaUrl:true});
+				
+				//Example of preserving a JavaScript event for inline calls.
+				$("#click").click(function(){ 
+					$('#click').css({"background-color":"#f00", "color":"#fff", "cursor":"inherit"}).text("Open this window again and this message will still be here.");
+					return false;
+				});
+			});
+		</script>
+	</head>
+	<body>
+		<h1>Colorbox Demonstration</h1>
+		<h2>Elastic Transition</h2>
+		<p><a class="group1" href="../content/ohoopee1.jpg" title="Me and my grandfather on the Ohoopee.">Grouped Photo 1</a></p>
+		<p><a class="group1" href="../content/ohoopee2.jpg" title="On the Ohoopee as a child">Grouped Photo 2</a></p>
+		<p><a class="group1" href="../content/ohoopee3.jpg" title="On the Ohoopee as an adult">Grouped Photo 3</a></p>
+		
+		<h2>Fade Transition</h2>
+		<p><a class="group2" href="../content/ohoopee1.jpg" title="Me and my grandfather on the Ohoopee">Grouped Photo 1</a></p>
+		<p><a class="group2" href="../content/ohoopee2.jpg" title="On the Ohoopee as a child">Grouped Photo 2</a></p>
+		<p><a class="group2" href="../content/ohoopee3.jpg" title="On the Ohoopee as an adult">Grouped Photo 3</a></p>
+		
+		<h2>No Transition + fixed width and height (75% of screen size)</h2>
+		<p><a class="group3" href="../content/ohoopee1.jpg" title="Me and my grandfather on the Ohoopee.">Grouped Photo 1</a></p>
+		<p><a class="group3" href="../content/ohoopee2.jpg" title="On the Ohoopee as a child">Grouped Photo 2</a></p>
+		<p><a class="group3" href="../content/ohoopee3.jpg" title="On the Ohoopee as an adult">Grouped Photo 3</a></p>
+		
+		<h2>Slideshow</h2>
+		<p><a class="group4"  href="../content/ohoopee1.jpg" title="Me and my grandfather on the Ohoopee.">Grouped Photo 1</a></p>
+		<p><a class="group4"  href="../content/ohoopee2.jpg" title="On the Ohoopee as a child">Grouped Photo 2</a></p>
+		<p><a class="group4"  href="../content/ohoopee3.jpg" title="On the Ohoopee as an adult">Grouped Photo 3</a></p>
+		
+		<h2>Other Content Types</h2>
+		<p><a class='ajax' href="../content/ajax.html" title="Homer Defined">Outside HTML (Ajax)</a></p>
+		<p><a class='youtube' href="http://www.youtube.com/embed/VOJyrQa_WR4?rel=0&amp;wmode=transparent">Flash / Video (Iframe/Direct Link To YouTube)</a></p>
+		<p><a class='vimeo' href="http://player.vimeo.com/video/2285902" title="R&ouml;yksopp: Remind Me">Flash / Video (Iframe/Direct Link To Vimeo)</a></p>
+		<p><a class='iframe' href="http://wikipedia.com">Outside Webpage (Iframe)</a></p>
+		<p><a class='inline' href="#inline_content">Inline HTML</a></p>
+		
+		<h2>Demonstration of using callbacks</h2>
+		<p><a class='callbacks' href="../content/marylou.jpg" title="Marylou on Cumberland Island">Example with alerts</a>. Callbacks and event-hooks allow users to extend functionality without having to rewrite parts of the plugin.</p>
+		
+
+		<h2>Retina Images</h2>
+		<p><a class="retina" href="../content/daisy.jpg" title="Retina">Retina</a></p>
+		<p><a class="non-retina" href="../content/daisy.jpg" title="Non-Retina">Non-Retina</a></p>
+
+		<!-- This contains the hidden content for inline calls -->
+		<div style='display:none'>
+			<div id='inline_content' style='padding:10px; background:#fff;'>
+			<p><strong>This content comes from a hidden element on this page.</strong></p>
+			<p>The inline option preserves bound JavaScript events and changes, and it puts the content back where it came from when it is closed.</p>
+			<p><a id="click" href="#" style='padding:5px; background:#ccc;'>Click me, it will be preserved!</a></p>
+			
+			<p><strong>If you try to open a new Colorbox while it is already open, it will update itself with the new content.</strong></p>
+			<p>Updating Content Example:<br />
+			<a class="ajax" href="../content/ajax.html">Click here to load new content</a></p>
+			</div>
+		</div>
+	</body>
+</html>
\ No newline at end of file
diff --git a/data/treeio/treeio/static/js/colorbox/example4/index.html b/data/treeio/treeio/static/js/colorbox/example4/index.html
new file mode 100644
index 0000000..8f10b93
--- /dev/null
+++ b/data/treeio/treeio/static/js/colorbox/example4/index.html
@@ -0,0 +1,95 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset='utf-8'/>
+		<title>Colorbox Examples</title>
+		<style>
+			body{font:12px/1.2 Verdana, sans-serif; padding:0 10px;}
+			a:link, a:visited{text-decoration:none; color:#416CE5; border-bottom:1px solid #416CE5;}
+			h2{font-size:13px; margin:15px 0 0 0;}
+		</style>
+		<link rel="stylesheet" href="colorbox.css" />
+		<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
+		<script src="../jquery.colorbox.js"></script>
+		<script>
+			$(document).ready(function(){
+				//Examples of how to assign the Colorbox event to elements
+				$(".group1").colorbox({rel:'group1'});
+				$(".group2").colorbox({rel:'group2', transition:"fade"});
+				$(".group3").colorbox({rel:'group3', transition:"none", width:"75%", height:"75%"});
+				$(".group4").colorbox({rel:'group4', slideshow:true});
+				$(".ajax").colorbox();
+				$(".youtube").colorbox({iframe:true, innerWidth:640, innerHeight:390});
+				$(".vimeo").colorbox({iframe:true, innerWidth:500, innerHeight:409});
+				$(".iframe").colorbox({iframe:true, width:"80%", height:"80%"});
+				$(".inline").colorbox({inline:true, width:"50%"});
+				$(".callbacks").colorbox({
+					onOpen:function(){ alert('onOpen: colorbox is about to open'); },
+					onLoad:function(){ alert('onLoad: colorbox has started to load the targeted content'); },
+					onComplete:function(){ alert('onComplete: colorbox has displayed the loaded content'); },
+					onCleanup:function(){ alert('onCleanup: colorbox has begun the close process'); },
+					onClosed:function(){ alert('onClosed: colorbox has completely closed'); }
+				});
+
+				$('.non-retina').colorbox({rel:'group5', transition:'none'})
+				$('.retina').colorbox({rel:'group5', transition:'none', retinaImage:true, retinaUrl:true});
+				
+				//Example of preserving a JavaScript event for inline calls.
+				$("#click").click(function(){ 
+					$('#click').css({"background-color":"#f00", "color":"#fff", "cursor":"inherit"}).text("Open this window again and this message will still be here.");
+					return false;
+				});
+			});
+		</script>
+	</head>
+	<body>
+		<h1>Colorbox Demonstration</h1>
+		<h2>Elastic Transition</h2>
+		<p><a class="group1" href="../content/ohoopee1.jpg" title="Me and my grandfather on the Ohoopee.">Grouped Photo 1</a></p>
+		<p><a class="group1" href="../content/ohoopee2.jpg" title="On the Ohoopee as a child">Grouped Photo 2</a></p>
+		<p><a class="group1" href="../content/ohoopee3.jpg" title="On the Ohoopee as an adult">Grouped Photo 3</a></p>
+		
+		<h2>Fade Transition</h2>
+		<p><a class="group2" href="../content/ohoopee1.jpg" title="Me and my grandfather on the Ohoopee">Grouped Photo 1</a></p>
+		<p><a class="group2" href="../content/ohoopee2.jpg" title="On the Ohoopee as a child">Grouped Photo 2</a></p>
+		<p><a class="group2" href="../content/ohoopee3.jpg" title="On the Ohoopee as an adult">Grouped Photo 3</a></p>
+		
+		<h2>No Transition + fixed width and height (75% of screen size)</h2>
+		<p><a class="group3" href="../content/ohoopee1.jpg" title="Me and my grandfather on the Ohoopee.">Grouped Photo 1</a></p>
+		<p><a class="group3" href="../content/ohoopee2.jpg" title="On the Ohoopee as a child">Grouped Photo 2</a></p>
+		<p><a class="group3" href="../content/ohoopee3.jpg" title="On the Ohoopee as an adult">Grouped Photo 3</a></p>
+		
+		<h2>Slideshow</h2>
+		<p><a class="group4"  href="../content/ohoopee1.jpg" title="Me and my grandfather on the Ohoopee.">Grouped Photo 1</a></p>
+		<p><a class="group4"  href="../content/ohoopee2.jpg" title="On the Ohoopee as a child">Grouped Photo 2</a></p>
+		<p><a class="group4"  href="../content/ohoopee3.jpg" title="On the Ohoopee as an adult">Grouped Photo 3</a></p>
+		
+		<h2>Other Content Types</h2>
+		<p><a class='ajax' href="../content/ajax.html" title="Homer Defined">Outside HTML (Ajax)</a></p>
+		<p><a class='youtube' href="http://www.youtube.com/embed/VOJyrQa_WR4?rel=0&amp;wmode=transparent">Flash / Video (Iframe/Direct Link To YouTube)</a></p>
+		<p><a class='vimeo' href="http://player.vimeo.com/video/2285902" title="R&ouml;yksopp: Remind Me">Flash / Video (Iframe/Direct Link To Vimeo)</a></p>
+		<p><a class='iframe' href="http://wikipedia.com">Outside Webpage (Iframe)</a></p>
+		<p><a class='inline' href="#inline_content">Inline HTML</a></p>
+		
+		<h2>Demonstration of using callbacks</h2>
+		<p><a class='callbacks' href="../content/marylou.jpg" title="Marylou on Cumberland Island">Example with alerts</a>. Callbacks and event-hooks allow users to extend functionality without having to rewrite parts of the plugin.</p>
+		
+
+		<h2>Retina Images</h2>
+		<p><a class="retina" href="../content/daisy.jpg" title="Retina">Retina</a></p>
+		<p><a class="non-retina" href="../content/daisy.jpg" title="Non-Retina">Non-Retina</a></p>
+
+		<!-- This contains the hidden content for inline calls -->
+		<div style='display:none'>
+			<div id='inline_content' style='padding:10px; background:#fff;'>
+			<p><strong>This content comes from a hidden element on this page.</strong></p>
+			<p>The inline option preserves bound JavaScript events and changes, and it puts the content back where it came from when it is closed.</p>
+			<p><a id="click" href="#" style='padding:5px; background:#ccc;'>Click me, it will be preserved!</a></p>
+			
+			<p><strong>If you try to open a new Colorbox while it is already open, it will update itself with the new content.</strong></p>
+			<p>Updating Content Example:<br />
+			<a class="ajax" href="../content/ajax.html">Click here to load new content</a></p>
+			</div>
+		</div>
+	</body>
+</html>
\ No newline at end of file
diff --git a/data/treeio/treeio/static/js/colorbox/example5/index.html b/data/treeio/treeio/static/js/colorbox/example5/index.html
new file mode 100644
index 0000000..8f10b93
--- /dev/null
+++ b/data/treeio/treeio/static/js/colorbox/example5/index.html
@@ -0,0 +1,95 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset='utf-8'/>
+		<title>Colorbox Examples</title>
+		<style>
+			body{font:12px/1.2 Verdana, sans-serif; padding:0 10px;}
+			a:link, a:visited{text-decoration:none; color:#416CE5; border-bottom:1px solid #416CE5;}
+			h2{font-size:13px; margin:15px 0 0 0;}
+		</style>
+		<link rel="stylesheet" href="colorbox.css" />
+		<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
+		<script src="../jquery.colorbox.js"></script>
+		<script>
+			$(document).ready(function(){
+				//Examples of how to assign the Colorbox event to elements
+				$(".group1").colorbox({rel:'group1'});
+				$(".group2").colorbox({rel:'group2', transition:"fade"});
+				$(".group3").colorbox({rel:'group3', transition:"none", width:"75%", height:"75%"});
+				$(".group4").colorbox({rel:'group4', slideshow:true});
+				$(".ajax").colorbox();
+				$(".youtube").colorbox({iframe:true, innerWidth:640, innerHeight:390});
+				$(".vimeo").colorbox({iframe:true, innerWidth:500, innerHeight:409});
+				$(".iframe").colorbox({iframe:true, width:"80%", height:"80%"});
+				$(".inline").colorbox({inline:true, width:"50%"});
+				$(".callbacks").colorbox({
+					onOpen:function(){ alert('onOpen: colorbox is about to open'); },
+					onLoad:function(){ alert('onLoad: colorbox has started to load the targeted content'); },
+					onComplete:function(){ alert('onComplete: colorbox has displayed the loaded content'); },
+					onCleanup:function(){ alert('onCleanup: colorbox has begun the close process'); },
+					onClosed:function(){ alert('onClosed: colorbox has completely closed'); }
+				});
+
+				$('.non-retina').colorbox({rel:'group5', transition:'none'})
+				$('.retina').colorbox({rel:'group5', transition:'none', retinaImage:true, retinaUrl:true});
+				
+				//Example of preserving a JavaScript event for inline calls.
+				$("#click").click(function(){ 
+					$('#click').css({"background-color":"#f00", "color":"#fff", "cursor":"inherit"}).text("Open this window again and this message will still be here.");
+					return false;
+				});
+			});
+		</script>
+	</head>
+	<body>
+		<h1>Colorbox Demonstration</h1>
+		<h2>Elastic Transition</h2>
+		<p><a class="group1" href="../content/ohoopee1.jpg" title="Me and my grandfather on the Ohoopee.">Grouped Photo 1</a></p>
+		<p><a class="group1" href="../content/ohoopee2.jpg" title="On the Ohoopee as a child">Grouped Photo 2</a></p>
+		<p><a class="group1" href="../content/ohoopee3.jpg" title="On the Ohoopee as an adult">Grouped Photo 3</a></p>
+		
+		<h2>Fade Transition</h2>
+		<p><a class="group2" href="../content/ohoopee1.jpg" title="Me and my grandfather on the Ohoopee">Grouped Photo 1</a></p>
+		<p><a class="group2" href="../content/ohoopee2.jpg" title="On the Ohoopee as a child">Grouped Photo 2</a></p>
+		<p><a class="group2" href="../content/ohoopee3.jpg" title="On the Ohoopee as an adult">Grouped Photo 3</a></p>
+		
+		<h2>No Transition + fixed width and height (75% of screen size)</h2>
+		<p><a class="group3" href="../content/ohoopee1.jpg" title="Me and my grandfather on the Ohoopee.">Grouped Photo 1</a></p>
+		<p><a class="group3" href="../content/ohoopee2.jpg" title="On the Ohoopee as a child">Grouped Photo 2</a></p>
+		<p><a class="group3" href="../content/ohoopee3.jpg" title="On the Ohoopee as an adult">Grouped Photo 3</a></p>
+		
+		<h2>Slideshow</h2>
+		<p><a class="group4"  href="../content/ohoopee1.jpg" title="Me and my grandfather on the Ohoopee.">Grouped Photo 1</a></p>
+		<p><a class="group4"  href="../content/ohoopee2.jpg" title="On the Ohoopee as a child">Grouped Photo 2</a></p>
+		<p><a class="group4"  href="../content/ohoopee3.jpg" title="On the Ohoopee as an adult">Grouped Photo 3</a></p>
+		
+		<h2>Other Content Types</h2>
+		<p><a class='ajax' href="../content/ajax.html" title="Homer Defined">Outside HTML (Ajax)</a></p>
+		<p><a class='youtube' href="http://www.youtube.com/embed/VOJyrQa_WR4?rel=0&amp;wmode=transparent">Flash / Video (Iframe/Direct Link To YouTube)</a></p>
+		<p><a class='vimeo' href="http://player.vimeo.com/video/2285902" title="R&ouml;yksopp: Remind Me">Flash / Video (Iframe/Direct Link To Vimeo)</a></p>
+		<p><a class='iframe' href="http://wikipedia.com">Outside Webpage (Iframe)</a></p>
+		<p><a class='inline' href="#inline_content">Inline HTML</a></p>
+		
+		<h2>Demonstration of using callbacks</h2>
+		<p><a class='callbacks' href="../content/marylou.jpg" title="Marylou on Cumberland Island">Example with alerts</a>. Callbacks and event-hooks allow users to extend functionality without having to rewrite parts of the plugin.</p>
+		
+
+		<h2>Retina Images</h2>
+		<p><a class="retina" href="../content/daisy.jpg" title="Retina">Retina</a></p>
+		<p><a class="non-retina" href="../content/daisy.jpg" title="Non-Retina">Non-Retina</a></p>
+
+		<!-- This contains the hidden content for inline calls -->
+		<div style='display:none'>
+			<div id='inline_content' style='padding:10px; background:#fff;'>
+			<p><strong>This content comes from a hidden element on this page.</strong></p>
+			<p>The inline option preserves bound JavaScript events and changes, and it puts the content back where it came from when it is closed.</p>
+			<p><a id="click" href="#" style='padding:5px; background:#ccc;'>Click me, it will be preserved!</a></p>
+			
+			<p><strong>If you try to open a new Colorbox while it is already open, it will update itself with the new content.</strong></p>
+			<p>Updating Content Example:<br />
+			<a class="ajax" href="../content/ajax.html">Click here to load new content</a></p>
+			</div>
+		</div>
+	</body>
+</html>
\ No newline at end of file
diff --git a/data/treeio/treeio/static/js/fileuploader.js b/data/treeio/treeio/static/js/fileuploader.js
new file mode 100644
index 0000000..6c126c2
--- /dev/null
+++ b/data/treeio/treeio/static/js/fileuploader.js
@@ -0,0 +1,1299 @@
+/**
+ * http://github.com/valums/file-uploader
+ * 
+ * Multiple file upload component with progress-bar, drag-and-drop. 
+ * © 2010 Andrew Valums ( andrew(at)valums.com )
+ * © 2011 Alex Kuhl (alexkuhl.org) 
+ * 
+ * Licensed under GNU GPL 2 or later, see license.txt.
+ */    
+
+//
+// Helper functions
+//
+
+var qq = qq || {};
+
+/**
+ * Adds all missing properties from second obj to first obj
+ */ 
+qq.extend = function(first, second){
+    for (var prop in second){
+        first[prop] = second[prop];
+    }
+};  
+
+/**
+ * Searches for a given element in the array, returns -1 if it is not present.
+ * @param {Number} [from] The index at which to begin the search
+ */
+qq.indexOf = function(arr, elt, from){
+    if (arr.indexOf) return arr.indexOf(elt, from);
+    
+    from = from || 0;
+    var len = arr.length;    
+    
+    if (from < 0) from += len;  
+
+    for (; from < len; from++){  
+        if (from in arr && arr[from] === elt){  
+            return from;
+        }
+    }  
+    return -1;  
+}; 
+    
+qq.getUniqueId = (function(){
+    var id = 0;
+    return function(){ return id++; };
+})();
+
+//
+// Events
+
+qq.attach = function(element, type, fn){
+    if (element.addEventListener){
+        element.addEventListener(type, fn, false);
+    } else if (element.attachEvent){
+        element.attachEvent('on' + type, fn);
+    }
+};
+qq.detach = function(element, type, fn){
+    if (element.removeEventListener){
+        element.removeEventListener(type, fn, false);
+    } else if (element.attachEvent){
+        element.detachEvent('on' + type, fn);
+    }
+};
+
+qq.preventDefault = function(e){
+    if (e.preventDefault){
+        e.preventDefault();
+    } else{
+        e.returnValue = false;
+    }
+};
+
+//
+// Node manipulations
+
+/**
+ * Insert node a before node b.
+ */
+qq.insertBefore = function(a, b){
+    b.parentNode.insertBefore(a, b);
+};
+qq.remove = function(element){
+    element.parentNode.removeChild(element);
+};
+
+qq.contains = function(parent, descendant){       
+    // compareposition returns false in this case
+    if (parent == descendant) return true;
+    
+    if (parent.contains){
+        return parent.contains(descendant);
+    } else {
+        return !!(descendant.compareDocumentPosition(parent) & 8);
+    }
+};
+
+/**
+ * Creates and returns element from html string
+ * Uses innerHTML to create an element
+ */
+qq.toElement = (function(){
+    var div = document.createElement('div');
+    return function(html){
+        div.innerHTML = html;
+        var element = div.firstChild;
+        div.removeChild(element);
+        return element;
+    };
+})();
+
+//
+// Node properties and attributes
+
+/**
+ * Sets styles for an element.
+ * Fixes opacity in IE6-8.
+ */
+qq.css = function(element, styles){
+    if (styles.opacity != null){
+        if (typeof element.style.opacity != 'string' && typeof(element.filters) != 'undefined'){
+            styles.filter = 'alpha(opacity=' + Math.round(100 * styles.opacity) + ')';
+        }
+    }
+    qq.extend(element.style, styles);
+};
+qq.hasClass = function(element, name){
+    var re = new RegExp('(^| )' + name + '( |$)');
+    return re.test(element.className);
+};
+qq.addClass = function(element, name){
+    if (!qq.hasClass(element, name)){
+        element.className += ' ' + name;
+    }
+};
+qq.removeClass = function(element, name){
+    var re = new RegExp('(^| )' + name + '( |$)');
+    element.className = element.className.replace(re, ' ').replace(/^\s+|\s+$/g, "");
+};
+qq.setText = function(element, text){
+    element.innerText = text;
+    element.textContent = text;
+};
+
+//
+// Selecting elements
+
+qq.children = function(element){
+    var children = [],
+    child = element.firstChild;
+
+    while (child){
+        if (child.nodeType == 1){
+            children.push(child);
+        }
+        child = child.nextSibling;
+    }
+
+    return children;
+};
+
+qq.getByClass = function(element, className){
+    if (element.querySelectorAll){
+        return element.querySelectorAll('.' + className);
+    }
+    var result = [];
+    var candidates = element.getElementsByTagName("*");
+    var len = candidates.length;
+
+    for (var i = 0; i < len; i++){
+        if (qq.hasClass(candidates[i], className)){
+            result.push(candidates[i]);
+        }
+    }
+    return result;
+};
+
+/**
+ * obj2url() takes a json-object as argument and generates
+ * a querystring. pretty much like jQuery.param()
+ * 
+ * how to use:
+ *
+ *    `qq.obj2url({a:'b',c:'d'},'http://any.url/upload?otherParam=value');`
+ *
+ * will result in:
+ *
+ *    `http://any.url/upload?otherParam=value&a=b&c=d`
+ *
+ * @param  Object JSON-Object
+ * @param  String current querystring-part
+ * @return String encoded querystring
+ */
+qq.obj2url = function(obj, temp, prefixDone){
+    var uristrings = [],
+        prefix = '&',
+        add = function(nextObj, i){
+            var nextTemp = temp 
+                ? (/\[\]$/.test(temp)) // prevent double-encoding
+                   ? temp
+                   : temp+'['+i+']'
+                : i;
+            if ((nextTemp != 'undefined') && (i != 'undefined')) {  
+                uristrings.push(
+                    (typeof nextObj === 'object') 
+                        ? qq.obj2url(nextObj, nextTemp, true)
+                        : (Object.prototype.toString.call(nextObj) === '[object Function]')
+                            ? encodeURIComponent(nextTemp) + '=' + encodeURIComponent(nextObj())
+                            : encodeURIComponent(nextTemp) + '=' + encodeURIComponent(nextObj)                                                          
+                );
+            }
+        }; 
+
+    if (!prefixDone && temp) {
+      prefix = (/\?/.test(temp)) ? (/\?$/.test(temp)) ? '' : '&' : '?';
+      uristrings.push(temp);
+      uristrings.push(qq.obj2url(obj));
+    } else if ((Object.prototype.toString.call(obj) === '[object Array]') && (typeof obj != 'undefined') ) {
+        // we wont use a for-in-loop on an array (performance)
+        for (var i = 0, len = obj.length; i < len; ++i){
+            add(obj[i], i);
+        }
+    } else if ((typeof obj != 'undefined') && (obj !== null) && (typeof obj === "object")){
+        // for anything else but a scalar, we will use for-in-loop
+        for (var i in obj){
+            add(obj[i], i);
+        }
+    } else {
+        uristrings.push(encodeURIComponent(temp) + '=' + encodeURIComponent(obj));
+    }
+
+    return uristrings.join(prefix)
+                     .replace(/^&/, '')
+                     .replace(/%20/g, '+'); 
+};
+
+//
+//
+// Uploader Classes
+//
+//
+
+var qq = qq || {};
+    
+/**
+ * Creates upload button, validates upload, but doesn't create file list or dd. 
+ */
+qq.FileUploaderBasic = function(o){
+    this._options = {
+        // set to true to see the server response
+        debug: false,
+        action: '/server/upload',
+        params: {},
+        button: null,
+        multiple: true,
+        maxConnections: 3,
+        // validation        
+        allowedExtensions: [],               
+        sizeLimit: 0,   
+        minSizeLimit: 0,                             
+        // events
+        // return false to cancel submit
+        onSubmit: function(id, fileName){},
+        onProgress: function(id, fileName, loaded, total){},
+        onComplete: function(id, fileName, responseJSON){},
+        onAllComplete: function(completed_files){},
+        onCancel: function(id, fileName){},
+        // messages                
+        messages: {
+            typeError: "{file} has invalid extension. Only {extensions} are allowed.",
+            sizeError: "{file} is too large, maximum file size is {sizeLimit}.",
+            minSizeError: "{file} is too small, minimum file size is {minSizeLimit}.",
+            emptyError: "{file} is empty, please select files again without it.",
+            onLeave: "The files are being uploaded, if you leave now the upload will be cancelled."            
+        },
+        showMessage: function(message){
+            alert(message);
+        }               
+    };
+    qq.extend(this._options, o);
+        
+    // number of files being uploaded
+    this._filesInProgress = 0;
+    this._handler = this._createUploadHandler(); 
+    
+    if (this._options.button){ 
+        this._button = this._createUploadButton(this._options.button);
+    }
+                        
+    this._preventLeaveInProgress();         
+};
+   
+qq.FileUploaderBasic.prototype = {
+    setParams: function(params){
+        this._options.params = params;
+    },
+    getInProgress: function(){
+        return this._filesInProgress;         
+    },
+    _createUploadButton: function(element){
+        var self = this;
+        
+        return new qq.UploadButton({
+            element: element,
+            multiple: this._options.multiple && qq.UploadHandlerXhr.isSupported(),
+            onChange: function(input){
+                self._onInputChange(input);
+            }        
+        });           
+    },    
+    _createUploadHandler: function(){
+        var self = this,
+            handlerClass;        
+        
+        if(qq.UploadHandlerXhr.isSupported()){           
+            handlerClass = 'UploadHandlerXhr';                        
+        } else {
+            handlerClass = 'UploadHandlerForm';
+        }
+
+        var handler = new qq[handlerClass]({
+            debug: this._options.debug,
+            action: this._options.action,         
+            maxConnections: this._options.maxConnections,   
+            onProgress: function(id, fileName, loaded, total){                
+                self._onProgress(id, fileName, loaded, total);
+                self._options.onProgress(id, fileName, loaded, total);                    
+            },            
+            onComplete: function(id, fileName, result){
+                self._onComplete(id, fileName, result);
+                self._options.onComplete(id, fileName, result);
+            },
+            onAllComplete: function(completed_files){
+                self._options.onAllComplete(completed_files);
+            },
+            onCancel: function(id, fileName){
+                self._onCancel(id, fileName);
+                self._options.onCancel(id, fileName);
+            }
+        });
+
+        return handler;
+    },    
+    _preventLeaveInProgress: function(){
+        return;
+        var self = this;
+        
+        qq.attach(window, 'beforeunload', function(e){
+            if (!self._filesInProgress){return;}
+            
+            var e = e || window.event;
+            // for ie, ff
+            e.returnValue = self._options.messages.onLeave;
+            // for webkit
+            return self._options.messages.onLeave;             
+        });        
+    },    
+    _onSubmit: function(id, fileName){
+        this._filesInProgress++;  
+    },
+    _onProgress: function(id, fileName, loaded, total){        
+    },
+    _onComplete: function(id, fileName, result){
+        this._filesInProgress--;                 
+        if (result.error){
+            this._options.showMessage(result.error);
+        }             
+    },
+    _onCancel: function(id, fileName){
+        this._filesInProgress--;        
+    },
+    _onInputChange: function(input){
+        if (this._handler instanceof qq.UploadHandlerXhr){                
+            this._uploadFileList(input.files);                   
+        } else {             
+            if (this._validateFile(input)){                
+                this._uploadFile(input);                                    
+            }                      
+        }               
+        this._button.reset();   
+    },  
+    _uploadFileList: function(files){
+        for (var i=0; i<files.length; i++){
+            if ( !this._validateFile(files[i])){
+                return;
+            }            
+        }
+        
+        for (var i=0; i<files.length; i++){
+            this._uploadFile(files[i]);        
+        }        
+    },       
+    _uploadFile: function(fileContainer){      
+        var id = this._handler.add(fileContainer);
+        var fileName = this._handler.getName(id);
+        
+        if (this._options.onSubmit(id, fileName) !== false){
+            this._onSubmit(id, fileName);
+            this._handler.upload(id, this._options.params);
+        }
+    },      
+    _validateFile: function(file){
+        var name, size;
+        
+        if (file.value){
+            // it is a file input            
+            // get input value and remove path to normalize
+            name = file.value.replace(/.*(\/|\\)/, "");
+        } else {
+            // fix missing properties in Safari
+            name = file.fileName != null ? file.fileName : file.name;
+            size = file.fileSize != null ? file.fileSize : file.size;
+        }
+                    
+        if (! this._isAllowedExtension(name)){            
+            this._error('typeError', name);
+            return false;
+            
+        } else if (size === 0){            
+            this._error('emptyError', name);
+            return false;
+                                                     
+        } else if (size && this._options.sizeLimit && size > this._options.sizeLimit){            
+            this._error('sizeError', name);
+            return false;
+                        
+        } else if (size && size < this._options.minSizeLimit){
+            this._error('minSizeError', name);
+            return false;            
+        }
+        
+        return true;                
+    },
+    _error: function(code, fileName){
+        var message = this._options.messages[code];        
+        function r(name, replacement){ message = message.replace(name, replacement); }
+        
+        r('{file}', this._formatFileName(fileName));        
+        r('{extensions}', this._options.allowedExtensions.join(', '));
+        r('{sizeLimit}', this._formatSize(this._options.sizeLimit));
+        r('{minSizeLimit}', this._formatSize(this._options.minSizeLimit));
+        
+        this._options.showMessage(message);                
+    },
+    _formatFileName: function(name){
+        if (name.length > 33){
+            name = name.slice(0, 19) + '...' + name.slice(-13);    
+        }
+        return name;
+    },
+    _isAllowedExtension: function(fileName){
+        var ext = (-1 !== fileName.indexOf('.')) ? fileName.replace(/.*[.]/, '').toLowerCase() : '';
+        var allowed = this._options.allowedExtensions;
+        
+        if (!allowed.length){return true;}        
+        
+        for (var i=0; i<allowed.length; i++){
+            if (allowed[i].toLowerCase() == ext){ return true;}    
+        }
+        
+        return false;
+    },    
+    _formatSize: function(bytes){
+        var i = -1;                                    
+        do {
+            bytes = bytes / 1024;
+            i++;  
+        } while (bytes > 99);
+        
+        return Math.max(bytes, 0.1).toFixed(1) + ['kB', 'MB', 'GB', 'TB', 'PB', 'EB'][i];          
+    }
+};
+    
+       
+/**
+ * Class that creates upload widget with drag-and-drop and file list
+ * @inherits qq.FileUploaderBasic
+ */
+qq.FileUploader = function(o){
+    // call parent constructor
+    qq.FileUploaderBasic.apply(this, arguments);
+    
+    // additional options    
+    qq.extend(this._options, {
+        element: null,
+        // if set, will be used instead of qq-upload-list in template
+        listElement: null,
+                
+        template: '<span class="qq-uploader">' +
+                //'<div class="qq-upload-drop-area"><span>' + o.text.drop + '</span></div>' +
+                '<span class="qq-upload-button">' + o.text.attach + '</span>' +
+                '<ul class="qq-upload-list"></ul>' + 
+             '</span>',
+
+        // template for one item in file list
+        fileTemplate: '<li>' +
+                '<span class="qq-upload-file"></span>' +
+                '<span class="qq-upload-spinner"></span>' +
+                '<span class="qq-upload-size"></span>' +
+                '<a class="qq-upload-cancel" href="#">' + o.text.cancel + '</a>' +
+                '<span class="qq-upload-failed-text">' + o.text.failed + '</span>' +
+            '</li>',        
+        
+        classes: {
+            // used to get elements from templates
+            button: 'qq-upload-button',
+            //drop: 'qq-upload-drop-area',
+            //dropActive: 'qq-upload-drop-area-active',
+            list: 'qq-upload-list',
+                        
+            file: 'qq-upload-file',
+            spinner: 'qq-upload-spinner',
+            size: 'qq-upload-size',
+            cancel: 'qq-upload-cancel',
+
+            // added to list item when upload completes
+            // used in css to hide progress spinner
+            success: 'qq-upload-success',
+            fail: 'qq-upload-fail'
+        }
+    });
+    // overwrite options with user supplied    
+    qq.extend(this._options, o);       
+
+    this._element = this._options.element;
+    this._element.innerHTML = this._options.template;        
+    this._listElement = this._options.listElement || this._find(this._element, 'list');
+    
+    this._classes = this._options.classes;
+        
+    this._button = this._createUploadButton(this._find(this._element, 'button'));        
+    
+    this._bindCancelEvent();
+    this._setupDragDrop();
+};
+
+// inherit from Basic Uploader
+qq.extend(qq.FileUploader.prototype, qq.FileUploaderBasic.prototype);
+
+qq.extend(qq.FileUploader.prototype, {
+    /**
+     * Gets one of the elements listed in this._options.classes
+     **/
+    _find: function(parent, type){                                
+        var element = qq.getByClass(parent, this._options.classes[type])[0];        
+        if (!element){
+            throw new Error('element not found ' + type);
+        }
+        
+        return element;
+    },
+    _setupDragDrop: function(){
+        return;
+        var self = this,
+            dropArea = this._find(this._element, 'drop');                        
+
+        var dz = new qq.UploadDropZone({
+            element: dropArea,
+            onEnter: function(e){
+                qq.addClass(dropArea, self._classes.dropActive);
+                e.stopPropagation();
+            },
+            onLeave: function(e){
+                e.stopPropagation();
+            },
+            onLeaveNotDescendants: function(e){
+                qq.removeClass(dropArea, self._classes.dropActive);  
+            },
+            onDrop: function(e){
+                dropArea.style.display = 'none';
+                qq.removeClass(dropArea, self._classes.dropActive);
+                if( !self.multiple && e.dataTransfer.files.length > 1 )
+                    alert( "Multiple file uploads are disabled." ) ;
+                else
+                    self._uploadFileList(e.dataTransfer.files);    
+            }
+        });
+                
+        dropArea.style.display = 'none';
+
+        qq.attach(document, 'dragenter', function(e){     
+            if (!dz._isValidFileDrag(e)) return; 
+            
+            dropArea.style.display = 'block';            
+        });                 
+        qq.attach(document, 'dragleave', function(e){
+            if (!dz._isValidFileDrag(e)) return;            
+            
+            var relatedTarget = document.elementFromPoint(e.clientX, e.clientY);
+            // only fire when leaving document out
+            if ( ! relatedTarget || relatedTarget.nodeName == "HTML"){               
+                dropArea.style.display = 'none';                                            
+            }
+        });                
+    },
+    _onSubmit: function(id, fileName){
+        qq.FileUploaderBasic.prototype._onSubmit.apply(this, arguments);
+        this._addToList(id, fileName);  
+    },
+    _onProgress: function(id, fileName, loaded, total){
+        qq.FileUploaderBasic.prototype._onProgress.apply(this, arguments);
+
+        var item = this._getItemByFileId(id);
+        var size = this._find(item, 'size');
+        size.style.display = 'inline';
+        
+        var text; 
+        if (loaded != total){
+            text = Math.round(loaded / total * 100) + '% from ' + this._formatSize(total);
+        } else {                                   
+            text = this._formatSize(total);
+        }          
+        
+        qq.setText(size, text);         
+    },
+    _onComplete: function(id, fileName, result){
+        qq.FileUploaderBasic.prototype._onComplete.apply(this, arguments);
+
+        // mark completed
+        var item = this._getItemByFileId(id);                
+        qq.remove(this._find(item, 'cancel'));
+        qq.remove(this._find(item, 'spinner'));
+        
+        if (result.success){
+            $(item).slideUp(300);
+            //qq.addClass(item, this._classes.success);
+        } else {
+            qq.innerHTML='';
+            //qq.addClass(item, this._classes.fail);
+        }         
+    },
+    _addToList: function(id, fileName){
+        var item = qq.toElement(this._options.fileTemplate);                
+        item.qqFileId = id;
+
+        var fileElement = this._find(item, 'file');        
+        qq.setText(fileElement, this._formatFileName(fileName));
+        qq.setText(fileElement, this._formatFileName(fileName));
+        this._find(item, 'size').style.display = 'none';        
+
+        this._listElement.appendChild(item);
+    },
+    _getItemByFileId: function(id){
+        var item = this._listElement.firstChild;        
+        
+        // there can't be txt nodes in dynamically created list
+        // and we can  use nextSibling
+        while (item){            
+            if (item.qqFileId == id) return item;            
+            item = item.nextSibling;
+        }          
+    },
+    /**
+     * delegate click event for cancel link 
+     **/
+    _bindCancelEvent: function(){
+        var self = this,
+            list = this._listElement;            
+        
+        qq.attach(list, 'click', function(e){            
+            e = e || window.event;
+            var target = e.target || e.srcElement;
+            
+            if (qq.hasClass(target, self._classes.cancel)){                
+                qq.preventDefault(e);
+               
+                var item = target.parentNode;
+                self._handler.cancel(item.qqFileId);
+                qq.remove(item);
+            }
+        });
+    }    
+});
+    
+qq.UploadDropZone = function(o){
+    return;
+    this._options = {
+        element: null,  
+        onEnter: function(e){},
+        onLeave: function(e){},  
+        // is not fired when leaving element by hovering descendants   
+        onLeaveNotDescendants: function(e){},   
+        onDrop: function(e){}                       
+    };
+    qq.extend(this._options, o); 
+    
+    this._element = this._options.element;
+    
+    this._disableDropOutside();
+    this._attachEvents();   
+};
+
+/*
+qq.UploadDropZone.prototype = {
+    _disableDropOutside: function(e){
+        // run only once for all instances
+        if (!qq.UploadDropZone.dropOutsideDisabled ){
+
+            qq.attach(document, 'dragover', function(e){
+                if (e.dataTransfer){
+                    e.dataTransfer.dropEffect = 'none';
+                    e.preventDefault(); 
+                }           
+            });
+            
+            qq.UploadDropZone.dropOutsideDisabled = true; 
+        }        
+    },
+    _attachEvents: function(){
+        var self = this;              
+                  
+        qq.attach(self._element, 'dragover', function(e){
+            if (!self._isValidFileDrag(e)) return;
+            
+            var effect = e.dataTransfer.effectAllowed;
+            if (effect == 'move' || effect == 'linkMove'){
+                e.dataTransfer.dropEffect = 'move'; // for FF (only move allowed)    
+            } else {                    
+                e.dataTransfer.dropEffect = 'copy'; // for Chrome
+            }
+                                                     
+            e.stopPropagation();
+            e.preventDefault();                                                                    
+        });
+        
+        qq.attach(self._element, 'dragenter', function(e){
+            if (!self._isValidFileDrag(e)) return;
+                        
+            self._options.onEnter(e);
+        });
+        
+        qq.attach(self._element, 'dragleave', function(e){
+            if (!self._isValidFileDrag(e)) return;
+            
+            self._options.onLeave(e);
+            
+            var relatedTarget = document.elementFromPoint(e.clientX, e.clientY);                      
+            // do not fire when moving a mouse over a descendant
+            if (qq.contains(this, relatedTarget)) return;
+                        
+            self._options.onLeaveNotDescendants(e); 
+        });
+                
+        qq.attach(self._element, 'drop', function(e){
+            if (!self._isValidFileDrag(e)) return;
+            
+            e.preventDefault();
+            self._options.onDrop(e);
+        });          
+    },
+    _isValidFileDrag: function(e){
+        var dt = e.dataTransfer,
+            // do not check dt.types.contains in webkit, because it crashes safari 4            
+            isWebkit = navigator.userAgent.indexOf("AppleWebKit") > -1;                        
+
+        // dt.effectAllowed is none in Safari 5
+        // dt.types.contains check is for firefox            
+        return dt && dt.effectAllowed != 'none' && 
+            (dt.files || (!isWebkit && dt.types.contains && dt.types.contains('Files')));
+        
+    }        
+}; 
+*/
+qq.UploadButton = function(o){
+    this._options = {
+        element: null,  
+        // if set to true adds multiple attribute to file input      
+        multiple: false,
+        // name attribute of file input
+        name: 'file',
+        onChange: function(input){},
+        hoverClass: 'qq-upload-button-hover',
+        focusClass: 'qq-upload-button-focus'                       
+    };
+    
+    qq.extend(this._options, o);
+        
+    this._element = this._options.element;
+    
+    // make button suitable container for input
+    qq.css(this._element, {
+        position: 'relative',
+        overflow: 'hidden',
+        // Make sure browse button is in the right side
+        // in Internet Explorer
+        direction: 'ltr'
+    });   
+    
+    this._input = this._createInput();
+};
+
+qq.UploadButton.prototype = {
+    /* returns file input element */    
+    getInput: function(){
+        return this._input;
+    },
+    /* cleans/recreates the file input */
+    reset: function(){
+        if (this._input.parentNode){
+            qq.remove(this._input);    
+        }                
+        
+        qq.removeClass(this._element, this._options.focusClass);
+        this._input = this._createInput();
+    },    
+    _createInput: function(){                
+        var input = document.createElement("input");
+        
+        if (this._options.multiple){
+            input.setAttribute("multiple", "multiple");
+        }
+                
+        input.setAttribute("type", "file");
+        input.setAttribute("name", this._options.name);
+        
+        qq.css(input, {
+            position: 'absolute',
+            // in Opera only 'browse' button
+            // is clickable and it is located at
+            // the right side of the input
+            right: 0,
+            top: '6px',
+            fontFamily: 'Arial',
+            // 4 persons reported this, the max values that worked for them were 243, 236, 236, 118
+            fontSize: '2px',
+            margin: 0,
+            padding: 0,
+            cursor: 'pointer',
+            opacity: 0
+        });
+        
+        this._element.appendChild(input);
+
+        var self = this;
+        qq.attach(input, 'change', function(){
+            self._options.onChange(input);
+        });
+                
+        qq.attach(input, 'mouseover', function(){
+            qq.addClass(self._element, self._options.hoverClass);
+        });
+        qq.attach(input, 'mouseout', function(){
+            qq.removeClass(self._element, self._options.hoverClass);
+        });
+        qq.attach(input, 'focus', function(){
+            qq.addClass(self._element, self._options.focusClass);
+        });
+        qq.attach(input, 'blur', function(){
+            qq.removeClass(self._element, self._options.focusClass);
+        });
+
+        // IE and Opera, unfortunately have 2 tab stops on file input
+        // which is unacceptable in our case, disable keyboard access
+        if (window.attachEvent){
+            // it is IE or Opera
+            input.setAttribute('tabIndex', "-1");
+        }
+
+        return input;            
+    }        
+};
+
+/**
+ * Class for uploading files, uploading itself is handled by child classes
+ */
+qq.UploadHandlerAbstract = function(o){
+    this._options = {
+        debug: false,
+        action: '/upload.php',
+        // maximum number of concurrent uploads        
+        maxConnections: 999,
+        onProgress: function(id, fileName, loaded, total){},
+        onComplete: function(id, fileName, response){},
+        onAllComplete: function(completed_files){},
+        onCancel: function(id, fileName){}
+    };
+    qq.extend(this._options, o);    
+    
+    this._queue = [];
+    // params for files in queue
+    this._params = [];
+    this._completed_files = [];
+};
+qq.UploadHandlerAbstract.prototype = {
+    log: function(str){
+        if (this._options.debug && window.console) console.log('[uploader] ' + str);
+    },
+    /**
+     * Adds file or file input to the queue
+     * @returns id
+     **/    
+    add: function(file){},
+    /**
+     * Sends the file identified by id and additional query params to the server
+     */
+    upload: function(id, params){
+        var len = this._queue.push(id);
+
+        var copy = {};        
+        qq.extend(copy, params);
+        this._params[id] = copy;        
+                
+        // if too many active uploads, wait...
+        if (len <= this._options.maxConnections){
+            this._upload(id, this._params[id]);
+        }
+    },
+    /**
+     * Cancels file upload by id
+     */
+    cancel: function(id){
+        this._cancel(id);
+        this._dequeue(id);
+    },
+    /**
+     * Cancells all uploads
+     */
+    cancelAll: function(){
+        for (var i=0; i<this._queue.length; i++){
+            this._cancel(this._queue[i]);
+        }
+        this._queue = [];
+    },
+    /**
+     * Returns name of the file identified by id
+     */
+    getName: function(id){},
+    /**
+     * Returns size of the file identified by id
+     */          
+    getSize: function(id){},
+    /**
+     * Returns id of files being uploaded or
+     * waiting for their turn
+     */
+    getQueue: function(){
+        return this._queue;
+    },
+    /**
+     * Actual upload method
+     */
+    _upload: function(id){},
+    /**
+     * Actual cancel method
+     */
+    _cancel: function(id){},     
+    /**
+     * Removes element from queue, starts upload of next
+     */
+    _dequeue: function(id){
+        var i = qq.indexOf(this._queue, id);
+        this._queue.splice(i, 1);
+                
+        var max = this._options.maxConnections;
+        
+        if (this._queue.length >= max){
+            var nextId = this._queue[max-1];
+            this._upload(nextId, this._params[nextId]);
+        }
+        
+        if (this._queue.length == 0){
+          this._onAllComplete();
+        }
+    },
+    _onAllComplete: function(){
+      this._options.onAllComplete(this._completed_files);
+    }
+};
+
+/**
+ * Class for uploading files using form and iframe
+ * @inherits qq.UploadHandlerAbstract
+ */
+qq.UploadHandlerForm = function(o){
+    qq.UploadHandlerAbstract.apply(this, arguments);
+    
+    this._inputs = {};
+};
+// @inherits qq.UploadHandlerAbstract
+qq.extend(qq.UploadHandlerForm.prototype, qq.UploadHandlerAbstract.prototype);
+
+qq.extend(qq.UploadHandlerForm.prototype, {
+    add: function(fileInput){
+        fileInput.setAttribute('name', 'qqfile');
+        var id = 'qq-upload-handler-iframe' + qq.getUniqueId();       
+        
+        this._inputs[id] = fileInput;
+        
+        // remove file input from DOM
+        if (fileInput.parentNode){
+            qq.remove(fileInput);
+        }
+                
+        return id;
+    },
+    getName: function(id){
+        // get input value and remove path to normalize
+        return this._inputs[id].value.replace(/.*(\/|\\)/, "");
+    },    
+    _cancel: function(id){
+        this._options.onCancel(id, this.getName(id));
+        
+        delete this._inputs[id];        
+
+        var iframe = document.getElementById(id);
+        if (iframe){
+            // to cancel request set src to something else
+            // we use src="javascript:false;" because it doesn't
+            // trigger ie6 prompt on https
+            iframe.setAttribute('src', 'javascript:false;');
+
+            qq.remove(iframe);
+        }
+    },     
+    _upload: function(id, params){
+        var input = this._inputs[id];
+        
+        if (!input){
+            throw new Error('file with passed id was not added, or already uploaded or cancelled');
+        }                
+
+        var fileName = this.getName(id);
+                
+        var iframe = this._createIframe(id);
+        var form = this._createForm(iframe, params);
+        form.appendChild(input);
+
+        var self = this;
+        this._attachLoadEvent(iframe, function(){
+            self.log('iframe loaded');
+            
+            var response = self._getIframeContentJSON(iframe);
+
+            self._options.onComplete(id, fileName, response);
+            self._dequeue(id);
+            
+            delete self._inputs[id];
+            // timeout added to fix busy state in FF3.6
+            setTimeout(function(){
+                qq.remove(iframe);
+            }, 1);
+        });
+
+        form.submit();
+        qq.remove(form);        
+        
+        return id;
+    }, 
+    _attachLoadEvent: function(iframe, callback){
+        qq.attach(iframe, 'load', function(){
+            // when we remove iframe from dom
+            // the request stops, but in IE load
+            // event fires
+            if (!iframe.parentNode){
+                return;
+            }
+
+            // fixing Opera 10.53
+            if (iframe.contentDocument &&
+                iframe.contentDocument.body &&
+                iframe.contentDocument.body.innerHTML == "false"){
+                // In Opera event is fired second time
+                // when body.innerHTML changed from false
+                // to server response approx. after 1 sec
+                // when we upload file with iframe
+                return;
+            }
+
+            callback();
+        });
+    },
+    /**
+     * Returns json object received by iframe from server.
+     */
+    _getIframeContentJSON: function(iframe){
+        // iframe.contentWindow.document - for IE<7
+        var doc = iframe.contentDocument ? iframe.contentDocument: iframe.contentWindow.document,
+            response;
+        
+        this.log("converting iframe's innerHTML to JSON");
+        this.log("innerHTML = " + doc.body.innerHTML);
+
+        var htmlNode = document.createElement('div');
+        htmlNode.innerHTML = doc.body.innerHTML;
+        var responseText;
+        if (htmlNode.innerText) {
+            responseText = htmlNode.innerText; // IE
+        }
+        responseText = htmlNode.textContent; // FF
+
+
+        try {
+            response = eval("(" + responseText + ")");
+        } catch(err){
+            response = $.parseJSON(responseText);
+        }
+
+        return response;
+    },
+    /**
+     * Creates iframe with unique name
+     */
+    _createIframe: function(id){
+        // We can't use following code as the name attribute
+        // won't be properly registered in IE6, and new window
+        // on form submit will open
+        // var iframe = document.createElement('iframe');
+        // iframe.setAttribute('name', id);
+
+        var iframe = qq.toElement('<iframe src="javascript:false;" name="' + id + '" />');
+        // src="javascript:false;" removes ie6 prompt on https
+
+        iframe.setAttribute('id', id);
+
+        iframe.style.display = 'none';
+        document.body.appendChild(iframe);
+
+        return iframe;
+    },
+    /**
+     * Creates form, that will be submitted to iframe
+     */
+    _createForm: function(iframe, params){
+        var form = null ; 
+        if( params.csrf_token && params.csrf_name )
+        {
+            var csrf = '<input type="hidden" name="'+ params.csrf_name  +'" value="' + params.csrf_token + '" />' ;
+            form = qq.toElement('<form method="post" enctype="multipart/form-data">' + csrf + '</form>');
+        }
+        else
+            form = qq.toElement('<form method="post" enctype="multipart/form-data"></form>');
+       
+        // get rid of the csrf parameters
+        delete params.csrf_token ;
+        delete params.csrf_name ;
+        delete params.csrf_xname ;
+        
+        var queryString = qq.obj2url(params, this._options.action);
+
+        form.setAttribute('action', queryString);
+        form.setAttribute('target', iframe.name);
+        form.style.display = 'none';
+        document.body.appendChild(form);
+
+        return form;
+    }
+});
+
+/**
+ * Class for uploading files using xhr
+ * @inherits qq.UploadHandlerAbstract
+ */
+qq.UploadHandlerXhr = function(o){
+    qq.UploadHandlerAbstract.apply(this, arguments);
+
+    this._files = [];
+    this._xhrs = [];
+    
+    // current loaded size in bytes for each file 
+    this._loaded = [];
+};
+
+// static method
+qq.UploadHandlerXhr.isSupported = function(){
+    var input = document.createElement('input');
+    input.type = 'file';        
+    
+    return (
+        'multiple' in input &&
+        typeof File != "undefined" &&
+        typeof (new XMLHttpRequest()).upload != "undefined" );       
+};
+
+// @inherits qq.UploadHandlerAbstract
+qq.extend(qq.UploadHandlerXhr.prototype, qq.UploadHandlerAbstract.prototype)
+
+qq.extend(qq.UploadHandlerXhr.prototype, {
+    /**
+     * Adds file to the queue
+     * Returns id to use with upload, cancel
+     **/    
+    add: function(file){
+        if (!(file instanceof File)){
+            throw new Error('Passed obj is not a File (in qq.UploadHandlerXhr)');
+        }
+                
+        return this._files.push(file) - 1;        
+    },
+    getName: function(id){
+        var file = this._files[id];
+        // fix missing name in Safari 4
+        return file.fileName != null ? file.fileName : file.name;       
+    },
+    getSize: function(id){
+        var file = this._files[id];
+        return file.fileSize != null ? file.fileSize : file.size;
+    },    
+    /**
+     * Returns uploaded bytes for file identified by id 
+     */    
+    getLoaded: function(id){
+        return this._loaded[id] || 0; 
+    },
+    /**
+     * Sends the file identified by id and additional query params to the server
+     * @param {Object} params name-value string pairs
+     */    
+    _upload: function(id, params){
+        var file = this._files[id],
+            name = this.getName(id),
+            size = this.getSize(id);
+                
+        this._loaded[id] = 0;
+                                
+        var xhr = this._xhrs[id] = new XMLHttpRequest();
+        var self = this;
+                                        
+        xhr.upload.onprogress = function(e){
+            if (e.lengthComputable){
+                self._loaded[id] = e.loaded;
+                self._options.onProgress(id, name, e.loaded, e.total);
+            }
+        };
+
+        xhr.onreadystatechange = function(){
+            if (xhr.readyState == 4){
+                self._onComplete(id, xhr);
+            }
+        };
+
+        // build query string
+        params = params || {};
+        var token = false ;
+        var xname = false ;
+        if( params.csrf_token && params.csrf_xname )
+        {
+            token = params.csrf_token ;
+            xname = params.csrf_xname ;
+            delete params.csrf_token ;
+            delete params.csrf_xname ;
+            delete params.csrf_name ;
+        }  
+        params['qqfile'] = name;
+        var queryString = qq.obj2url(params, this._options.action);
+
+        xhr.open("POST", queryString, true);
+        xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
+        xhr.setRequestHeader("X-File-Name", encodeURIComponent(name));
+        xhr.setRequestHeader("Content-Type", "application/octet-stream");
+        if( token )
+            xhr.setRequestHeader( xname, token ) ;
+        xhr.send(file);
+    },
+    _onComplete: function(id, xhr){
+        // the request was aborted/cancelled
+        if (!this._files[id]) return;
+        
+        var name = this.getName(id);
+        var size = this.getSize(id);
+        
+        this._options.onProgress(id, name, size, size);
+                
+        if (xhr.status == 200 || xhr.status == 201){
+            this.log("xhr - server response received");
+            this.log("responseText = " + xhr.responseText);
+                        
+            var response;
+                    
+            try {
+                response = eval("(" + xhr.responseText + ")");
+            } catch(err){
+                response = {};
+            }
+            this._completed_files.push({file: this._files[id], response: response})
+            this._options.onComplete(id, name, response);
+
+        } else {
+            this._completed_files.push({file: this._files[id], response: {} })
+            this._options.onComplete(id, name, {});
+        }
+        
+        this._files[id] = null;
+        this._xhrs[id] = null;
+        this._dequeue(id);
+    },
+    _cancel: function(id){
+        this._options.onCancel(id, this.getName(id));
+        
+        this._files[id] = null;
+        
+        if (this._xhrs[id]){
+            this._xhrs[id].abort();
+            this._xhrs[id] = null;                                   
+        }
+    }
+});
diff --git a/data/treeio/treeio/static/js/hardtree.js b/data/treeio/treeio/static/js/hardtree.js
new file mode 100644
index 0000000..38f6b99
--- /dev/null
+++ b/data/treeio/treeio/static/js/hardtree.js
@@ -0,0 +1,1425 @@
+/* Copyright Tree.io 2011
+ * This file is part of Treeio
+ * License: www.tree.io/license
+*/
+
+var treeio = {
+  'put_mce': function(doc) {
+      var obj;
+      if (doc) {
+        obj = $('textarea', doc);
+      } else {
+        obj = $('textarea');
+      }
+      obj.each(function() {
+        if (!$(this).hasClass('no-editor')) {
+            $(this).attr('id', doc.attr('id') + "-" + $(this).attr('id'));
+            if ($(this).hasClass('full-editor')) {
+                $(this).tinymce({
+                  script_url : '/static/js/tinymce/jscripts/tiny_mce/tiny_mce.js',
+                  theme : "advanced",
+                  skin : "cirkuit",
+                  relative_urls: false,
+                  plugins : "safari,table,advhr,inlinepopups,insertdatetime,preview,searchreplace,contextmenu,paste,fullscreen,nonbreaking,visualchars,xhtmlxtras",
+                  theme_advanced_buttons1 : "bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,formatselect,fontselect,fontsizeselect,|,cut,copy,paste,pastetext,pasteword,|,search,replace",
+                  theme_advanced_buttons2 : "bullist,numlist,|,outdent,indent,blockquote,|,undo,redo,|,link,unlink,image,cleanup,code,|,insertdate,inserttime,preview,|,forecolor,backcolor,|,cite,abbr,acronym,del,ins",
+                  theme_advanced_buttons3 : "tablecontrols,|,hr,removeformat,|,sub,sup,|,visualchars,nonbreaking,charmap,advhr,|,fullscreen",
+                    theme_advanced_disable : 'help,styleselect,anchor,newdocument',
+                  theme_advanced_toolbar_location : "top",
+                  theme_advanced_toolbar_align : "left",
+                  theme_advanced_statusbar_location : "bottom",
+                  theme_advanced_resizing : true,
+                    theme_advanced_resize_horizontal : true, 
+                    theme_advanced_resizing_use_cookie : true,
+                    theme_advanced_path : false, 
+                      width: "70%"
+                });
+            } else {
+                // $(this).tinymce({
+                //   script_url : '/static/js/tinymce/jscripts/tiny_mce/tiny_mce.js',
+                //   theme : 'advanced',
+                //     skin : "cirkuit",
+                //     relative_urls: false,
+                //     plugins : "safari,table,advhr,inlinepopups,insertdatetime,preview,searchreplace,contextmenu,paste,fullscreen,nonbreaking,visualchars,xhtmlxtras",
+                //   theme_advanced_statusbar_location : 'bottom',
+                //   theme_advanced_toolbar_location : 'top',
+                //   theme_advanced_toolbar_align : 'left',
+                //   theme_advanced_path : false, 
+                //   theme_advanced_resizing : true, 
+                //   theme_advanced_resize_horizontal : true, 
+                //   theme_advanced_resizing_use_cookie : true,
+                //   theme_advanced_disable : 'justifyleft,justifycenter,justifyright,justifyfull,outdent,indent,image,help,hr,removeformat,formatselect,fontselect,fontsizeselect,styleselect,sub,sup,forecolor,backcolor,forecolorpicker,backcolorpicker,charmap,visualaid,anchor,newdocument,blockquote',
+                //   theme_advanced_buttons1 : 'bold,italic,underline,strikethrough,|,undo,redo,|,cut,copy,paste,link,unlink,cleanup,|,bullist,numlist,|,code',
+                //   theme_advanced_buttons2 : '',
+                //   theme_advanced_buttons3 : '',
+                //     width: "70%"
+                // });
+            }
+        }
+    });
+  },
+    
+    'remove_mce': function(doc) {
+        var obj;
+    if (doc) {
+      obj = $('textarea', doc);
+    } else {
+      obj = $('textarea');
+    }
+        obj.each(function() {
+            tinyMCE.execCommand('mceRemoveControl',false,$(this).attr2('id'));
+        })
+    },
+    
+    'do_ajax': function(){
+        // Process request on hashchange
+        var url = window.location.hash.replace(/#/gi, "");
+        if (!url) {
+          url = window.location.pathname;
+        }
+        var menu = $(".menu-item a[href=\"\#" + url + "\"]");
+        if (menu.length) {
+            if (!menu.hasClass('active')) {
+                var modname = menu.attr2('id').substring(5);
+                block = $('#module-' + modname);
+                if (block.length) {
+                    $('.module-block').each(function() {
+                      if ($(this).attr2('id') != block.attr2('id')) {
+                        $(this).css('display', 'none');
+                        $(this).data('active', false);
+                      } else {
+                        block.css('display', 'block');
+                        block.data('active', true);
+                      }
+                    });
+                    document.title = block.data('title');
+                    $(".menu-item a").each(function(){
+                        $(this).removeClass('active')
+                    });
+                    menu.addClass('active')
+                    url = '';
+                }
+            }
+        }
+        if (url) {
+            url = treeio.prepare_url(url);
+            //url = treeio.utils.strip_host(url);
+            $("#loading-status").css('display', 'block');
+            $("#loading-status-text").html('Loading...');
+            $.ajax({
+                'url': url,
+                'dataType': 'json',
+                'success': treeio.process_ajax,
+                'complete': treeio.process_html,
+                'error': treeio.show_error
+            })
+        }
+    },
+    
+    'show_error': function() {
+        $("#loading-status-text").html('Something went wrong...');
+    },
+    
+    'process_userblock': function(data) {
+        if (data.response.messages) {
+            $('#userblock-messages').each(function() {
+                $(this).html(data.response.messages);
+            });
+        }
+    },
+
+   'process_ajax': function(data, status, xhr) {
+       console.log(status);
+       console.log(data);
+        if (!data) {
+          return;
+        }
+        if (data.popup) {
+            treeio.process_popup_data(data);
+            return;
+        }
+        if (data.redirect) {
+            if (window.location.hash == "#" + data.redirect) {
+                treeio.do_ajax();
+            } else {
+                window.location.hash = data.redirect;
+            }
+            return;
+        } else if (data.redirect_out) {
+            window.location = data.redirect_out;
+            return;
+        }
+        if (data.response.url) {
+            var urljs = data.response.url.replace('.ajax', '');
+            var urlcurr = window.location.hash.replace('#', '');
+            if (urljs != urlcurr) {
+                if (urljs.indexOf(urlcurr) == -1 && urlcurr.indexOf(urljs) == -1) {
+                  $("#loading-status").css('display', 'none');
+                  return;
+                }
+            }
+        }
+        document.title = data.response.content.title;
+        var content = data.response.content.module_content;
+        var module = data.response.modules.active;
+          var sidebardisplay = 'block';
+        if ($("#module-" + module).length == 0) {
+            $("#content").append("<div class=\"module-block\" id=\"module-" + module + "\"></div>");
+        } else {
+            var sidebar = $("td.module-sidebar-right", $("#module-" + module));
+            if (sidebar) {
+                sidebardisplay = sidebar.css('display');
+            }
+          }
+        var block = $("#module-" + module);
+        $('.module-block').each(function() {
+          if ($(this).attr2('id') != block.attr2('id')) {
+            $(this).css('display', 'none');
+            $(this).data('active', false);
+          } else {
+            block.css('display', 'block');
+            block.data('active', true);
+          }
+          });
+          treeio.remove_mce($("#module-" + module + " form"));
+        $("#module-" + module).html(content);
+        if ($("#module-" + module + " form").length) {
+          treeio.prepare_forms(block);
+          treeio.prepare_comments(block)
+          if ($("#module-" + module + " textarea").length) {
+            treeio.put_mce(block);
+          }
+        }
+          treeio.prepare_tags(block);
+          treeio.prepare_list_actions(block);
+          treeio.prepare_attachments(block);
+          treeio.prepare_invites(block);
+          treeio.prepare_popups(block);
+          treeio.convert_links(block);
+          treeio.prepare_ajax_links(block);
+          treeio.prepare_slider_sidebar(block, sidebardisplay);
+          treeio.showhidejs(block);
+          treeio.prepare_module_stuff(module);
+          treeio.process_notifications(data.response.notifications);
+        $(".menu-item a").each(function(){
+            $(this).removeClass('active')
+        });
+          treeio.process_userblock(data);
+        $("#menu-" + module).addClass('active')
+        $(block).data('title', data.response.content.title);
+        if ($('#loading-splash').css('display') != 'none') {
+        	$('#loading-splash').fadeOut();
+        }
+        $("#loading-status").css('display', 'none');
+  },
+  
+  'process_notifications': function(msgs) {
+      for (var i in msgs) {
+          var msg = {'title': ' ',
+                     'text': msgs[i].message,
+                     'image': '/static/notifications/'+msgs[i].tags+'.png'};
+          if (msgs[i].title) {
+            msg['title'] = msgs[i].title;
+          }
+          if (msgs[i].image) {
+            msg['image'] = msgs[i].image;
+          }
+          $.gritter.add(msg);
+      }
+  },
+
+  'process_html': function(xhr, status) {
+      if (status == 'parsererror') {
+          window.document.write(xhr.responseText);
+      }
+  },
+    
+  'prepare_module_stuff': function(module_name) {
+      try
+      {
+          treeio.modules[module_name].init();
+      }
+      catch(err){}
+      
+  },
+  
+  'prepare_url': function(url) {
+        if ((url.indexOf("!") != -1) || (url.indexOf("?") != -1)) {
+            url = url.replace("!", "?");
+            if (url.indexOf(".ajax") == -1) {
+                url = url.replace("?", ".ajax?");
+            }
+        }
+        if (url.indexOf(".ajax") == -1) {
+            url += ".ajax?";
+        }
+    return url;
+  },
+  
+  'showhidejs': function(doc) {
+      if (doc) {
+          var showjs = $('div.showjs', doc);
+          var hidejs = $('div.hidejs', doc);
+      } else {
+          var showjs = $('div.showjs');
+          var hidejs = $('div.hidejs');
+      }
+      showjs.each(function() {
+        $(this).css('display', 'block');
+      })
+      hidejs.each(function() {
+        $(this).css('display', 'none');
+      })
+  },
+    
+  'convert_links': function(doc) {
+      if (doc) {
+          var links = $('a', doc);
+      } else {
+          var links = $('a');
+      }
+      links.each(function() {
+          if ($.type($(this).attr('href')) === "string"){
+          if ($(this).attr('href') && !$(this).hasClass('ajax-link-out') &&  
+		   !$(this).hasClass('ajax-link') && !$(this).attr2('target') &&
+           !($(this).attr('href').substring(0,3) == 'www') &&
+           !($(this).attr('href').substring(0,5) == 'http:') &&
+           !($(this).attr('href').substring(0,6) == 'https:') &&
+           !($(this).attr('href').substring(0,4) == 'ftp:') &&
+           !($(this).attr('href').substring(0,7) == 'mailto:') &&
+           ($(this).attr('href').indexOf('#') == -1)) {
+            $(this).attr('href', ("#" + $(this).attr('href').replace("?", "!")));
+              if ($.browser.msie && $.browser.version.substr(0,1)<7) {
+                  var prefix = window.location.href.replace(window.location.hash, '');
+                  $(this).attr('href', $(this).attr('href').replace(prefix, ""));
+              }
+          }
+      }})
+  },
+  
+  'add_data': function(newdata) {
+	  var target = $(newdata.target);
+	  if (newdata.inner) {
+	  	target.html(newdata.content);
+	  } else if (newdata.append) {
+	  	target.append(newdata.content);
+	  } else {
+	  	var newelem = $(newdata.content);
+	  	target.replaceWith(newelem);
+	  	target = newelem;
+	  }
+	  if ($("form", target).length) {
+	      treeio.prepare_forms(target);
+	      treeio.prepare_comments(target);
+	      if ($("textarea", target).length) {
+	        treeio.put_mce(target);
+	      }
+	  }
+      treeio.prepare_tags(target);
+      treeio.prepare_list_actions(target);
+      treeio.prepare_attachments(target);
+      treeio.prepare_invites(target);
+      treeio.prepare_popups(target);
+      treeio.convert_links(target);
+      treeio.prepare_ajax_links(target);
+      treeio.showhidejs(target);
+      $("#loading-status").css('display', 'none');
+  },
+  
+  'prepare_ajax_links': function(doc) {
+      if (doc) {
+          var links = $('.ajax-link', doc);
+      } else {
+          var links = $('.ajax-link');
+      }
+      links.each(function() {
+    	  $(this).click(function() {
+    		  var target = $(this).parents($(this).attr('target'));
+	    	  var targetid = treeio.utils.generate_id();
+	    	  target.attr2('id', targetid);
+	          $(this).attr('target', '#'+targetid);
+    		  var callback = eval($(this).attr('callback'));
+    		  var cargs = eval('('+$(this).attr('args')+')');
+    		  if (cargs) {
+    			  var args = $.extend({'target': '#'+targetid}, cargs);
+    		  } else {
+    			  var args = {'target': '#'+targetid};
+    		  }
+              $("#loading-status").css('display', 'block');
+              $("#loading-status-text").html('Loading...');
+    		  callback(Dajax.process, args);
+    		  return false;
+    	  })
+      })
+  },
+  
+  'prepare_slider_sidebar': function(doc, display) {
+      if (!doc) {
+          var doc = $('.module-block');
+      }
+      var sliderbtn = $('<div></div>').addClass('sidebar-slider');
+      $('td.module-content-inner', doc).prepend(sliderbtn);
+      sliderbtn.data('sidebar', $('td.module-sidebar-right', doc));
+      sliderbtn.click(function(){
+          var sidebar = $(this).data('sidebar');
+          if (sidebar) {
+              if (sidebar.css('display') == 'none') {
+                  sidebar.fadeIn()
+                  //$(this).html("&gt;");
+              } else {
+                  sidebar.fadeOut();
+                  //$(this).html("&lt;");
+              }
+          }
+      })
+      
+      var sidebar = $('td.module-sidebar-right', doc);
+      
+      // The following adds appropriate icons to the slider button to show
+      // what's inside the sidebar
+      
+      // Add Quick Status icon
+      if ($('a.projects-action', sidebar).length != 0 || $('a.services-action', sidebar).length != 0) {
+        sliderbtn.append('<img src="/static/icons/sidebar/status.gif"/><br />');
+      }      
+      // Add Filter icon
+      if ($('form.content-filter-form', sidebar).length != 0) {
+        sliderbtn.append('<img src="/static/icons/sidebar/filter.gif"/><br />');
+      }
+      // Add Permissions icon
+      if ($('div.permission-links', sidebar).length != 0) {
+        sliderbtn.append('<img src="/static/icons/sidebar/permission.gif"/><br />'); 
+      }
+      // Add Linking icon
+      if ($('div.object-links', sidebar).length != 0) {
+        sliderbtn.append('<img src="/static/icons/sidebar/link.gif"/><br />'); 
+      }
+      // Add Subscription icon
+      if ($('div.subscription-users', sidebar).length != 0) {
+        sliderbtn.append('<img src="/static/icons/sidebar/subscribe.gif"/><br />'); 
+      }
+      // Add Export icon
+      if ($('a.pdf-block-link', sidebar).length != 0) {
+        sliderbtn.append('<img src="/static/icons/sidebar/export.gif"/><br />');
+      }
+
+      if (display) {
+          sidebar.css('display', display);
+      } else {
+          sidebar.css('display', 'none');
+          sliderbtn.css({
+                  visibility: 'hidden'
+              }) /* if module-sidebar-right is null then sidebar-slider hidden */
+      }
+  },
+  
+  'prepare_list_actions': function(doc) {
+      $(".content-list-item", doc).each(function() {
+          $("span.content-list-item-actions", $(this)).css('visibility', 'hidden');
+          $(this).mouseover( function() {
+              $("span.content-list-item-actions", $(this)).css('visibility', 'visible');
+          }).mouseout( function() {
+              $("span.content-list-item-actions", $(this)).css('visibility', 'hidden');
+          })
+          $("span.content-list-item-actions a", $(this)).addClass("popup-link");
+      })
+  },
+    
+  'put_datepicker': function(doc) {
+        $('input.datepicker', doc).each(function() {
+            var options = {};
+            var initial = $(this).attr2('initial');
+            if (initial) {
+              initial = parseInt(initial) * 1000;
+              var dinit = new Date(initial);
+              options['defaultDate'] = dinit;
+            }
+            $(this).datepicker(options);
+        })
+        $('input.datetimepicker', doc).each(function() {
+            var options = {stepMinute: 5, hour: 12, minute: 00, firstDay: 1};
+            var initial = $(this).attr2('initial');
+            if (initial) {
+              initial = parseInt(initial) * 1000;
+              var dinit = new Date(initial);
+              options['defaultDate'] = dinit;
+              options['hour'] = dinit.getHours();
+              options['minute'] = dinit.getMinutes();
+              options['second'] = dinit.getSeconds();
+            }
+            $(this).datetimepicker(options);
+        })
+  },
+    
+    'prepare_mass_form': function(doc) {
+        $('input[type=checkbox].group-control', doc).each(function() {
+          $(this).data('form', $('ul.mass-form', doc));
+          $(this).click(function() {
+            $('input[type=checkbox].group-'+$(this).attr2('name')).attr2('checked', $(this).attr2('checked'));
+            $(this).data('form').fadeTo("fast", 1);
+          });
+        });
+        
+        $('ul.mass-form input[type=submit]', doc).remove();
+        $('ul.mass-form', doc).each(function(){
+          $(this).css('opacity', 0.6);
+        });
+    
+        $('.content-list-item input[type=checkbox], #sales_table, #reports_table', doc).each(function() {
+          $(this).data('form', $('ul.mass-form', doc));
+          $(this).click(function() {
+            $(this).data('form').fadeTo("fast", 1);
+          });
+        });
+    
+        $(".mass-form select", doc).each(function() {
+          $(this).css('opacity', 0);
+          $(this).change(function(ui, event) {
+            var massvalue = $('span.wrap-value', $(this).parent());
+            var selected = $(this).children('option:selected');
+            if (!selected.val() == "") {
+              massvalue.text(selected.text());
+              if (selected.val() == "delete" || selected.val() == "delete_all") {
+                if (confirm('Really delete?\n\n(This cannot be undone)')) {
+                  $(this).parent().submit();
+                }
+              } else {
+                $(this).parent().submit();
+              }
+            }
+          });
+        });
+        $('.mass-form label', doc).each(function(doc){
+          $(this).next('select').andSelf().wrapAll('<div class="wrap-class" />');
+          $(this).replaceWith('<span class="wrap-label">' + $(this).text() + '&nbsp;<span class="wrap-value"></span></span>');
+        });
+    },
+  
+    // submit filter form onChange
+    'prepare_filter_form': function(doc) {
+        $('form.content-filter-form input', doc).live('change',function(){ $(this).parents('form.content-filter-form').submit(); })
+        $('form.content-filter-form select', doc).live('change',function(){ $(this).parents('form.content-filter-form').submit(); })
+    
+      	$('form.content-filter-form :submit').hide();
+    },
+    
+    'prepare_popup_content': function(popupdata) {
+        var popupid = popupdata.popup_id;
+        if ($('#'+popupid).length) {
+            popup = $('#'+popupid);
+                $("a", popup).each(function(){
+                    href = $(this).attr2('href');
+                    if ($.type(href) == "string"){
+                      href = treeio.utils.strip_host(href);
+                      if (href && !$(this).hasClass('popup-link') && !$(this).hasClass('ajax-link-out') && !$(this).attr('target') &&
+                          !(href.substring(0,3) == 'www') && !(href.substring(0,5) == 'http:') &&
+                          !(href.substring(0,6) == 'https:') && !(href.substring(0,4) == 'ftp:') &&
+                          !(href.substring(0,7) == 'mailto:')) {
+                              if (href.indexOf(popupid) == -1 ) {
+                                $(this).data("href", "/user/popup/" + popupid + "/url=" + $(this).attr("href"));
+                              } else {
+                                $(this).data("href", $(this).attr("href"));
+                              }
+                              if ($.browser.msie && $.browser.version.substr(0, 1) < 7) {
+                                  var prefix = window.location.href.replace(window.location.hash, '');
+                                  $(this).data("href", $(this).data("href").replace(prefix, "/"));
+                              }
+                              $(this).click(function(){
+                                  $("#loading-status").css('display', 'block');
+                                  url = $(this).data("href");
+                                  $.ajax({
+                                      url: url,
+                                      dataType: 'json',
+                                      success: treeio.process_popup_data
+                                  });
+                                  return false;
+                              })
+                          }
+                      }
+                });
+            treeio.prepare_popups(popup);
+            $("form", popup).each(function() {
+                url = $(this).attr('action');
+                url = treeio.utils.strip_host(url);
+                if (url) {
+                  if (url.indexOf('/user/popup/') == -1) {
+                    url = '/user/popup/' + popupdata.popup_id + '/url=' + url;
+                  }
+                } else {
+                    url = popupdata.url;
+                }
+                $(this).attr('action', url);
+                var options = {
+                    'beforeSubmit': function(data) {
+                    $("#loading-status").css('display', 'block');  
+                    },
+                  'url': url,
+                  'dataType': 'json',
+                  'success': treeio.process_ajax
+                }
+                $(this).ajaxForm(options);
+            })
+            treeio.showhidejs(popup);
+            treeio.prepare_ajax_links(popup);
+            treeio.prepare_comments(popup);
+            treeio.prepare_attachments(popup);
+            treeio.prepare_invites(popup);
+            treeio.prepare_tags(popup);
+            treeio.prepare_autocomplete(popup);
+            treeio.prepare_search_duplicates(popup);
+            treeio.put_datepicker(popup);
+            treeio.prepare_mass_form(popup);
+            treeio.put_mce(popup);
+        }        
+    },
+    
+    'process_popup_data': function(data) {
+         if (data.popup) {
+             var popup = $('#' + data.popup.popup_id);
+             if (data.popup.object) {
+                 // Object created, close popup
+                 if (popup.data('field')) {
+                     var doc = $('#' + popup.data('module'));
+                     var field = $(popup.data('field'), doc);
+                     if (field.hasClass('autocomplete')) {
+                         field.val(data.popup.object.name);
+                         var idfield = $('#' + field.attr2('id').replace('autocomplete_', ''), doc);
+                         idfield.each(function() {
+                            $(this).val(data.popup.object.id); 
+                         });
+                     } else if (field.hasClass('duplicates')) {
+                         field.val(data.popup.object.name);
+                         var idfield = $('#' + field.attr2('id').replace('duplicates_', ''), doc);
+                         idfield.each(function() {
+                            $(this).val(data.popup.object.id); 
+                         });
+                     } else {
+                         field.append('<option value="' + data.popup.object.id + '" selected="selected">' + data.popup.object.name + '</option>');                         
+                     }
+                 } else {
+                     var url = location.hash.substring(1);
+                     url = treeio.prepare_url(url);
+                     var popupparents = popup.parents('div.popup-block-inner');
+                     $("#loading-status").css('display', 'block');
+                     if (popupparents.length > 0) {
+                       $(popupparents).first().each(function() {
+                         url = '/user/popup/' + $(this).attr2('id') + '/url=' + $(this).parent().data('link').replace('#','');
+                       });
+                     }
+                     $.ajax({
+                        'url': url,
+                        'dataType': 'json',
+                        'success': treeio.process_ajax,
+                        'complete': treeio.process_html
+                     });
+                 }
+                 popup.parent().remove();
+             } else if (data.popup.redirect) {
+                 var url = location.hash.substring(1);
+                 url = treeio.prepare_url(url);
+                 var popupparents = popup.parents('div.popup-block-inner');
+                 $("#loading-status").css('display', 'block');
+                 if (popupparents.length > 0) {
+                   $(popupparents).first().each(function() {
+                     url = '/user/popup/' + $(this).attr2('id') + '/url=' + $(this).parent().data('link').replace('#','');
+                   });
+                 }
+                 $.ajax({
+                    'url': url,
+                    'dataType': 'json',
+                    'success': treeio.process_ajax,
+                    'complete': treeio.process_html
+                 });
+                 popup.parent().remove();
+             } else {
+                 var popuptitleblock = popup.parent().children('div.popup-title-block');
+                 popuptitleblock.children('span.popup-title').html(data.popup.title);
+                 popuptitleblock.children('span.popup-subtitle').html(data.popup.subtitle);
+                 popup.html(data.popup.content);
+                 treeio.prepare_popup_content(data.popup);
+                 //popup.parent().css('display', 'block');
+                 popup.parent().fadeIn(300);
+                 $("input:text:visible:first", popup).focus();
+             }
+         }
+         $("#loading-status").css('display', 'none');
+    },
+    
+    'prepare_popups': function(doc) {
+        $('a.popup-link', doc).each(function() {
+          if (!$(this).hasClass('popup-link-out')) {
+            $(this).click(function() {
+                var popupid = doc.attr2('id') + '-popup-' + $(this).attr2('id') + "-" + Date.now();
+                if ($('#'+popupid).length) {
+                    return false;
+                }
+                $("#loading-status").css('display', 'block');
+                var popup = $('<div></div>').addClass('popup-block').css('display', 'none').css('visibility', 'visible');
+                popup.data('link', $(this).attr('href'));
+                var popuptitleblock = $('<div></div>').addClass('popup-title-block');
+                popuptitleblock.append($('<span></span>').addClass('popup-title'));
+                popuptitleblock.append($('<span></span>').addClass('popup-subtitle'));
+                var popuplinkopen = $('<div></div>').addClass('popup-link-open');
+                popuplinkopen.click(function() {
+                    var url = $(this).parent().data('link');
+                    if (url) {
+                        url = url.replace('#', '');
+                        window.location.hash = url;
+                        $(this).parent().remove();
+                    }
+                })
+                var popupclose = $('<div></div>').addClass('popup-close');
+                popupclose.click(function() {
+                    if ($('#'+popupid).length) {
+                        $('#'+popupid).parent().remove();
+                    }
+                });
+                var popupinner = $('<div></div>').addClass('popup-block-inner')
+                popupinner.attr2('id', popupid);
+                if ($(this).attr2('field')) {
+                    popupinner.data('field', $(this).attr2('field'));
+                    popupinner.data('module', doc.attr2('id'));
+                }
+                popup.append(popupclose);
+                popup.append(popuplinkopen);
+                popup.append(popuptitleblock);
+                popup.append(popupinner);
+                doc.append(popup);
+                var popupparents = popup.parents('div.popup-block-inner');
+                if (popupparents.length > 0) {
+                  var parentoffset = popupparents.first().offset();
+                  popup.position({
+                     my: "center top",
+                     at: "center top",
+                     of: $(this),
+                     collision: "flip",
+                     offset: "-" + parentoffset.left + " -" + parentoffset.top + ""
+                  });
+                } else {
+                  popup.position({
+                     my: "left top",
+                     at: "left top",
+                     of: $(this),
+                     collision: "fit",
+                     offset: "-30 -5"
+                  }); 
+                }
+                popup.draggable({handle: 'div.popup-title-block',
+                                 opacity: 0.5,
+                                 addClasses: false});
+                clean_href = treeio.utils.strip_host($(this).attr2('href'));
+                url = '/user/popup/' + popupid + "/url=" + clean_href.replace('#', '');
+                if ($.browser.msie && $.browser.version.substr(0,1)<7) {
+                    url = '/user/popup/' + popupid + "/url=/" + $(this).attr('href').replace('#', '');
+                    var prefix = window.location.href.replace(window.location.hash, '');
+                    url = url.replace(prefix, "");
+                }
+                url = url.replace('//', '/');
+                $.ajax({
+                 url: url,
+                 dataType: 'json',
+                 success: treeio.process_popup_data
+                });
+                return false;
+            })
+          }  
+        })
+    },
+    
+    'prepare_autocomplete': function(doc) {
+        $('input.autocomplete', doc).each(function() {
+            $(this).data('hidden_field', $("#id_" + $(this).attr2('name').replace("autocomplete_", ""), doc));
+            $(this).autocomplete({
+                'source': $(this).attr2('callback') + ".json",
+                'focus': function(event, ui) {
+                        $(this).val(ui.item.label);
+                        $(this).data('hidden_field').val(ui.item.value);
+                        return false;
+                    },
+                'select': function(event, ui) {
+                        $(this).val(ui.item.label);
+                        $(this).data('hidden_field').val(ui.item.value);
+                        return false;
+                    }
+            });
+            $(this).change(function(event) {
+              if ($(this).val() == "") {
+                $(this).data('hidden_field').val("");
+              }
+            });
+        });
+        
+        $('input.multicomplete', doc).each(function() {
+          $(this).data('hidden_fields', $("#" + $(this).attr2('name').replace("multicomplete_", "multi_"), doc));
+          // don't navigate away from the field on tab when selecting an item
+          $(this).bind( "keydown", function( event ) {
+            if ( event.keyCode === $.ui.keyCode.TAB &&
+                $( this ).data( "autocomplete" ).menu.active ) {
+              event.preventDefault();
+            }
+          });
+          $(this).bind( "keyup", function( event ) {
+            if (event.keyCode === $.ui.keyCode.BACKSPACE ||
+                       event.keyCode === $.ui.keyCode.DELETE) {
+              var terms = treeio.utils.split( this.value );
+              var fields = $('input',$(this).data('hidden_fields'));
+              for (var i=0; i<fields.length; i++)
+              {
+                var label = $(fields[i]).attr2('label');
+                if ($.inArray(label, terms) == -1) {
+                  $(fields[i]).remove();
+                }
+              }
+            }
+          })
+          var callback = $(this).attr2('callback') + ".json"
+          $(this).autocomplete({
+            source: function( request, response ) {
+              $.getJSON(callback, {
+                term: treeio.utils.extractLast( request.term )
+              }, response );
+            },
+            search: function() {
+              // custom minLength
+              var term = treeio.utils.extractLast( this.value );
+              if ( term.length < 2 ) {
+                return false;
+              }
+            },
+            focus: function() {
+              // prevent value inserted on focus
+              return false;
+            },
+            select: function( event, ui ) {
+              var terms = treeio.utils.split( this.value );
+              terms.pop();
+              terms.push( ui.item.label );
+              terms.push( "" );
+              var fields = $(this).data('hidden_fields');
+              var hidden = $('<input>');
+              hidden.attr2('type', 'hidden').attr2('name', $(this).attr2('name').replace("multicomplete_", ""))
+              .attr2('id', 'id_' + hidden.attr2('name')).attr2('value', ui.item.value).attr2('label', ui.item.label);
+              this.value = terms.join( ", " );
+              fields.append(hidden);
+        
+              var terms = treeio.utils.split( this.value );
+              var fields = $('input',$(this).data('hidden_fields'));
+              for (var i=0; i<fields.length; i++)
+              {
+                var label = $(fields[i]).attr2('label');
+                if ($.inArray(label, terms) == -1) {
+                  $(fields[i]).remove();
+                }
+              }
+              return false;
+            }
+          });
+        });
+    },
+  
+    'prepare_search_duplicates': function(doc) {
+        $('input.duplicates', doc).each(function() {
+            $(this).data('hidden_field', $("#id_" + $(this).attr2('name').replace("duplicates_", ""), doc));
+            $(this).autocomplete({
+                'source': $(this).attr2('callback') + ".json",
+                'focus': function(event, ui) {
+                        $(this).val(ui.item.label);
+                        return false;
+                    },
+                'select': function(event, ui) {
+                        $(this).val(ui.item.label);
+                        return false;
+                    }
+            });
+        })
+    },
+
+    'prepare_attachments': function(doc) {
+
+        $('.delete-attachment', doc).each(function() {
+           $(this).click(function() {
+               Dajaxice.treeio.account.attachment_delete(Dajax.process, {'attachment_id': $(this).attr2('attachment')});
+               return false;
+           });
+        });
+
+        $('.attachment-uploader', doc).each(function() {
+            var file_uploader = new qq.FileUploader({
+                action: $(this).attr('action'),
+                element: this,
+                multiple: false,
+                onComplete: function(id, fileName, responseJSON) {
+                    Dajaxice.treeio.account.attachment(Dajax.process, {'object_id': responseJSON.object_id, 'update_id': responseJSON.update_id})
+                },
+                onAllComplete: function(uploads) {
+                    // uploads is an array of maps
+                    // the maps look like this: { file: FileObject, response: JSONServerResponse }
+                    //alert( "All complete!" ) ;
+                },
+                params: {
+                    'csrf_token': $(this).attr2('csrf'),
+                    'csrf_name': 'csrfmiddlewaretoken',
+                    'csrf_xname': 'X-CSRFToken'
+                },
+                text: treeio_attachment_text
+            });
+        });
+		
+        $('.attachment-record-uploader', doc).each(function() {
+            var file_uploader = new qq.FileUploader({
+                action: $(this).attr('action'),
+                element: this,
+                multiple: false,
+                onComplete: function(id, fileName, responseJSON) {
+                    Dajaxice.treeio.account.attachment(Dajax.process, {'object_id': responseJSON.object_id, 'update_id': responseJSON.update_id})
+                },
+                onAllComplete: function(uploads) {
+                    // uploads is an array of maps
+                    // the maps look like this: { file: FileObject, response: JSONServerResponse }
+                    //alert( "All complete!" ) ;
+                },
+                params: {
+                    'csrf_token': $(this).attr2('csrf'),
+                    'csrf_name': 'csrfmiddlewaretoken',
+                    'csrf_xname': 'X-CSRFToken'
+                },
+                text: treeio_attachment_record_text
+            });
+        });
+    },
+
+
+    'prepare_invites': function(doc) {
+          $('.easy-invite', doc).each(function() {
+           $(this).click(function() {
+               Dajaxice.treeio.account.easy_invite(Dajax.process, {'emails': $(this).attr2('emails')});
+               return false;
+             });
+           });
+    },
+
+
+    'prepare_comments': function(doc) {
+    $('a.like-button', doc).each(function() {
+      $(this).click(function() {
+        $(this).parent().submit();
+        return false;
+      });
+    });
+    $('a.comment-button', doc).each(function() {
+      $(this).click(function() {
+        var commentslikes = $('div.comments-likes-box-'+$(this).attr2('object'));
+        commentslikes.toggle();
+        if (commentslikes.css('display') != 'none') {
+          $('textarea:visible:first', commentslikes).focus();
+        }
+        return false;
+      })
+    });
+    $('span.comments-likes-toggle', doc).each(function() {
+      $(this).click(function() {
+        var commentslikes = $('div.comments-likes-box-'+$(this).attr('object'));
+        commentslikes.toggle();
+        if (commentslikes.css('display') != 'none') {
+          $('textarea:visible:first', commentslikes).focus();
+        }
+        return false;
+      })
+    });
+    $('form.like-form', doc).each(function() {
+        var objectid = $(this).attr2('object');
+    	var targetid = 'comments-likes-box-' + objectid;
+    	var target = $('#'+targetid);
+    	$(this).attr('target', targetid);
+    	$(this).submit(function() {
+    	  	var targetid = $(this).attr('target');
+    	  	var target = $(this).parents('#'+targetid);
+    	  	targetid = treeio.utils.generate_id(targetid);
+    	  	target.attr('id', targetid);
+    		var args = {
+    			'target': '#'+targetid,
+    			'form': $(this).serializeObject(),
+    			'expand': true
+    		}; 
+			Dajaxice.treeio.account.comments_likes(Dajax.process, args);
+    		return false;
+    	});
+    });
+  },
+  
+  'prepare_tags': function(doc) {
+    $('input#id_multicomplete_tags', doc).each(function() {
+	    $(this).focus();
+	    $(this).focusout(function() {
+	      $(this).parent('form').submit();
+	    });
+	    $(this).parent('form').submit(function() {
+    	  	var targetid = $(this).attr2('target');
+    	  	var target = $(this).parents(targetid);
+    	  	targetid = treeio.utils.generate_id();
+    	  	target.attr2('id', targetid);
+    		var args = {
+    			'target': '#'+targetid,
+    			'object_id': $(this).attr2('object'),
+    			'edit': true,
+    			'formdata': $(this).serializeObject()
+    		};
+			Dajaxice.treeio.account.tags(Dajax.process, args);
+    		return false;
+	    });
+    });
+    $('span.tags-box').each(function(){
+    	$('span.tags-box-link', $(this)).css('visibility', 'hidden');
+    	$(this).hover(function() {
+    		$('span.tags-box-link', $(this)).css('visibility', 'visible');
+    	}, function() {
+    		$('span.tags-box-link', $(this)).css('visibility', 'hidden');
+    	})
+    })
+  },
+  
+  'prepare_forms': function(doc) {
+    $('form', doc).each(function() {
+    
+    url = $(this).attr('action');
+      if (!$(this).hasClass('like-form') && !$(this).hasClass('tags-form')) {
+	      if (!url) {
+	        url = location.hash.substring(1);
+	      }
+	      if ($(this).attr2('method')=='get') {
+	          $(this).attr('action', url);
+	        var options = {
+	          'beforeSubmit': function(data, form) {
+	            var url = form.attr('action');
+                    console.log(url);
+	            if (url.indexOf('!') != -1) {
+	              url = url.substring(0, url.indexOf('!'));
+	            }
+	            url += '!' + form.formSerialize();
+	            window.location.hash = '#' + url;
+	            return false;
+	           }
+	        }
+	        $(this).ajaxForm(options);
+	      } else {
+	        url = treeio.prepare_url(url);
+                console.log("PREPARE"+url);
+	        var options = {
+	          'beforeSubmit': function(data) {
+	              $("#loading-status").css('display', 'block');
+	           },
+	          'url': url,
+	          'dataType': 'json',
+	          'success': treeio.process_ajax
+	        }
+	        $(this).ajaxForm(options);
+	      }
+      }
+    })
+    treeio.prepare_mass_form(doc);
+    treeio.prepare_filter_form(doc);
+    treeio.prepare_autocomplete(doc);
+    treeio.prepare_search_duplicates(doc);
+    treeio.put_datepicker(doc);
+  },
+  
+  'prepare_dropdown_menus': function() {
+    $("a.menu-dropdown-link").each(function() {
+        $(this).click(function() {
+          var dropmenu = $('#'+$(this).attr2('dropdown'));
+          $(this).addClass('menu-dropdown-link-active');
+          dropmenu.slideDown('fast').show();
+        });
+        $(this).hover(function() {
+          var dropmenu = $('#'+$(this).attr2('dropdown'));
+          $(this).addClass('menu-dropdown-link-active');
+          dropmenu.slideDown('fast').show();
+        })
+        $(this).parent().hover(function() {}, function() {
+          var droplink = $(this).children("a.menu-dropdown-link");
+          var dropmenu = $(this).children('#'+droplink.attr2('dropdown'));
+          dropmenu.slideUp('fast');
+          droplink.removeClass('menu-dropdown-link-active');
+        });
+    });  
+  },
+  
+  'prepare_toolbar': function() {
+    
+    //hide toolbar and make visible the 'up' arrow
+    $("span.hide_toolbar").click(function() {
+      $("#toolbar").slideToggle("fast", function() {
+        $("#toolbar_action").fadeIn("slow");    
+      });
+      
+    });
+    
+    //show toolbar and hide the 'up' arrow
+    $("span.show_toolbar").click(function() {
+      $("#toolbar_action").fadeOut("fast", function() {
+        $("#toolbar").slideToggle("fast");
+      });
+      
+    });
+  }
+
+}
+
+treeio.utils = {
+  'split': function( val ) {
+      return val.split( /,\s*/ );
+  },
+  
+  'extractLast': function( term ) {
+      return treeio.utils.split( term ).pop();
+  },
+  
+  'generate_id': function( prefix ) {
+	  var uniqid = prefix;
+	  if (!uniqid) {
+		  uniqid = 'ajax';
+	  }
+	  uniqid = uniqid + '-' + Date.now();
+	  var i = 0;
+	  while ($('#'+uniqid).length > 0) {
+		  uniqid = uniqid + '-' + i;
+		  i++;
+	  }
+	  return uniqid;
+  },
+
+  'strip_host': function(url) {
+    var host = window.location.host;
+    var hostless = url.substring(url.indexOf(host)+host.length);
+    if (hostless.indexOf('#') >= 0) {
+        hostless = hostless.split('#')[1];
+    }
+    return hostless;
+  }
+}
+
+/*
+ * Hardtree modules JS library
+ * 
+ * Needs to be loaded after treeio.js
+ */
+
+treeio.modules = {
+    'treeio-home': {
+        'init': function() {
+            var sortparams = { opacity: 0.6,
+                               handle: 'div.widget-title',
+                               connectWith: '#widget-panel-right',
+                               items: 'div.widget-block',
+                               cursor: 'move',
+                               update: function() {
+                                   var url = $(this).attr2('callback') + "?" + $(this).sortable("serialize");
+                                   $.ajax({url: url});
+                               },
+                               start: function(event, ui) {
+                                   $('#widget-panel-left').addClass('widget-panel-active');
+                                   $('#widget-panel-right').addClass('widget-panel-active');
+                                   ui.item.addClass('widget-block-moving');
+                               },
+                               beforeStop: function(event, ui) {
+                                   ui.item.removeClass('widget-block-moving');
+                               },
+                               stop: function() {
+                                   $('#widget-panel-left').removeClass('widget-panel-active');
+                                   $('#widget-panel-right').removeClass('widget-panel-active');
+                               }
+            }
+            $('#widget-panel-left').sortable(sortparams);
+            sortparams.connectWith = '#widget-panel-left';
+            $('#widget-panel-right').sortable(sortparams);
+        }
+    },
+    'treeio-core': {
+        'init': function() {
+            var setupbox = $('div.setup-module-box');
+            if (setupbox.length > 0) {
+                $('div.setup-module-box').each(function() {
+                    $(this).click(function() {
+                        $(this).toggleClass('setup-module-box-active');
+                        $('input', $(this)).each(function() {
+                            $(this).attr2('checked', !$(this).attr2('checked'));
+                        }) 
+                    });
+                });
+            }
+        }
+    },
+    'treeio-projects': {
+        'timer': function() {
+            var timeslots = $('.projects-timeslot');
+            if (timeslots) {
+                timeslots.each(function() {
+                    var start = $(this).data('start');
+                    var now = Date.now();
+                    if (start == null) {
+                        var elapsed = parseInt($(this).attr2('diff'));
+                        start = now - elapsed * 1000;
+                        $(this).data('start', start);
+                    }
+                    var diff = (now - start) / 1000;
+                    var tim = Math.floor(diff / 3600)
+                    var min = Math.floor((diff / 3600 - tim) * 60)
+                    var sec = Math.round((((diff / 3600 - tim) * 60) - min) * 60)
+                    var string = tim + ":"
+                    if (min >= 10) {
+                        string += min + ":"
+                    }
+                    else {
+                        string += "0" + min + ":"
+                    }
+                    if (sec >= 10) {
+                        string += sec
+                    }
+                    else {
+                        string += "0" + sec
+                    }
+                    $(this).html(string);
+                });
+                window.setTimeout(treeio.modules['treeio-projects'].timer, 1000);
+            }
+            
+        },
+        'init': function() {
+            var timeslots = $('.projects-timeslot');
+            if (timeslots) {
+                this.timer();
+            }
+            var ganttChart = $('div.ganttChart');
+            if (ganttChart) {
+            	this.gantt(ganttChart);
+            }
+        },
+        'gantt': function(block) {
+            block.each(function() {
+            	if (ganttData) {
+		            	$(this).ganttView({ 
+		                data: ganttData,
+		                behavior: {
+		                    onClick: function (data) { 
+		                                      
+		                    },                    
+		                    onResize: function (data) { 
+		                        Dajaxice.treeio.projects.gantt(callback_function, {'task':data.id, 'start':data.start.toString("yyyy-M-d"), 'end':data.end.toString("yyyy-M-d")});
+		                    },  
+		                    onDrag: function (data) { 
+		                        Dajaxice.treeio.projects.gantt(callback_function, {'task':data.id, 'start':data.start.toString("yyyy-M-d"), 'end':data.end.toString("yyyy-M-d")});
+		                    }
+		                }
+	            	});
+	            	var projects_block = $('#module-treeio-projects');
+	            	$(this).ganttView("setSlideWidth", $('td.module-content', projects_block).width() - 60);
+	            	treeio.prepare_popups($(this));
+	            	$(window).resize(function() {
+	            		$('div.ganttChart', projects_block).each(function() {
+	            			var projects_block = $('#module-treeio-projects');
+	            			$(this).ganttView("setSlideWidth", $('td.module-content', projects_block).width() - 60);
+	            		});
+	            	})
+            	}
+            });            
+        }
+    },
+  'treeio-reports': {
+        'init': function() {
+          /*//LIVE CHARTS
+             $('div.chart').each(function(){
+               var divid = $.uuid('chart-');
+               $(this).attr2('id', divid);
+               var settings = {
+                 url: '/reports/chart/'+$(this).attr2('chart')+'/options/'+divid,
+                 dataType: 'json',
+                 success: function(data) {
+                   var options = data;
+                   chart1 = new Highcharts.Chart(options);
+               }
+               }
+               $.ajax(settings);
+        });*/
+       }
+  }
+}
+
+/* Hardtree Nuvius library */
+treeio.nuvius = {
+  
+  'profile': null,
+  'access_popup': false,
+  'reload_on_profile': true,
+  
+  'fetch_profile': function() {
+      $("#loading-status").css('display', 'block');
+      $("#loading-status-text").html('Loading...');
+      $.ajax({
+          'url': nuvius_profile_url,
+          'dataType': 'jsonp',
+          'success': treeio.nuvius.load_profile,
+          'error': treeio.show_error
+      })
+  },
+  
+  'check_profile': function(data) {
+      if (data) {
+        if (data.key_valid) {
+          if (data.username) {
+            $('#nuvius-username').html(data.username);
+          } else {
+            $('#nuvius-username').html("Anonymous User");
+          }
+          if (treeio.nuvius.reload_on_profile) {
+            treeio.do_ajax();
+          }
+        }
+      } else {
+        if (treeio.nuvius.profile) {
+          var url = nuvius_profile_check_url;
+          url += "?nuvius_id=" + treeio.nuvius.profile.id + "&profile_key=" + treeio.nuvius.profile.key;
+          $.ajax({
+            'url': url,
+            'dataType': 'json',
+            'success': treeio.nuvius.check_profile,
+            'error': treeio.show_error
+          })
+        }
+      }
+  },
+  
+  'load_profile': function(data) {
+      $("#loading-status").css('display', 'none');
+      if (data.profile) {
+        if (!data.profile.access_granted && treeio.nuvius.access_popup) {
+          $.colorbox({
+            href: data.profile.access_url,
+            width:"80%",
+            height:"80%",
+            iframe: true,
+            overlayClose: false,
+            onClosed: treeio.nuvius.fetch_profile
+          });
+          treeio.nuvius.access_popup = false;
+        } else {
+          treeio.nuvius.profile = data.profile;
+          treeio.nuvius.check_profile();
+        }
+     }
+  },
+  
+  'fetch_access': function() {
+      treeio.nuvius.access_popup = true;
+      treeio.nuvius.fetch_profile();
+  },
+  
+  'close_iframe': function() {
+      $.colorbox.close();
+  }
+
+}
+
+
+
+
+/* Init */
+
+$(function() {
+  
+  // Bind the event.
+  $(window).hashchange(treeio.do_ajax);
+
+  // Trigger the event (first thing on page load).
+  $(window).hashchange();
+  treeio.prepare_dropdown_menus();
+  treeio.prepare_toolbar();
+  treeio.convert_links();
+  treeio.prepare_ajax_links();
+  $(".menu-item a").each(function(){
+      $(this).click(function() {
+        if ($(this).hasClass('active') && $(this).attr('href') == window.location.hash) {
+              $(window).hashchange();
+      }
+      });
+    function csrfSafeMethod(method) {
+        // these HTTP methods do not require CSRF protection
+        return (/^(GET|HEAD|OPTIONS|TRACE)$/.test(method));
+    }
+    $.ajaxSetup({
+        crossDomain: false, // obviates need for sameOrigin test
+        beforeSend: function(xhr, settings) {
+            if (!csrfSafeMethod(settings.type)) {
+                var csrftoken = $.cookie('csrftoken');
+                xhr.setRequestHeader("X-CSRFToken", csrftoken);
+            }
+        }
+    });
+  });
+    
+
+
+
+  // Prepare perspective switcher
+  $('#perspective_switch').each(function() {
+      url = $(this).attr('action');
+      if (!url) {
+        url = location.hash.substring(1);
+      }
+      url = treeio.prepare_url(url);
+      var options = {
+        'beforeSubmit': function(data) {
+            $("#loading-status").css('display', 'block');
+         },
+        'url': url,
+        'dataType': 'json',
+        'success': treeio.process_ajax
+      }
+      $(this).ajaxForm(options);
+      $(this).children('select').change(function() {
+        $('#perspective_switch').submit();
+      })
+  });
+  // Prepare search form
+  $('form#search_form').each(function() {
+      url = $(this).attr('action');
+      if (!url) {
+          url = location.hash.substring(1);
+      }
+      $(this).attr('action', url);
+      var options = {
+        'beforeSubmit': function(data, form) {
+          var url = form.attr('action');
+          url += '!' + form.formSerialize();
+          window.location.hash = '#' + url;
+          return false;
+         }
+      }
+      $(this).ajaxForm(options);
+  })
+  // Prepare modules
+  $(".module-block").data('title', document.title);
+  $(".module-block").each(function() {
+      doc = $(this)
+      if ($("form").length) {
+        // treeio.prepare_forms(doc);
+        treeio.prepare_comments(doc);
+        if ($("textarea").length) {
+          treeio.put_mce(doc);
+        }
+        treeio.put_datepicker(doc)
+        treeio.prepare_forms(doc);
+      }
+      treeio.prepare_tags();
+      treeio.prepare_slider_sidebar(doc);
+      treeio.prepare_list_actions(doc);
+      treeio.prepare_attachments(doc);
+      treeio.prepare_invites(doc);
+      treeio.prepare_popups(doc);
+      treeio.showhidejs(doc);
+      module_name = $(this).attr2('id').substring(7);
+      treeio.prepare_module_stuff(module_name);
+      // Hide splash in case something went wrong
+      window.setTimeout("$('#loading-splash').fadeOut();", 5000);
+  })
+
+});
diff --git a/data/treeio/treeio/static/js/jquery-ui-1.10.3/demos/accordion/hoverintent.html b/data/treeio/treeio/static/js/jquery-ui-1.10.3/demos/accordion/hoverintent.html
new file mode 100644
index 0000000..0ff63a3
--- /dev/null
+++ b/data/treeio/treeio/static/js/jquery-ui-1.10.3/demos/accordion/hoverintent.html
@@ -0,0 +1,148 @@
+<!doctype html>
+<html lang="en">
+<head>
+	<meta charset="utf-8">
+	<title>jQuery UI Accordion - Open on hoverintent</title>
+	<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
+	<script src="../../jquery-1.9.1.js"></script>
+	<script src="../../ui/jquery.ui.core.js"></script>
+	<script src="../../ui/jquery.ui.widget.js"></script>
+	<script src="../../ui/jquery.ui.accordion.js"></script>
+	<link rel="stylesheet" href="../demos.css">
+	<script>
+	$(function() {
+		$( "#accordion" ).accordion({
+			event: "click hoverintent"
+		});
+	});
+
+	/*
+	 * hoverIntent | Copyright 2011 Brian Cherne
+	 * http://cherne.net/brian/resources/jquery.hoverIntent.html
+	 * modified by the jQuery UI team
+	 */
+	$.event.special.hoverintent = {
+		setup: function() {
+			$( this ).bind( "mouseover", jQuery.event.special.hoverintent.handler );
+		},
+		teardown: function() {
+			$( this ).unbind( "mouseover", jQuery.event.special.hoverintent.handler );
+		},
+		handler: function( event ) {
+			var currentX, currentY, timeout,
+				args = arguments,
+				target = $( event.target ),
+				previousX = event.pageX,
+				previousY = event.pageY;
+
+			function track( event ) {
+				currentX = event.pageX;
+				currentY = event.pageY;
+			};
+
+			function clear() {
+				target
+					.unbind( "mousemove", track )
+					.unbind( "mouseout", clear );
+				clearTimeout( timeout );
+			}
+
+			function handler() {
+				var prop,
+					orig = event;
+
+				if ( ( Math.abs( previousX - currentX ) +
+						Math.abs( previousY - currentY ) ) < 7 ) {
+					clear();
+
+					event = $.Event( "hoverintent" );
+					for ( prop in orig ) {
+						if ( !( prop in event ) ) {
+							event[ prop ] = orig[ prop ];
+						}
+					}
+					// Prevent accessing the original event since the new event
+					// is fired asynchronously and the old event is no longer
+					// usable (#6028)
+					delete event.originalEvent;
+
+					target.trigger( event );
+				} else {
+					previousX = currentX;
+					previousY = currentY;
+					timeout = setTimeout( handler, 100 );
+				}
+			}
+
+			timeout = setTimeout( handler, 100 );
+			target.bind({
+				mousemove: track,
+				mouseout: clear
+			});
+		}
+	};
+	</script>
+</head>
+<body>
+
+<div id="accordion">
+	<h3>Section 1</h3>
+	<div>
+		<p>
+		Mauris mauris ante, blandit et, ultrices a, suscipit eget, quam. Integer
+		ut neque. Vivamus nisi metus, molestie vel, gravida in, condimentum sit
+		amet, nunc. Nam a nibh. Donec suscipit eros. Nam mi. Proin viverra leo ut
+		odio. Curabitur malesuada. Vestibulum a velit eu ante scelerisque vulputate.
+		</p>
+	</div>
+	<h3>Section 2</h3>
+	<div>
+		<p>
+		Sed non urna. Donec et ante. Phasellus eu ligula. Vestibulum sit amet
+		purus. Vivamus hendrerit, dolor at aliquet laoreet, mauris turpis porttitor
+		velit, faucibus interdum tellus libero ac justo. Vivamus non quam. In
+		suscipit faucibus urna.
+		</p>
+	</div>
+	<h3>Section 3</h3>
+	<div>
+		<p>
+		Nam enim risus, molestie et, porta ac, aliquam ac, risus. Quisque lobortis.
+		Phasellus pellentesque purus in massa. Aenean in pede. Phasellus ac libero
+		ac tellus pellentesque semper. Sed ac felis. Sed commodo, magna quis
+		lacinia ornare, quam ante aliquam nisi, eu iaculis leo purus venenatis dui.
+		</p>
+		<ul>
+			<li>List item one</li>
+			<li>List item two</li>
+			<li>List item three</li>
+		</ul>
+	</div>
+	<h3>Section 4</h3>
+	<div>
+		<p>
+		Cras dictum. Pellentesque habitant morbi tristique senectus et netus
+		et malesuada fames ac turpis egestas. Vestibulum ante ipsum primis in
+		faucibus orci luctus et ultrices posuere cubilia Curae; Aenean lacinia
+		mauris vel est.
+		</p>
+		<p>
+		Suspendisse eu nisl. Nullam ut libero. Integer dignissim consequat lectus.
+		Class aptent taciti sociosqu ad litora torquent per conubia nostra, per
+		inceptos himenaeos.
+		</p>
+	</div>
+</div>
+
+<div class="demo-description">
+<p>
+Click headers to expand/collapse content that is broken into logical sections, much like tabs.
+Optionally, toggle sections open/closed on mouseover.
+</p>
+<p>
+The underlying HTML markup is a series of headers (H3 tags) and content divs so the content is
+usable without JavaScript.
+</p>
+</div>
+</body>
+</html>
diff --git a/data/treeio/treeio/static/js/jquery-ui-1.10.3/demos/dialog/modal-form.html b/data/treeio/treeio/static/js/jquery-ui-1.10.3/demos/dialog/modal-form.html
new file mode 100644
index 0000000..a9f1c63
--- /dev/null
+++ b/data/treeio/treeio/static/js/jquery-ui-1.10.3/demos/dialog/modal-form.html
@@ -0,0 +1,157 @@
+<!doctype html>
+<html lang="en">
+<head>
+	<meta charset="utf-8">
+	<title>jQuery UI Dialog - Modal form</title>
+	<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
+	<script src="../../jquery-1.9.1.js"></script>
+	<script src="../../ui/jquery.ui.core.js"></script>
+	<script src="../../ui/jquery.ui.widget.js"></script>
+	<script src="../../ui/jquery.ui.mouse.js"></script>
+	<script src="../../ui/jquery.ui.button.js"></script>
+	<script src="../../ui/jquery.ui.draggable.js"></script>
+	<script src="../../ui/jquery.ui.position.js"></script>
+	<script src="../../ui/jquery.ui.resizable.js"></script>
+	<script src="../../ui/jquery.ui.button.js"></script>
+	<script src="../../ui/jquery.ui.dialog.js"></script>
+	<script src="../../ui/jquery.ui.effect.js"></script>
+	<link rel="stylesheet" href="../demos.css">
+	<style>
+		body { font-size: 62.5%; }
+		label, input { display:block; }
+		input.text { margin-bottom:12px; width:95%; padding: .4em; }
+		fieldset { padding:0; border:0; margin-top:25px; }
+		h1 { font-size: 1.2em; margin: .6em 0; }
+		div#users-contain { width: 350px; margin: 20px 0; }
+		div#users-contain table { margin: 1em 0; border-collapse: collapse; width: 100%; }
+		div#users-contain table td, div#users-contain table th { border: 1px solid #eee; padding: .6em 10px; text-align: left; }
+		.ui-dialog .ui-state-error { padding: .3em; }
+		.validateTips { border: 1px solid transparent; padding: 0.3em; }
+	</style>
+	<script>
+	$(function() {
+		var name = $( "#name" ),
+			email = $( "#email" ),
+			password = $( "#password" ),
+			allFields = $( [] ).add( name ).add( email ).add( password ),
+			tips = $( ".validateTips" );
+
+		function updateTips( t ) {
+			tips
+				.text( t )
+				.addClass( "ui-state-highlight" );
+			setTimeout(function() {
+				tips.removeClass( "ui-state-highlight", 1500 );
+			}, 500 );
+		}
+
+		function checkLength( o, n, min, max ) {
+			if ( o.val().length > max || o.val().length < min ) {
+				o.addClass( "ui-state-error" );
+				updateTips( "Length of " + n + " must be between " +
+					min + " and " + max + "." );
+				return false;
+			} else {
+				return true;
+			}
+		}
+
+		function checkRegexp( o, regexp, n ) {
+			if ( !( regexp.test( o.val() ) ) ) {
+				o.addClass( "ui-state-error" );
+				updateTips( n );
+				return false;
+			} else {
+				return true;
+			}
+		}
+
+		$( "#dialog-form" ).dialog({
+			autoOpen: false,
+			height: 300,
+			width: 350,
+			modal: true,
+			buttons: {
+				"Create an account": function() {
+					var bValid = true;
+					allFields.removeClass( "ui-state-error" );
+
+					bValid = bValid && checkLength( name, "username", 3, 16 );
+					bValid = bValid && checkLength( email, "email", 6, 80 );
+					bValid = bValid && checkLength( password, "password", 5, 16 );
+
+					bValid = bValid && checkRegexp( name, /^[a-z]([0-9a-z_])+$/i, "Username may consist of a-z, 0-9, underscores, begin with a letter." );
+					// From jquery.validate.js (by joern), contributed by Scott Gonzalez: http://projects.scottsplayground.com/email_address_validation/
+					bValid = bValid && checkRegexp( email, /^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?$/i, "eg. ui@jquery.com" );
+					bValid = bValid && checkRegexp( password, /^([0-9a-zA-Z])+$/, "Password field only allow : a-z 0-9" );
+
+					if ( bValid ) {
+						$( "#users tbody" ).append( "<tr>" +
+							"<td>" + name.val() + "</td>" +
+							"<td>" + email.val() + "</td>" +
+							"<td>" + password.val() + "</td>" +
+						"</tr>" );
+						$( this ).dialog( "close" );
+					}
+				},
+				Cancel: function() {
+					$( this ).dialog( "close" );
+				}
+			},
+			close: function() {
+				allFields.val( "" ).removeClass( "ui-state-error" );
+			}
+		});
+
+		$( "#create-user" )
+			.button()
+			.click(function() {
+				$( "#dialog-form" ).dialog( "open" );
+			});
+	});
+	</script>
+</head>
+<body>
+
+<div id="dialog-form" title="Create new user">
+	<p class="validateTips">All form fields are required.</p>
+
+	<form>
+	<fieldset>
+		<label for="name">Name</label>
+		<input type="text" name="name" id="name" class="text ui-widget-content ui-corner-all" />
+		<label for="email">Email</label>
+		<input type="text" name="email" id="email" value="" class="text ui-widget-content ui-corner-all" />
+		<label for="password">Password</label>
+		<input type="password" name="password" id="password" value="" class="text ui-widget-content ui-corner-all" />
+	</fieldset>
+	</form>
+</div>
+
+
+<div id="users-contain" class="ui-widget">
+	<h1>Existing Users:</h1>
+	<table id="users" class="ui-widget ui-widget-content">
+		<thead>
+			<tr class="ui-widget-header ">
+				<th>Name</th>
+				<th>Email</th>
+				<th>Password</th>
+			</tr>
+		</thead>
+		<tbody>
+			<tr>
+				<td>John Doe</td>
+				<td>john.doe@example.com</td>
+				<td>johndoe1</td>
+			</tr>
+		</tbody>
+	</table>
+</div>
+<button id="create-user">Create new user</button>
+
+<div class="demo-description">
+<p>Use a modal dialog to require that the user enter data during a multi-step process.  Embed form markup in the content area, set the <code>modal</code> option to true, and specify primary and secondary user actions with the <code>buttons</code> option.</p>
+</div>
+</body>
+</html>
diff --git a/data/treeio/treeio/static/js/jquery-ui-1.10.3/demos/droppable/photo-manager.html b/data/treeio/treeio/static/js/jquery-ui-1.10.3/demos/droppable/photo-manager.html
new file mode 100644
index 0000000..54a805d
--- /dev/null
+++ b/data/treeio/treeio/static/js/jquery-ui-1.10.3/demos/droppable/photo-manager.html
@@ -0,0 +1,182 @@
+<!doctype html>
+<html lang="en">
+<head>
+	<meta charset="utf-8">
+	<title>jQuery UI Droppable - Simple photo manager</title>
+	<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
+	<script src="../../jquery-1.9.1.js"></script>
+	<script src="../../ui/jquery.ui.position.js"></script>
+	<script src="../../ui/jquery.ui.core.js"></script>
+	<script src="../../ui/jquery.ui.widget.js"></script>
+	<script src="../../ui/jquery.ui.mouse.js"></script>
+	<script src="../../ui/jquery.ui.draggable.js"></script>
+	<script src="../../ui/jquery.ui.droppable.js"></script>
+	<script src="../../ui/jquery.ui.resizable.js"></script>
+	<script src="../../ui/jquery.ui.dialog.js"></script>
+	<link rel="stylesheet" href="../demos.css">
+	<style>
+	#gallery { float: left; width: 65%; min-height: 12em; }
+	.gallery.custom-state-active { background: #eee; }
+	.gallery li { float: left; width: 96px; padding: 0.4em; margin: 0 0.4em 0.4em 0; text-align: center; }
+	.gallery li h5 { margin: 0 0 0.4em; cursor: move; }
+	.gallery li a { float: right; }
+	.gallery li a.ui-icon-zoomin { float: left; }
+	.gallery li img { width: 100%; cursor: move; }
+
+	#trash { float: right; width: 32%; min-height: 18em; padding: 1%; }
+	#trash h4 { line-height: 16px; margin: 0 0 0.4em; }
+	#trash h4 .ui-icon { float: left; }
+	#trash .gallery h5 { display: none; }
+	</style>
+	<script>
+	$(function() {
+		// there's the gallery and the trash
+		var $gallery = $( "#gallery" ),
+			$trash = $( "#trash" );
+
+		// let the gallery items be draggable
+		$( "li", $gallery ).draggable({
+			cancel: "a.ui-icon", // clicking an icon won't initiate dragging
+			revert: "invalid", // when not dropped, the item will revert back to its initial position
+			containment: "document",
+			helper: "clone",
+			cursor: "move"
+		});
+
+		// let the trash be droppable, accepting the gallery items
+		$trash.droppable({
+			accept: "#gallery > li",
+			activeClass: "ui-state-highlight",
+			drop: function( event, ui ) {
+				deleteImage( ui.draggable );
+			}
+		});
+
+		// let the gallery be droppable as well, accepting items from the trash
+		$gallery.droppable({
+			accept: "#trash li",
+			activeClass: "custom-state-active",
+			drop: function( event, ui ) {
+				recycleImage( ui.draggable );
+			}
+		});
+
+		// image deletion function
+		var recycle_icon = "<a href='link/to/recycle/script/when/we/have/js/off' title='Recycle this image' class='ui-icon ui-icon-refresh'>Recycle image</a>";
+		function deleteImage( $item ) {
+			$item.fadeOut(function() {
+				var $list = $( "ul", $trash ).length ?
+					$( "ul", $trash ) :
+					$( "<ul class='gallery ui-helper-reset'/>" ).appendTo( $trash );
+
+				$item.find( "a.ui-icon-trash" ).remove();
+				$item.append( recycle_icon ).appendTo( $list ).fadeIn(function() {
+					$item
+						.animate({ width: "48px" })
+						.find( "img" )
+							.animate({ height: "36px" });
+				});
+			});
+		}
+
+		// image recycle function
+		var trash_icon = "<a href='link/to/trash/script/when/we/have/js/off' title='Delete this image' class='ui-icon ui-icon-trash'>Delete image</a>";
+		function recycleImage( $item ) {
+			$item.fadeOut(function() {
+				$item
+					.find( "a.ui-icon-refresh" )
+						.remove()
+					.end()
+					.css( "width", "96px")
+					.append( trash_icon )
+					.find( "img" )
+						.css( "height", "72px" )
+					.end()
+					.appendTo( $gallery )
+					.fadeIn();
+			});
+		}
+
+		// image preview function, demonstrating the ui.dialog used as a modal window
+		function viewLargerImage( $link ) {
+			var src = $link.attr( "href" ),
+				title = $link.siblings( "img" ).attr( "alt" ),
+				$modal = $( "img[src$='" + src + "']" );
+
+			if ( $modal.length ) {
+				$modal.dialog( "open" );
+			} else {
+				var img = $( "<img alt='" + title + "' width='384' height='288' style='display: none; padding: 8px;' />" )
+					.attr( "src", src ).appendTo( "body" );
+				setTimeout(function() {
+					img.dialog({
+						title: title,
+						width: 400,
+						modal: true
+					});
+				}, 1 );
+			}
+		}
+
+		// resolve the icons behavior with event delegation
+		$( "ul.gallery > li" ).click(function( event ) {
+			var $item = $( this ),
+				$target = $( event.target );
+
+			if ( $target.is( "a.ui-icon-trash" ) ) {
+				deleteImage( $item );
+			} else if ( $target.is( "a.ui-icon-zoomin" ) ) {
+				viewLargerImage( $target );
+			} else if ( $target.is( "a.ui-icon-refresh" ) ) {
+				recycleImage( $item );
+			}
+
+			return false;
+		});
+	});
+	</script>
+</head>
+<body>
+
+<div class="ui-widget ui-helper-clearfix">
+
+<ul id="gallery" class="gallery ui-helper-reset ui-helper-clearfix">
+	<li class="ui-widget-content ui-corner-tr">
+		<h5 class="ui-widget-header">High Tatras</h5>
+		<img src="images/high_tatras_min.jpg" alt="The peaks of High Tatras" width="96" height="72" />
+		<a href="images/high_tatras.jpg" title="View larger image" class="ui-icon ui-icon-zoomin">View larger</a>
+		<a href="link/to/trash/script/when/we/have/js/off" title="Delete this image" class="ui-icon ui-icon-trash">Delete image</a>
+	</li>
+	<li class="ui-widget-content ui-corner-tr">
+		<h5 class="ui-widget-header">High Tatras 2</h5>
+		<img src="images/high_tatras2_min.jpg" alt="The chalet at the Green mountain lake" width="96" height="72" />
+		<a href="images/high_tatras2.jpg" title="View larger image" class="ui-icon ui-icon-zoomin">View larger</a>
+		<a href="link/to/trash/script/when/we/have/js/off" title="Delete this image" class="ui-icon ui-icon-trash">Delete image</a>
+	</li>
+	<li class="ui-widget-content ui-corner-tr">
+		<h5 class="ui-widget-header">High Tatras 3</h5>
+		<img src="images/high_tatras3_min.jpg" alt="Planning the ascent" width="96" height="72" />
+		<a href="images/high_tatras3.jpg" title="View larger image" class="ui-icon ui-icon-zoomin">View larger</a>
+		<a href="link/to/trash/script/when/we/have/js/off" title="Delete this image" class="ui-icon ui-icon-trash">Delete image</a>
+	</li>
+	<li class="ui-widget-content ui-corner-tr">
+		<h5 class="ui-widget-header">High Tatras 4</h5>
+		<img src="images/high_tatras4_min.jpg" alt="On top of Kozi kopka" width="96" height="72" />
+		<a href="images/high_tatras4.jpg" title="View larger image" class="ui-icon ui-icon-zoomin">View larger</a>
+		<a href="link/to/trash/script/when/we/have/js/off" title="Delete this image" class="ui-icon ui-icon-trash">Delete image</a>
+	</li>
+</ul>
+
+<div id="trash" class="ui-widget-content ui-state-default">
+	<h4 class="ui-widget-header"><span class="ui-icon ui-icon-trash">Trash</span> Trash</h4>
+</div>
+
+</div>
+
+<div class="demo-description">
+<p>You can delete an image either by dragging it to the Trash or by clicking the trash icon.</p>
+<p>You can "recycle" an image by dragging it back to the gallery or by clicking the recycle icon.</p>
+<p>You can view larger image by clicking the zoom icon. jQuery UI dialog widget is used for the modal window.</p>
+</div>
+</body>
+</html>
diff --git a/data/treeio/treeio/static/js/jquery-ui-1.10.3/demos/effect/easing.html b/data/treeio/treeio/static/js/jquery-ui-1.10.3/demos/effect/easing.html
new file mode 100644
index 0000000..819351e
--- /dev/null
+++ b/data/treeio/treeio/static/js/jquery-ui-1.10.3/demos/effect/easing.html
@@ -0,0 +1,102 @@
+<!doctype html>
+<html lang="en">
+<head>
+	<meta charset="utf-8">
+	<title>jQuery UI Effects - Easing demo</title>
+	<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
+	<script src="../../jquery-1.9.1.js"></script>
+	<script src="../../ui/jquery.ui.effect.js"></script>
+	<link rel="stylesheet" href="../demos.css">
+	<style>
+	.graph {
+		float: left;
+		margin-left: 10px;
+	}
+	</style>
+	<script>
+	$(function() {
+		if ( !$( "<canvas>" )[0].getContext ) {
+			$( "<div>" ).text(
+				"Your browser doesn't support canvas, which is required for this demo."
+			).appendTo( "#graphs" );
+			return;
+		}
+
+		var i = 0,
+			width = 100,
+			height = 100;
+
+		$.each( $.easing, function( name, impl ) {
+			var graph = $( "<div>" ).addClass( "graph" ).appendTo( "#graphs" ),
+				text = $( "<div>" ).text( ++i + ". " + name ).appendTo( graph ),
+				wrap = $( "<div>" ).appendTo( graph ).css( 'overflow', 'hidden' ),
+				canvas = $( "<canvas>" ).appendTo( wrap )[ 0 ];
+
+			canvas.width = width;
+			canvas.height = height;
+			var drawHeight = height * 0.8,
+				cradius = 10;
+				ctx = canvas.getContext( "2d" );
+			ctx.fillStyle = "black";
+
+			// draw background
+			ctx.beginPath();
+			ctx.moveTo( cradius, 0 );
+			ctx.quadraticCurveTo( 0, 0, 0, cradius );
+			ctx.lineTo( 0, height - cradius );
+			ctx.quadraticCurveTo( 0, height, cradius, height );
+			ctx.lineTo( width - cradius, height );
+			ctx.quadraticCurveTo( width, height, width, height - cradius );
+			ctx.lineTo( width, 0 );
+			ctx.lineTo( cradius, 0 );
+			ctx.fill();
+
+			// draw bottom line
+			ctx.strokeStyle = "#555";
+			ctx.beginPath();
+			ctx.moveTo( width * 0.1, drawHeight + .5 );
+			ctx.lineTo( width * 0.9, drawHeight + .5 );
+			ctx.stroke();
+
+			// draw top line
+			ctx.strokeStyle = "#555";
+			ctx.beginPath();
+			ctx.moveTo( width * 0.1, drawHeight * .3 - .5 );
+			ctx.lineTo( width * 0.9, drawHeight * .3 - .5 );
+			ctx.stroke();
+
+			// plot easing
+			ctx.strokeStyle = "white";
+			ctx.beginPath();
+			ctx.lineWidth = 2;
+			ctx.moveTo( width * 0.1, drawHeight );
+			$.each( new Array( width ), function( position ) {
+				var state = position / width,
+					val = impl( state, position, 0, 1, width );
+				ctx.lineTo( position * 0.8 + width * 0.1,
+					drawHeight - drawHeight * val * 0.7 );
+			});
+			ctx.stroke();
+
+			// animate on click
+			graph.click(function() {
+				wrap
+					.animate( { height: "hide" }, 2000, name )
+					.delay( 800 )
+					.animate( { height: "show" }, 2000, name );
+			});
+
+			graph.width( width ).height( height + text.height() + 10 );
+		});
+	});
+	</script>
+</head>
+<body>
+
+<div id="graphs"></div>
+
+<div class="demo-description">
+<p><strong>All easings provided by jQuery UI are drawn above, using a HTML canvas element</strong>. Click a diagram to see the easing in action.</p>
+</div>
+</body>
+</html>
diff --git a/data/treeio/treeio/static/js/jquery-ui-1.10.3/demos/tabs/manipulation.html b/data/treeio/treeio/static/js/jquery-ui-1.10.3/demos/tabs/manipulation.html
new file mode 100644
index 0000000..efcf011
--- /dev/null
+++ b/data/treeio/treeio/static/js/jquery-ui-1.10.3/demos/tabs/manipulation.html
@@ -0,0 +1,122 @@
+<!doctype html>
+<html lang="en">
+<head>
+	<meta charset="utf-8">
+	<title>jQuery UI Tabs - Simple manipulation</title>
+	<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
+	<script src="../../jquery-1.9.1.js"></script>
+	<script src="../../ui/jquery.ui.position.js"></script>
+	<script src="../../ui/jquery.ui.core.js"></script>
+	<script src="../../ui/jquery.ui.widget.js"></script>
+	<script src="../../ui/jquery.ui.button.js"></script>
+	<script src="../../ui/jquery.ui.tabs.js"></script>
+	<script src="../../ui/jquery.ui.dialog.js"></script>
+	<link rel="stylesheet" href="../demos.css">
+	<style>
+	#dialog label, #dialog input { display:block; }
+	#dialog label { margin-top: 0.5em; }
+	#dialog input, #dialog textarea { width: 95%; }
+	#tabs { margin-top: 1em; }
+	#tabs li .ui-icon-close { float: left; margin: 0.4em 0.2em 0 0; cursor: pointer; }
+	#add_tab { cursor: pointer; }
+	</style>
+	<script>
+	$(function() {
+		var tabTitle = $( "#tab_title" ),
+			tabContent = $( "#tab_content" ),
+			tabTemplate = "<li><a href='#{href}'>#{label}</a> <span class='ui-icon ui-icon-close' role='presentation'>Remove Tab</span></li>",
+			tabCounter = 2;
+
+		var tabs = $( "#tabs" ).tabs();
+
+		// modal dialog init: custom buttons and a "close" callback reseting the form inside
+		var dialog = $( "#dialog" ).dialog({
+			autoOpen: false,
+			modal: true,
+			buttons: {
+				Add: function() {
+					addTab();
+					$( this ).dialog( "close" );
+				},
+				Cancel: function() {
+					$( this ).dialog( "close" );
+				}
+			},
+			close: function() {
+				form[ 0 ].reset();
+			}
+		});
+
+		// addTab form: calls addTab function on submit and closes the dialog
+		var form = dialog.find( "form" ).submit(function( event ) {
+			addTab();
+			dialog.dialog( "close" );
+			event.preventDefault();
+		});
+
+		// actual addTab function: adds new tab using the input from the form above
+		function addTab() {
+			var label = tabTitle.val() || "Tab " + tabCounter,
+				id = "tabs-" + tabCounter,
+				li = $( tabTemplate.replace( /#\{href\}/g, "#" + id ).replace( /#\{label\}/g, label ) ),
+				tabContentHtml = tabContent.val() || "Tab " + tabCounter + " content.";
+
+			tabs.find( ".ui-tabs-nav" ).append( li );
+			tabs.append( "<div id='" + id + "'><p>" + tabContentHtml + "</p></div>" );
+			tabs.tabs( "refresh" );
+			tabCounter++;
+		}
+
+		// addTab button: just opens the dialog
+		$( "#add_tab" )
+			.button()
+			.click(function() {
+				dialog.dialog( "open" );
+			});
+
+		// close icon: removing the tab on click
+		tabs.delegate( "span.ui-icon-close", "click", function() {
+			var panelId = $( this ).closest( "li" ).remove().attr( "aria-controls" );
+			$( "#" + panelId ).remove();
+			tabs.tabs( "refresh" );
+		});
+
+		tabs.bind( "keyup", function( event ) {
+			if ( event.altKey && event.keyCode === $.ui.keyCode.BACKSPACE ) {
+				var panelId = tabs.find( ".ui-tabs-active" ).remove().attr( "aria-controls" );
+				$( "#" + panelId ).remove();
+				tabs.tabs( "refresh" );
+			}
+		});
+	});
+	</script>
+</head>
+<body>
+
+<div id="dialog" title="Tab data">
+	<form>
+		<fieldset class="ui-helper-reset">
+			<label for="tab_title">Title</label>
+			<input type="text" name="tab_title" id="tab_title" value="" class="ui-widget-content ui-corner-all" />
+			<label for="tab_content">Content</label>
+			<textarea name="tab_content" id="tab_content" class="ui-widget-content ui-corner-all"></textarea>
+		</fieldset>
+	</form>
+</div>
+
+<button id="add_tab">Add Tab</button>
+
+<div id="tabs">
+	<ul>
+		<li><a href="#tabs-1">Nunc tincidunt</a> <span class="ui-icon ui-icon-close" role="presentation">Remove Tab</span></li>
+	</ul>
+	<div id="tabs-1">
+		<p>Proin elit arcu, rutrum commodo, vehicula tempus, commodo a, risus. Curabitur nec arcu. Donec sollicitudin mi sit amet mauris. Nam elementum quam ullamcorper ante. Etiam aliquet massa et lorem. Mauris dapibus lacus auctor risus. Aenean tempor ullamcorper leo. Vivamus sed magna quis ligula eleifend adipiscing. Duis orci. Aliquam sodales tortor vitae ipsum. Aliquam nulla. Duis aliquam molestie erat. Ut et mauris vel pede varius sollicitudin. Sed ut dolor nec orci tincidunt interdum. Phasellus ipsum. Nunc tristique tempus lectus.</p>
+	</div>
+</div>
+
+<div class="demo-description">
+<p>Simple tabs adding and removing.</p>
+</div>
+</body>
+</html>
diff --git a/data/treeio/treeio/static/js/jquery-ui-1.10.3/ui/jquery-ui.js b/data/treeio/treeio/static/js/jquery-ui-1.10.3/ui/jquery-ui.js
new file mode 100644
index 0000000..7b727e7
--- /dev/null
+++ b/data/treeio/treeio/static/js/jquery-ui-1.10.3/ui/jquery-ui.js
@@ -0,0 +1,15003 @@
+/*! jQuery UI - v1.10.3 - 2013-05-03
+* http://jqueryui.com
+* Includes: jquery.ui.core.js, jquery.ui.widget.js, jquery.ui.mouse.js, jquery.ui.draggable.js, jquery.ui.droppable.js, jquery.ui.resizable.js, jquery.ui.selectable.js, jquery.ui.sortable.js, jquery.ui.effect.js, jquery.ui.accordion.js, jquery.ui.autocomplete.js, jquery.ui.button.js, jquery.ui.datepicker.js, jquery.ui.dialog.js, jquery.ui.effect-blind.js, jquery.ui.effect-bounce.js, jquery.ui.effect-clip.js, jquery.ui.effect-drop.js, jquery.ui.effect-explode.js, jquery.ui.effect-fade.js, jquery.ui.effect-fold.js, jquery.ui.effect-highlight.js, jquery.ui.effect-pulsate.js, jquery.ui.effect-scale.js, jquery.ui.effect-shake.js, jquery.ui.effect-slide.js, jquery.ui.effect-transfer.js, jquery.ui.menu.js, jquery.ui.position.js, jquery.ui.progressbar.js, jquery.ui.slider.js, jquery.ui.spinner.js, jquery.ui.tabs.js, jquery.ui.tooltip.js
+* Copyright 2013 jQuery Foundation and other contributors; Licensed MIT */
+(function( $, undefined ) {
+
+var uuid = 0,
+	runiqueId = /^ui-id-\d+$/;
+
+// $.ui might exist from components with no dependencies, e.g., $.ui.position
+$.ui = $.ui || {};
+
+$.extend( $.ui, {
+	version: "1.10.3",
+
+	keyCode: {
+		BACKSPACE: 8,
+		COMMA: 188,
+		DELETE: 46,
+		DOWN: 40,
+		END: 35,
+		ENTER: 13,
+		ESCAPE: 27,
+		HOME: 36,
+		LEFT: 37,
+		NUMPAD_ADD: 107,
+		NUMPAD_DECIMAL: 110,
+		NUMPAD_DIVIDE: 111,
+		NUMPAD_ENTER: 108,
+		NUMPAD_MULTIPLY: 106,
+		NUMPAD_SUBTRACT: 109,
+		PAGE_DOWN: 34,
+		PAGE_UP: 33,
+		PERIOD: 190,
+		RIGHT: 39,
+		SPACE: 32,
+		TAB: 9,
+		UP: 38
+	}
+});
+
+// plugins
+$.fn.extend({
+	focus: (function( orig ) {
+		return function( delay, fn ) {
+			return typeof delay === "number" ?
+				this.each(function() {
+					var elem = this;
+					setTimeout(function() {
+						$( elem ).focus();
+						if ( fn ) {
+							fn.call( elem );
+						}
+					}, delay );
+				}) :
+				orig.apply( this, arguments );
+		};
+	})( $.fn.focus ),
+
+	scrollParent: function() {
+		var scrollParent;
+		if (($.ui.ie && (/(static|relative)/).test(this.css("position"))) || (/absolute/).test(this.css("position"))) {
+			scrollParent = this.parents().filter(function() {
+				return (/(relative|absolute|fixed)/).test($.css(this,"position")) && (/(auto|scroll)/).test($.css(this,"overflow")+$.css(this,"overflow-y")+$.css(this,"overflow-x"));
+			}).eq(0);
+		} else {
+			scrollParent = this.parents().filter(function() {
+				return (/(auto|scroll)/).test($.css(this,"overflow")+$.css(this,"overflow-y")+$.css(this,"overflow-x"));
+			}).eq(0);
+		}
+
+		return (/fixed/).test(this.css("position")) || !scrollParent.length ? $(document) : scrollParent;
+	},
+
+	zIndex: function( zIndex ) {
+		if ( zIndex !== undefined ) {
+			return this.css( "zIndex", zIndex );
+		}
+
+		if ( this.length ) {
+			var elem = $( this[ 0 ] ), position, value;
+			while ( elem.length && elem[ 0 ] !== document ) {
+				// Ignore z-index if position is set to a value where z-index is ignored by the browser
+				// This makes behavior of this function consistent across browsers
+				// WebKit always returns auto if the element is positioned
+				position = elem.css( "position" );
+				if ( position === "absolute" || position === "relative" || position === "fixed" ) {
+					// IE returns 0 when zIndex is not specified
+					// other browsers return a string
+					// we ignore the case of nested elements with an explicit value of 0
+					// <div style="z-index: -10;"><div style="z-index: 0;"></div></div>
+					value = parseInt( elem.css( "zIndex" ), 10 );
+					if ( !isNaN( value ) && value !== 0 ) {
+						return value;
+					}
+				}
+				elem = elem.parent();
+			}
+		}
+
+		return 0;
+	},
+
+	uniqueId: function() {
+		return this.each(function() {
+			if ( !this.id ) {
+				this.id = "ui-id-" + (++uuid);
+			}
+		});
+	},
+
+	removeUniqueId: function() {
+		return this.each(function() {
+			if ( runiqueId.test( this.id ) ) {
+				$( this ).removeAttr( "id" );
+			}
+		});
+	}
+});
+
+// selectors
+function focusable( element, isTabIndexNotNaN ) {
+	var map, mapName, img,
+		nodeName = element.nodeName.toLowerCase();
+	if ( "area" === nodeName ) {
+		map = element.parentNode;
+		mapName = map.name;
+		if ( !element.href || !mapName || map.nodeName.toLowerCase() !== "map" ) {
+			return false;
+		}
+		img = $( "img[usemap=#" + mapName + "]" )[0];
+		return !!img && visible( img );
+	}
+	return ( /input|select|textarea|button|object/.test( nodeName ) ?
+		!element.disabled :
+		"a" === nodeName ?
+			element.href || isTabIndexNotNaN :
+			isTabIndexNotNaN) &&
+		// the element and all of its ancestors must be visible
+		visible( element );
+}
+
+function visible( element ) {
+	return $.expr.filters.visible( element ) &&
+		!$( element ).parents().addBack().filter(function() {
+			return $.css( this, "visibility" ) === "hidden";
+		}).length;
+}
+
+$.extend( $.expr[ ":" ], {
+	data: $.expr.createPseudo ?
+		$.expr.createPseudo(function( dataName ) {
+			return function( elem ) {
+				return !!$.data( elem, dataName );
+			};
+		}) :
+		// support: jQuery <1.8
+		function( elem, i, match ) {
+			return !!$.data( elem, match[ 3 ] );
+		},
+
+	focusable: function( element ) {
+		return focusable( element, !isNaN( $.attr( element, "tabindex" ) ) );
+	},
+
+	tabbable: function( element ) {
+		var tabIndex = $.attr( element, "tabindex" ),
+			isTabIndexNaN = isNaN( tabIndex );
+		return ( isTabIndexNaN || tabIndex >= 0 ) && focusable( element, !isTabIndexNaN );
+	}
+});
+
+// support: jQuery <1.8
+if ( !$( "<a>" ).outerWidth( 1 ).jquery ) {
+	$.each( [ "Width", "Height" ], function( i, name ) {
+		var side = name === "Width" ? [ "Left", "Right" ] : [ "Top", "Bottom" ],
+			type = name.toLowerCase(),
+			orig = {
+				innerWidth: $.fn.innerWidth,
+				innerHeight: $.fn.innerHeight,
+				outerWidth: $.fn.outerWidth,
+				outerHeight: $.fn.outerHeight
+			};
+
+		function reduce( elem, size, border, margin ) {
+			$.each( side, function() {
+				size -= parseFloat( $.css( elem, "padding" + this ) ) || 0;
+				if ( border ) {
+					size -= parseFloat( $.css( elem, "border" + this + "Width" ) ) || 0;
+				}
+				if ( margin ) {
+					size -= parseFloat( $.css( elem, "margin" + this ) ) || 0;
+				}
+			});
+			return size;
+		}
+
+		$.fn[ "inner" + name ] = function( size ) {
+			if ( size === undefined ) {
+				return orig[ "inner" + name ].call( this );
+			}
+
+			return this.each(function() {
+				$( this ).css( type, reduce( this, size ) + "px" );
+			});
+		};
+
+		$.fn[ "outer" + name] = function( size, margin ) {
+			if ( typeof size !== "number" ) {
+				return orig[ "outer" + name ].call( this, size );
+			}
+
+			return this.each(function() {
+				$( this).css( type, reduce( this, size, true, margin ) + "px" );
+			});
+		};
+	});
+}
+
+// support: jQuery <1.8
+if ( !$.fn.addBack ) {
+	$.fn.addBack = function( selector ) {
+		return this.add( selector == null ?
+			this.prevObject : this.prevObject.filter( selector )
+		);
+	};
+}
+
+// support: jQuery 1.6.1, 1.6.2 (http://bugs.jquery.com/ticket/9413)
+if ( $( "<a>" ).data( "a-b", "a" ).removeData( "a-b" ).data( "a-b" ) ) {
+	$.fn.removeData = (function( removeData ) {
+		return function( key ) {
+			if ( arguments.length ) {
+				return removeData.call( this, $.camelCase( key ) );
+			} else {
+				return removeData.call( this );
+			}
+		};
+	})( $.fn.removeData );
+}
+
+
+
+
+
+// deprecated
+$.ui.ie = !!/msie [\w.]+/.exec( navigator.userAgent.toLowerCase() );
+
+$.support.selectstart = "onselectstart" in document.createElement( "div" );
+$.fn.extend({
+	disableSelection: function() {
+		return this.bind( ( $.support.selectstart ? "selectstart" : "mousedown" ) +
+			".ui-disableSelection", function( event ) {
+				event.preventDefault();
+			});
+	},
+
+	enableSelection: function() {
+		return this.unbind( ".ui-disableSelection" );
+	}
+});
+
+$.extend( $.ui, {
+	// $.ui.plugin is deprecated. Use $.widget() extensions instead.
+	plugin: {
+		add: function( module, option, set ) {
+			var i,
+				proto = $.ui[ module ].prototype;
+			for ( i in set ) {
+				proto.plugins[ i ] = proto.plugins[ i ] || [];
+				proto.plugins[ i ].push( [ option, set[ i ] ] );
+			}
+		},
+		call: function( instance, name, args ) {
+			var i,
+				set = instance.plugins[ name ];
+			if ( !set || !instance.element[ 0 ].parentNode || instance.element[ 0 ].parentNode.nodeType === 11 ) {
+				return;
+			}
+
+			for ( i = 0; i < set.length; i++ ) {
+				if ( instance.options[ set[ i ][ 0 ] ] ) {
+					set[ i ][ 1 ].apply( instance.element, args );
+				}
+			}
+		}
+	},
+
+	// only used by resizable
+	hasScroll: function( el, a ) {
+
+		//If overflow is hidden, the element might have extra content, but the user wants to hide it
+		if ( $( el ).css( "overflow" ) === "hidden") {
+			return false;
+		}
+
+		var scroll = ( a && a === "left" ) ? "scrollLeft" : "scrollTop",
+			has = false;
+
+		if ( el[ scroll ] > 0 ) {
+			return true;
+		}
+
+		// TODO: determine which cases actually cause this to happen
+		// if the element doesn't have the scroll set, see if it's possible to
+		// set the scroll
+		el[ scroll ] = 1;
+		has = ( el[ scroll ] > 0 );
+		el[ scroll ] = 0;
+		return has;
+	}
+});
+
+})( jQuery );
+
+(function( $, undefined ) {
+
+var uuid = 0,
+	slice = Array.prototype.slice,
+	_cleanData = $.cleanData;
+$.cleanData = function( elems ) {
+	for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
+		try {
+			$( elem ).triggerHandler( "remove" );
+		// http://bugs.jquery.com/ticket/8235
+		} catch( e ) {}
+	}
+	_cleanData( elems );
+};
+
+$.widget = function( name, base, prototype ) {
+	var fullName, existingConstructor, constructor, basePrototype,
+		// proxiedPrototype allows the provided prototype to remain unmodified
+		// so that it can be used as a mixin for multiple widgets (#8876)
+		proxiedPrototype = {},
+		namespace = name.split( "." )[ 0 ];
+
+	name = name.split( "." )[ 1 ];
+	fullName = namespace + "-" + name;
+
+	if ( !prototype ) {
+		prototype = base;
+		base = $.Widget;
+	}
+
+	// create selector for plugin
+	$.expr[ ":" ][ fullName.toLowerCase() ] = function( elem ) {
+		return !!$.data( elem, fullName );
+	};
+
+	$[ namespace ] = $[ namespace ] || {};
+	existingConstructor = $[ namespace ][ name ];
+	constructor = $[ namespace ][ name ] = function( options, element ) {
+		// allow instantiation without "new" keyword
+		if ( !this._createWidget ) {
+			return new constructor( options, element );
+		}
+
+		// allow instantiation without initializing for simple inheritance
+		// must use "new" keyword (the code above always passes args)
+		if ( arguments.length ) {
+			this._createWidget( options, element );
+		}
+	};
+	// extend with the existing constructor to carry over any static properties
+	$.extend( constructor, existingConstructor, {
+		version: prototype.version,
+		// copy the object used to create the prototype in case we need to
+		// redefine the widget later
+		_proto: $.extend( {}, prototype ),
+		// track widgets that inherit from this widget in case this widget is
+		// redefined after a widget inherits from it
+		_childConstructors: []
+	});
+
+	basePrototype = new base();
+	// we need to make the options hash a property directly on the new instance
+	// otherwise we'll modify the options hash on the prototype that we're
+	// inheriting from
+	basePrototype.options = $.widget.extend( {}, basePrototype.options );
+	$.each( prototype, function( prop, value ) {
+		if ( !$.isFunction( value ) ) {
+			proxiedPrototype[ prop ] = value;
+			return;
+		}
+		proxiedPrototype[ prop ] = (function() {
+			var _super = function() {
+					return base.prototype[ prop ].apply( this, arguments );
+				},
+				_superApply = function( args ) {
+					return base.prototype[ prop ].apply( this, args );
+				};
+			return function() {
+				var __super = this._super,
+					__superApply = this._superApply,
+					returnValue;
+
+				this._super = _super;
+				this._superApply = _superApply;
+
+				returnValue = value.apply( this, arguments );
+
+				this._super = __super;
+				this._superApply = __superApply;
+
+				return returnValue;
+			};
+		})();
+	});
+	constructor.prototype = $.widget.extend( basePrototype, {
+		// TODO: remove support for widgetEventPrefix
+		// always use the name + a colon as the prefix, e.g., draggable:start
+		// don't prefix for widgets that aren't DOM-based
+		widgetEventPrefix: existingConstructor ? basePrototype.widgetEventPrefix : name
+	}, proxiedPrototype, {
+		constructor: constructor,
+		namespace: namespace,
+		widgetName: name,
+		widgetFullName: fullName
+	});
+
+	// If this widget is being redefined then we need to find all widgets that
+	// are inheriting from it and redefine all of them so that they inherit from
+	// the new version of this widget. We're essentially trying to replace one
+	// level in the prototype chain.
+	if ( existingConstructor ) {
+		$.each( existingConstructor._childConstructors, function( i, child ) {
+			var childPrototype = child.prototype;
+
+			// redefine the child widget using the same prototype that was
+			// originally used, but inherit from the new version of the base
+			$.widget( childPrototype.namespace + "." + childPrototype.widgetName, constructor, child._proto );
+		});
+		// remove the list of existing child constructors from the old constructor
+		// so the old child constructors can be garbage collected
+		delete existingConstructor._childConstructors;
+	} else {
+		base._childConstructors.push( constructor );
+	}
+
+	$.widget.bridge( name, constructor );
+};
+
+$.widget.extend = function( target ) {
+	var input = slice.call( arguments, 1 ),
+		inputIndex = 0,
+		inputLength = input.length,
+		key,
+		value;
+	for ( ; inputIndex < inputLength; inputIndex++ ) {
+		for ( key in input[ inputIndex ] ) {
+			value = input[ inputIndex ][ key ];
+			if ( input[ inputIndex ].hasOwnProperty( key ) && value !== undefined ) {
+				// Clone objects
+				if ( $.isPlainObject( value ) ) {
+					target[ key ] = $.isPlainObject( target[ key ] ) ?
+						$.widget.extend( {}, target[ key ], value ) :
+						// Don't extend strings, arrays, etc. with objects
+						$.widget.extend( {}, value );
+				// Copy everything else by reference
+				} else {
+					target[ key ] = value;
+				}
+			}
+		}
+	}
+	return target;
+};
+
+$.widget.bridge = function( name, object ) {
+	var fullName = object.prototype.widgetFullName || name;
+	$.fn[ name ] = function( options ) {
+		var isMethodCall = typeof options === "string",
+			args = slice.call( arguments, 1 ),
+			returnValue = this;
+
+		// allow multiple hashes to be passed on init
+		options = !isMethodCall && args.length ?
+			$.widget.extend.apply( null, [ options ].concat(args) ) :
+			options;
+
+		if ( isMethodCall ) {
+			this.each(function() {
+				var methodValue,
+					instance = $.data( this, fullName );
+				if ( !instance ) {
+					return $.error( "cannot call methods on " + name + " prior to initialization; " +
+						"attempted to call method '" + options + "'" );
+				}
+				if ( !$.isFunction( instance[options] ) || options.charAt( 0 ) === "_" ) {
+					return $.error( "no such method '" + options + "' for " + name + " widget instance" );
+				}
+				methodValue = instance[ options ].apply( instance, args );
+				if ( methodValue !== instance && methodValue !== undefined ) {
+					returnValue = methodValue && methodValue.jquery ?
+						returnValue.pushStack( methodValue.get() ) :
+						methodValue;
+					return false;
+				}
+			});
+		} else {
+			this.each(function() {
+				var instance = $.data( this, fullName );
+				if ( instance ) {
+					instance.option( options || {} )._init();
+				} else {
+					$.data( this, fullName, new object( options, this ) );
+				}
+			});
+		}
+
+		return returnValue;
+	};
+};
+
+$.Widget = function( /* options, element */ ) {};
+$.Widget._childConstructors = [];
+
+$.Widget.prototype = {
+	widgetName: "widget",
+	widgetEventPrefix: "",
+	defaultElement: "<div>",
+	options: {
+		disabled: false,
+
+		// callbacks
+		create: null
+	},
+	_createWidget: function( options, element ) {
+		element = $( element || this.defaultElement || this )[ 0 ];
+		this.element = $( element );
+		this.uuid = uuid++;
+		this.eventNamespace = "." + this.widgetName + this.uuid;
+		this.options = $.widget.extend( {},
+			this.options,
+			this._getCreateOptions(),
+			options );
+
+		this.bindings = $();
+		this.hoverable = $();
+		this.focusable = $();
+
+		if ( element !== this ) {
+			$.data( element, this.widgetFullName, this );
+			this._on( true, this.element, {
+				remove: function( event ) {
+					if ( event.target === element ) {
+						this.destroy();
+					}
+				}
+			});
+			this.document = $( element.style ?
+				// element within the document
+				element.ownerDocument :
+				// element is window or document
+				element.document || element );
+			this.window = $( this.document[0].defaultView || this.document[0].parentWindow );
+		}
+
+		this._create();
+		this._trigger( "create", null, this._getCreateEventData() );
+		this._init();
+	},
+	_getCreateOptions: $.noop,
+	_getCreateEventData: $.noop,
+	_create: $.noop,
+	_init: $.noop,
+
+	destroy: function() {
+		this._destroy();
+		// we can probably remove the unbind calls in 2.0
+		// all event bindings should go through this._on()
+		this.element
+			.unbind( this.eventNamespace )
+			// 1.9 BC for #7810
+			// TODO remove dual storage
+			.removeData( this.widgetName )
+			.removeData( this.widgetFullName )
+			// support: jquery <1.6.3
+			// http://bugs.jquery.com/ticket/9413
+			.removeData( $.camelCase( this.widgetFullName ) );
+		this.widget()
+			.unbind( this.eventNamespace )
+			.removeAttr( "aria-disabled" )
+			.removeClass(
+				this.widgetFullName + "-disabled " +
+				"ui-state-disabled" );
+
+		// clean up events and states
+		this.bindings.unbind( this.eventNamespace );
+		this.hoverable.removeClass( "ui-state-hover" );
+		this.focusable.removeClass( "ui-state-focus" );
+	},
+	_destroy: $.noop,
+
+	widget: function() {
+		return this.element;
+	},
+
+	option: function( key, value ) {
+		var options = key,
+			parts,
+			curOption,
+			i;
+
+		if ( arguments.length === 0 ) {
+			// don't return a reference to the internal hash
+			return $.widget.extend( {}, this.options );
+		}
+
+		if ( typeof key === "string" ) {
+			// handle nested keys, e.g., "foo.bar" => { foo: { bar: ___ } }
+			options = {};
+			parts = key.split( "." );
+			key = parts.shift();
+			if ( parts.length ) {
+				curOption = options[ key ] = $.widget.extend( {}, this.options[ key ] );
+				for ( i = 0; i < parts.length - 1; i++ ) {
+					curOption[ parts[ i ] ] = curOption[ parts[ i ] ] || {};
+					curOption = curOption[ parts[ i ] ];
+				}
+				key = parts.pop();
+				if ( value === undefined ) {
+					return curOption[ key ] === undefined ? null : curOption[ key ];
+				}
+				curOption[ key ] = value;
+			} else {
+				if ( value === undefined ) {
+					return this.options[ key ] === undefined ? null : this.options[ key ];
+				}
+				options[ key ] = value;
+			}
+		}
+
+		this._setOptions( options );
+
+		return this;
+	},
+	_setOptions: function( options ) {
+		var key;
+
+		for ( key in options ) {
+			this._setOption( key, options[ key ] );
+		}
+
+		return this;
+	},
+	_setOption: function( key, value ) {
+		this.options[ key ] = value;
+
+		if ( key === "disabled" ) {
+			this.widget()
+				.toggleClass( this.widgetFullName + "-disabled ui-state-disabled", !!value )
+				.attr( "aria-disabled", value );
+			this.hoverable.removeClass( "ui-state-hover" );
+			this.focusable.removeClass( "ui-state-focus" );
+		}
+
+		return this;
+	},
+
+	enable: function() {
+		return this._setOption( "disabled", false );
+	},
+	disable: function() {
+		return this._setOption( "disabled", true );
+	},
+
+	_on: function( suppressDisabledCheck, element, handlers ) {
+		var delegateElement,
+			instance = this;
+
+		// no suppressDisabledCheck flag, shuffle arguments
+		if ( typeof suppressDisabledCheck !== "boolean" ) {
+			handlers = element;
+			element = suppressDisabledCheck;
+			suppressDisabledCheck = false;
+		}
+
+		// no element argument, shuffle and use this.element
+		if ( !handlers ) {
+			handlers = element;
+			element = this.element;
+			delegateElement = this.widget();
+		} else {
+			// accept selectors, DOM elements
+			element = delegateElement = $( element );
+			this.bindings = this.bindings.add( element );
+		}
+
+		$.each( handlers, function( event, handler ) {
+			function handlerProxy() {
+				// allow widgets to customize the disabled handling
+				// - disabled as an array instead of boolean
+				// - disabled class as method for disabling individual parts
+				if ( !suppressDisabledCheck &&
+						( instance.options.disabled === true ||
+							$( this ).hasClass( "ui-state-disabled" ) ) ) {
+					return;
+				}
+				return ( typeof handler === "string" ? instance[ handler ] : handler )
+					.apply( instance, arguments );
+			}
+
+			// copy the guid so direct unbinding works
+			if ( typeof handler !== "string" ) {
+				handlerProxy.guid = handler.guid =
+					handler.guid || handlerProxy.guid || $.guid++;
+			}
+
+			var match = event.match( /^(\w+)\s*(.*)$/ ),
+				eventName = match[1] + instance.eventNamespace,
+				selector = match[2];
+			if ( selector ) {
+				delegateElement.delegate( selector, eventName, handlerProxy );
+			} else {
+				element.bind( eventName, handlerProxy );
+			}
+		});
+	},
+
+	_off: function( element, eventName ) {
+		eventName = (eventName || "").split( " " ).join( this.eventNamespace + " " ) + this.eventNamespace;
+		element.unbind( eventName ).undelegate( eventName );
+	},
+
+	_delay: function( handler, delay ) {
+		function handlerProxy() {
+			return ( typeof handler === "string" ? instance[ handler ] : handler )
+				.apply( instance, arguments );
+		}
+		var instance = this;
+		return setTimeout( handlerProxy, delay || 0 );
+	},
+
+	_hoverable: function( element ) {
+		this.hoverable = this.hoverable.add( element );
+		this._on( element, {
+			mouseenter: function( event ) {
+				$( event.currentTarget ).addClass( "ui-state-hover" );
+			},
+			mouseleave: function( event ) {
+				$( event.currentTarget ).removeClass( "ui-state-hover" );
+			}
+		});
+	},
+
+	_focusable: function( element ) {
+		this.focusable = this.focusable.add( element );
+		this._on( element, {
+			focusin: function( event ) {
+				$( event.currentTarget ).addClass( "ui-state-focus" );
+			},
+			focusout: function( event ) {
+				$( event.currentTarget ).removeClass( "ui-state-focus" );
+			}
+		});
+	},
+
+	_trigger: function( type, event, data ) {
+		var prop, orig,
+			callback = this.options[ type ];
+
+		data = data || {};
+		event = $.Event( event );
+		event.type = ( type === this.widgetEventPrefix ?
+			type :
+			this.widgetEventPrefix + type ).toLowerCase();
+		// the original event may come from any element
+		// so we need to reset the target on the new event
+		event.target = this.element[ 0 ];
+
+		// copy original event properties over to the new event
+		orig = event.originalEvent;
+		if ( orig ) {
+			for ( prop in orig ) {
+				if ( !( prop in event ) ) {
+					event[ prop ] = orig[ prop ];
+				}
+			}
+		}
+
+		this.element.trigger( event, data );
+		return !( $.isFunction( callback ) &&
+			callback.apply( this.element[0], [ event ].concat( data ) ) === false ||
+			event.isDefaultPrevented() );
+	}
+};
+
+$.each( { show: "fadeIn", hide: "fadeOut" }, function( method, defaultEffect ) {
+	$.Widget.prototype[ "_" + method ] = function( element, options, callback ) {
+		if ( typeof options === "string" ) {
+			options = { effect: options };
+		}
+		var hasOptions,
+			effectName = !options ?
+				method :
+				options === true || typeof options === "number" ?
+					defaultEffect :
+					options.effect || defaultEffect;
+		options = options || {};
+		if ( typeof options === "number" ) {
+			options = { duration: options };
+		}
+		hasOptions = !$.isEmptyObject( options );
+		options.complete = callback;
+		if ( options.delay ) {
+			element.delay( options.delay );
+		}
+		if ( hasOptions && $.effects && $.effects.effect[ effectName ] ) {
+			element[ method ]( options );
+		} else if ( effectName !== method && element[ effectName ] ) {
+			element[ effectName ]( options.duration, options.easing, callback );
+		} else {
+			element.queue(function( next ) {
+				$( this )[ method ]();
+				if ( callback ) {
+					callback.call( element[ 0 ] );
+				}
+				next();
+			});
+		}
+	};
+});
+
+})( jQuery );
+
+(function( $, undefined ) {
+
+var mouseHandled = false;
+$( document ).mouseup( function() {
+	mouseHandled = false;
+});
+
+$.widget("ui.mouse", {
+	version: "1.10.3",
+	options: {
+		cancel: "input,textarea,button,select,option",
+		distance: 1,
+		delay: 0
+	},
+	_mouseInit: function() {
+		var that = this;
+
+		this.element
+			.bind("mousedown."+this.widgetName, function(event) {
+				return that._mouseDown(event);
+			})
+			.bind("click."+this.widgetName, function(event) {
+				if (true === $.data(event.target, that.widgetName + ".preventClickEvent")) {
+					$.removeData(event.target, that.widgetName + ".preventClickEvent");
+					event.stopImmediatePropagation();
+					return false;
+				}
+			});
+
+		this.started = false;
+	},
+
+	// TODO: make sure destroying one instance of mouse doesn't mess with
+	// other instances of mouse
+	_mouseDestroy: function() {
+		this.element.unbind("."+this.widgetName);
+		if ( this._mouseMoveDelegate ) {
+			$(document)
+				.unbind("mousemove."+this.widgetName, this._mouseMoveDelegate)
+				.unbind("mouseup."+this.widgetName, this._mouseUpDelegate);
+		}
+	},
+
+	_mouseDown: function(event) {
+		// don't let more than one widget handle mouseStart
+		if( mouseHandled ) { return; }
+
+		// we may have missed mouseup (out of window)
+		(this._mouseStarted && this._mouseUp(event));
+
+		this._mouseDownEvent = event;
+
+		var that = this,
+			btnIsLeft = (event.which === 1),
+			// event.target.nodeName works around a bug in IE 8 with
+			// disabled inputs (#7620)
+			elIsCancel = (typeof this.options.cancel === "string" && event.target.nodeName ? $(event.target).closest(this.options.cancel).length : false);
+		if (!btnIsLeft || elIsCancel || !this._mouseCapture(event)) {
+			return true;
+		}
+
+		this.mouseDelayMet = !this.options.delay;
+		if (!this.mouseDelayMet) {
+			this._mouseDelayTimer = setTimeout(function() {
+				that.mouseDelayMet = true;
+			}, this.options.delay);
+		}
+
+		if (this._mouseDistanceMet(event) && this._mouseDelayMet(event)) {
+			this._mouseStarted = (this._mouseStart(event) !== false);
+			if (!this._mouseStarted) {
+				event.preventDefault();
+				return true;
+			}
+		}
+
+		// Click event may never have fired (Gecko & Opera)
+		if (true === $.data(event.target, this.widgetName + ".preventClickEvent")) {
+			$.removeData(event.target, this.widgetName + ".preventClickEvent");
+		}
+
+		// these delegates are required to keep context
+		this._mouseMoveDelegate = function(event) {
+			return that._mouseMove(event);
+		};
+		this._mouseUpDelegate = function(event) {
+			return that._mouseUp(event);
+		};
+		$(document)
+			.bind("mousemove."+this.widgetName, this._mouseMoveDelegate)
+			.bind("mouseup."+this.widgetName, this._mouseUpDelegate);
+
+		event.preventDefault();
+
+		mouseHandled = true;
+		return true;
+	},
+
+	_mouseMove: function(event) {
+		// IE mouseup check - mouseup happened when mouse was out of window
+		if ($.ui.ie && ( !document.documentMode || document.documentMode < 9 ) && !event.button) {
+			return this._mouseUp(event);
+		}
+
+		if (this._mouseStarted) {
+			this._mouseDrag(event);
+			return event.preventDefault();
+		}
+
+		if (this._mouseDistanceMet(event) && this._mouseDelayMet(event)) {
+			this._mouseStarted =
+				(this._mouseStart(this._mouseDownEvent, event) !== false);
+			(this._mouseStarted ? this._mouseDrag(event) : this._mouseUp(event));
+		}
+
+		return !this._mouseStarted;
+	},
+
+	_mouseUp: function(event) {
+		$(document)
+			.unbind("mousemove."+this.widgetName, this._mouseMoveDelegate)
+			.unbind("mouseup."+this.widgetName, this._mouseUpDelegate);
+
+		if (this._mouseStarted) {
+			this._mouseStarted = false;
+
+			if (event.target === this._mouseDownEvent.target) {
+				$.data(event.target, this.widgetName + ".preventClickEvent", true);
+			}
+
+			this._mouseStop(event);
+		}
+
+		return false;
+	},
+
+	_mouseDistanceMet: function(event) {
+		return (Math.max(
+				Math.abs(this._mouseDownEvent.pageX - event.pageX),
+				Math.abs(this._mouseDownEvent.pageY - event.pageY)
+			) >= this.options.distance
+		);
+	},
+
+	_mouseDelayMet: function(/* event */) {
+		return this.mouseDelayMet;
+	},
+
+	// These are placeholder methods, to be overriden by extending plugin
+	_mouseStart: function(/* event */) {},
+	_mouseDrag: function(/* event */) {},
+	_mouseStop: function(/* event */) {},
+	_mouseCapture: function(/* event */) { return true; }
+});
+
+})(jQuery);
+
+(function( $, undefined ) {
+
+$.widget("ui.draggable", $.ui.mouse, {
+	version: "1.10.3",
+	widgetEventPrefix: "drag",
+	options: {
+		addClasses: true,
+		appendTo: "parent",
+		axis: false,
+		connectToSortable: false,
+		containment: false,
+		cursor: "auto",
+		cursorAt: false,
+		grid: false,
+		handle: false,
+		helper: "original",
+		iframeFix: false,
+		opacity: false,
+		refreshPositions: false,
+		revert: false,
+		revertDuration: 500,
+		scope: "default",
+		scroll: true,
+		scrollSensitivity: 20,
+		scrollSpeed: 20,
+		snap: false,
+		snapMode: "both",
+		snapTolerance: 20,
+		stack: false,
+		zIndex: false,
+
+		// callbacks
+		drag: null,
+		start: null,
+		stop: null
+	},
+	_create: function() {
+
+		if (this.options.helper === "original" && !(/^(?:r|a|f)/).test(this.element.css("position"))) {
+			this.element[0].style.position = "relative";
+		}
+		if (this.options.addClasses){
+			this.element.addClass("ui-draggable");
+		}
+		if (this.options.disabled){
+			this.element.addClass("ui-draggable-disabled");
+		}
+
+		this._mouseInit();
+
+	},
+
+	_destroy: function() {
+		this.element.removeClass( "ui-draggable ui-draggable-dragging ui-draggable-disabled" );
+		this._mouseDestroy();
+	},
+
+	_mouseCapture: function(event) {
+
+		var o = this.options;
+
+		// among others, prevent a drag on a resizable-handle
+		if (this.helper || o.disabled || $(event.target).closest(".ui-resizable-handle").length > 0) {
+			return false;
+		}
+
+		//Quit if we're not on a valid handle
+		this.handle = this._getHandle(event);
+		if (!this.handle) {
+			return false;
+		}
+
+		$(o.iframeFix === true ? "iframe" : o.iframeFix).each(function() {
+			$("<div class='ui-draggable-iframeFix' style='background: #fff;'></div>")
+			.css({
+				width: this.offsetWidth+"px", height: this.offsetHeight+"px",
+				position: "absolute", opacity: "0.001", zIndex: 1000
+			})
+			.css($(this).offset())
+			.appendTo("body");
+		});
+
+		return true;
+
+	},
+
+	_mouseStart: function(event) {
+
+		var o = this.options;
+
+		//Create and append the visible helper
+		this.helper = this._createHelper(event);
+
+		this.helper.addClass("ui-draggable-dragging");
+
+		//Cache the helper size
+		this._cacheHelperProportions();
+
+		//If ddmanager is used for droppables, set the global draggable
+		if($.ui.ddmanager) {
+			$.ui.ddmanager.current = this;
+		}
+
+		/*
+		 * - Position generation -
+		 * This block generates everything position related - it's the core of draggables.
+		 */
+
+		//Cache the margins of the original element
+		this._cacheMargins();
+
+		//Store the helper's css position
+		this.cssPosition = this.helper.css( "position" );
+		this.scrollParent = this.helper.scrollParent();
+		this.offsetParent = this.helper.offsetParent();
+		this.offsetParentCssPosition = this.offsetParent.css( "position" );
+
+		//The element's absolute position on the page minus margins
+		this.offset = this.positionAbs = this.element.offset();
+		this.offset = {
+			top: this.offset.top - this.margins.top,
+			left: this.offset.left - this.margins.left
+		};
+
+		//Reset scroll cache
+		this.offset.scroll = false;
+
+		$.extend(this.offset, {
+			click: { //Where the click happened, relative to the element
+				left: event.pageX - this.offset.left,
+				top: event.pageY - this.offset.top
+			},
+			parent: this._getParentOffset(),
+			relative: this._getRelativeOffset() //This is a relative to absolute position minus the actual position calculation - only used for relative positioned helper
+		});
+
+		//Generate the original position
+		this.originalPosition = this.position = this._generatePosition(event);
+		this.originalPageX = event.pageX;
+		this.originalPageY = event.pageY;
+
+		//Adjust the mouse offset relative to the helper if "cursorAt" is supplied
+		(o.cursorAt && this._adjustOffsetFromHelper(o.cursorAt));
+
+		//Set a containment if given in the options
+		this._setContainment();
+
+		//Trigger event + callbacks
+		if(this._trigger("start", event) === false) {
+			this._clear();
+			return false;
+		}
+
+		//Recache the helper size
+		this._cacheHelperProportions();
+
+		//Prepare the droppable offsets
+		if ($.ui.ddmanager && !o.dropBehaviour) {
+			$.ui.ddmanager.prepareOffsets(this, event);
+		}
+
+
+		this._mouseDrag(event, true); //Execute the drag once - this causes the helper not to be visible before getting its correct position
+
+		//If the ddmanager is used for droppables, inform the manager that dragging has started (see #5003)
+		if ( $.ui.ddmanager ) {
+			$.ui.ddmanager.dragStart(this, event);
+		}
+
+		return true;
+	},
+
+	_mouseDrag: function(event, noPropagation) {
+		// reset any necessary cached properties (see #5009)
+		if ( this.offsetParentCssPosition === "fixed" ) {
+			this.offset.parent = this._getParentOffset();
+		}
+
+		//Compute the helpers position
+		this.position = this._generatePosition(event);
+		this.positionAbs = this._convertPositionTo("absolute");
+
+		//Call plugins and callbacks and use the resulting position if something is returned
+		if (!noPropagation) {
+			var ui = this._uiHash();
+			if(this._trigger("drag", event, ui) === false) {
+				this._mouseUp({});
+				return false;
+			}
+			this.position = ui.position;
+		}
+
+		if(!this.options.axis || this.options.axis !== "y") {
+			this.helper[0].style.left = this.position.left+"px";
+		}
+		if(!this.options.axis || this.options.axis !== "x") {
+			this.helper[0].style.top = this.position.top+"px";
+		}
+		if($.ui.ddmanager) {
+			$.ui.ddmanager.drag(this, event);
+		}
+
+		return false;
+	},
+
+	_mouseStop: function(event) {
+
+		//If we are using droppables, inform the manager about the drop
+		var that = this,
+			dropped = false;
+		if ($.ui.ddmanager && !this.options.dropBehaviour) {
+			dropped = $.ui.ddmanager.drop(this, event);
+		}
+
+		//if a drop comes from outside (a sortable)
+		if(this.dropped) {
+			dropped = this.dropped;
+			this.dropped = false;
+		}
+
+		//if the original element is no longer in the DOM don't bother to continue (see #8269)
+		if ( this.options.helper === "original" && !$.contains( this.element[ 0 ].ownerDocument, this.element[ 0 ] ) ) {
+			return false;
+		}
+
+		if((this.options.revert === "invalid" && !dropped) || (this.options.revert === "valid" && dropped) || this.options.revert === true || ($.isFunction(this.options.revert) && this.options.revert.call(this.element, dropped))) {
+			$(this.helper).animate(this.originalPosition, parseInt(this.options.revertDuration, 10), function() {
+				if(that._trigger("stop", event) !== false) {
+					that._clear();
+				}
+			});
+		} else {
+			if(this._trigger("stop", event) !== false) {
+				this._clear();
+			}
+		}
+
+		return false;
+	},
+
+	_mouseUp: function(event) {
+		//Remove frame helpers
+		$("div.ui-draggable-iframeFix").each(function() {
+			this.parentNode.removeChild(this);
+		});
+
+		//If the ddmanager is used for droppables, inform the manager that dragging has stopped (see #5003)
+		if( $.ui.ddmanager ) {
+			$.ui.ddmanager.dragStop(this, event);
+		}
+
+		return $.ui.mouse.prototype._mouseUp.call(this, event);
+	},
+
+	cancel: function() {
+
+		if(this.helper.is(".ui-draggable-dragging")) {
+			this._mouseUp({});
+		} else {
+			this._clear();
+		}
+
+		return this;
+
+	},
+
+	_getHandle: function(event) {
+		return this.options.handle ?
+			!!$( event.target ).closest( this.element.find( this.options.handle ) ).length :
+			true;
+	},
+
+	_createHelper: function(event) {
+
+		var o = this.options,
+			helper = $.isFunction(o.helper) ? $(o.helper.apply(this.element[0], [event])) : (o.helper === "clone" ? this.element.clone().removeAttr("id") : this.element);
+
+		if(!helper.parents("body").length) {
+			helper.appendTo((o.appendTo === "parent" ? this.element[0].parentNode : o.appendTo));
+		}
+
+		if(helper[0] !== this.element[0] && !(/(fixed|absolute)/).test(helper.css("position"))) {
+			helper.css("position", "absolute");
+		}
+
+		return helper;
+
+	},
+
+	_adjustOffsetFromHelper: function(obj) {
+		if (typeof obj === "string") {
+			obj = obj.split(" ");
+		}
+		if ($.isArray(obj)) {
+			obj = {left: +obj[0], top: +obj[1] || 0};
+		}
+		if ("left" in obj) {
+			this.offset.click.left = obj.left + this.margins.left;
+		}
+		if ("right" in obj) {
+			this.offset.click.left = this.helperProportions.width - obj.right + this.margins.left;
+		}
+		if ("top" in obj) {
+			this.offset.click.top = obj.top + this.margins.top;
+		}
+		if ("bottom" in obj) {
+			this.offset.click.top = this.helperProportions.height - obj.bottom + this.margins.top;
+		}
+	},
+
+	_getParentOffset: function() {
+
+		//Get the offsetParent and cache its position
+		var po = this.offsetParent.offset();
+
+		// This is a special case where we need to modify a offset calculated on start, since the following happened:
+		// 1. The position of the helper is absolute, so it's position is calculated based on the next positioned parent
+		// 2. The actual offset parent is a child of the scroll parent, and the scroll parent isn't the document, which means that
+		//    the scroll is included in the initial calculation of the offset of the parent, and never recalculated upon drag
+		if(this.cssPosition === "absolute" && this.scrollParent[0] !== document && $.contains(this.scrollParent[0], this.offsetParent[0])) {
+			po.left += this.scrollParent.scrollLeft();
+			po.top += this.scrollParent.scrollTop();
+		}
+
+		//This needs to be actually done for all browsers, since pageX/pageY includes this information
+		//Ugly IE fix
+		if((this.offsetParent[0] === document.body) ||
+			(this.offsetParent[0].tagName && this.offsetParent[0].tagName.toLowerCase() === "html" && $.ui.ie)) {
+			po = { top: 0, left: 0 };
+		}
+
+		return {
+			top: po.top + (parseInt(this.offsetParent.css("borderTopWidth"),10) || 0),
+			left: po.left + (parseInt(this.offsetParent.css("borderLeftWidth"),10) || 0)
+		};
+
+	},
+
+	_getRelativeOffset: function() {
+
+		if(this.cssPosition === "relative") {
+			var p = this.element.position();
+			return {
+				top: p.top - (parseInt(this.helper.css("top"),10) || 0) + this.scrollParent.scrollTop(),
+				left: p.left - (parseInt(this.helper.css("left"),10) || 0) + this.scrollParent.scrollLeft()
+			};
+		} else {
+			return { top: 0, left: 0 };
+		}
+
+	},
+
+	_cacheMargins: function() {
+		this.margins = {
+			left: (parseInt(this.element.css("marginLeft"),10) || 0),
+			top: (parseInt(this.element.css("marginTop"),10) || 0),
+			right: (parseInt(this.element.css("marginRight"),10) || 0),
+			bottom: (parseInt(this.element.css("marginBottom"),10) || 0)
+		};
+	},
+
+	_cacheHelperProportions: function() {
+		this.helperProportions = {
+			width: this.helper.outerWidth(),
+			height: this.helper.outerHeight()
+		};
+	},
+
+	_setContainment: function() {
+
+		var over, c, ce,
+			o = this.options;
+
+		if ( !o.containment ) {
+			this.containment = null;
+			return;
+		}
+
+		if ( o.containment === "window" ) {
+			this.containment = [
+				$( window ).scrollLeft() - this.offset.relative.left - this.offset.parent.left,
+				$( window ).scrollTop() - this.offset.relative.top - this.offset.parent.top,
+				$( window ).scrollLeft() + $( window ).width() - this.helperProportions.width - this.margins.left,
+				$( window ).scrollTop() + ( $( window ).height() || document.body.parentNode.scrollHeight ) - this.helperProportions.height - this.margins.top
+			];
+			return;
+		}
+
+		if ( o.containment === "document") {
+			this.containment = [
+				0,
+				0,
+				$( document ).width() - this.helperProportions.width - this.margins.left,
+				( $( document ).height() || document.body.parentNode.scrollHeight ) - this.helperProportions.height - this.margins.top
+			];
+			return;
+		}
+
+		if ( o.containment.constructor === Array ) {
+			this.containment = o.containment;
+			return;
+		}
+
+		if ( o.containment === "parent" ) {
+			o.containment = this.helper[ 0 ].parentNode;
+		}
+
+		c = $( o.containment );
+		ce = c[ 0 ];
+
+		if( !ce ) {
+			return;
+		}
+
+		over = c.css( "overflow" ) !== "hidden";
+
+		this.containment = [
+			( parseInt( c.css( "borderLeftWidth" ), 10 ) || 0 ) + ( parseInt( c.css( "paddingLeft" ), 10 ) || 0 ),
+			( parseInt( c.css( "borderTopWidth" ), 10 ) || 0 ) + ( parseInt( c.css( "paddingTop" ), 10 ) || 0 ) ,
+			( over ? Math.max( ce.scrollWidth, ce.offsetWidth ) : ce.offsetWidth ) - ( parseInt( c.css( "borderRightWidth" ), 10 ) || 0 ) - ( parseInt( c.css( "paddingRight" ), 10 ) || 0 ) - this.helperProportions.width - this.margins.left - this.margins.right,
+			( over ? Math.max( ce.scrollHeight, ce.offsetHeight ) : ce.offsetHeight ) - ( parseInt( c.css( "borderBottomWidth" ), 10 ) || 0 ) - ( parseInt( c.css( "paddingBottom" ), 10 ) || 0 ) - this.helperProportions.height - this.margins.top  - this.margins.bottom
+		];
+		this.relative_container = c;
+	},
+
+	_convertPositionTo: function(d, pos) {
+
+		if(!pos) {
+			pos = this.position;
+		}
+
+		var mod = d === "absolute" ? 1 : -1,
+			scroll = this.cssPosition === "absolute" && !( this.scrollParent[ 0 ] !== document && $.contains( this.scrollParent[ 0 ], this.offsetParent[ 0 ] ) ) ? this.offsetParent : this.scrollParent;
+
+		//Cache the scroll
+		if (!this.offset.scroll) {
+			this.offset.scroll = {top : scroll.scrollTop(), left : scroll.scrollLeft()};
+		}
+
+		return {
+			top: (
+				pos.top	+																// The absolute mouse position
+				this.offset.relative.top * mod +										// Only for relative positioned nodes: Relative offset from element to offset parent
+				this.offset.parent.top * mod -										// The offsetParent's offset without borders (offset + border)
+				( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollTop() : this.offset.scroll.top ) * mod )
+			),
+			left: (
+				pos.left +																// The absolute mouse position
+				this.offset.relative.left * mod +										// Only for relative positioned nodes: Relative offset from element to offset parent
+				this.offset.parent.left * mod	-										// The offsetParent's offset without borders (offset + border)
+				( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollLeft() : this.offset.scroll.left ) * mod )
+			)
+		};
+
+	},
+
+	_generatePosition: function(event) {
+
+		var containment, co, top, left,
+			o = this.options,
+			scroll = this.cssPosition === "absolute" && !( this.scrollParent[ 0 ] !== document && $.contains( this.scrollParent[ 0 ], this.offsetParent[ 0 ] ) ) ? this.offsetParent : this.scrollParent,
+			pageX = event.pageX,
+			pageY = event.pageY;
+
+		//Cache the scroll
+		if (!this.offset.scroll) {
+			this.offset.scroll = {top : scroll.scrollTop(), left : scroll.scrollLeft()};
+		}
+
+		/*
+		 * - Position constraining -
+		 * Constrain the position to a mix of grid, containment.
+		 */
+
+		// If we are not dragging yet, we won't check for options
+		if ( this.originalPosition ) {
+			if ( this.containment ) {
+				if ( this.relative_container ){
+					co = this.relative_container.offset();
+					containment = [
+						this.containment[ 0 ] + co.left,
+						this.containment[ 1 ] + co.top,
+						this.containment[ 2 ] + co.left,
+						this.containment[ 3 ] + co.top
+					];
+				}
+				else {
+					containment = this.containment;
+				}
+
+				if(event.pageX - this.offset.click.left < containment[0]) {
+					pageX = containment[0] + this.offset.click.left;
+				}
+				if(event.pageY - this.offset.click.top < containment[1]) {
+					pageY = containment[1] + this.offset.click.top;
+				}
+				if(event.pageX - this.offset.click.left > containment[2]) {
+					pageX = containment[2] + this.offset.click.left;
+				}
+				if(event.pageY - this.offset.click.top > containment[3]) {
+					pageY = containment[3] + this.offset.click.top;
+				}
+			}
+
+			if(o.grid) {
+				//Check for grid elements set to 0 to prevent divide by 0 error causing invalid argument errors in IE (see ticket #6950)
+				top = o.grid[1] ? this.originalPageY + Math.round((pageY - this.originalPageY) / o.grid[1]) * o.grid[1] : this.originalPageY;
+				pageY = containment ? ((top - this.offset.click.top >= containment[1] || top - this.offset.click.top > containment[3]) ? top : ((top - this.offset.click.top >= containment[1]) ? top - o.grid[1] : top + o.grid[1])) : top;
+
+				left = o.grid[0] ? this.originalPageX + Math.round((pageX - this.originalPageX) / o.grid[0]) * o.grid[0] : this.originalPageX;
+				pageX = containment ? ((left - this.offset.click.left >= containment[0] || left - this.offset.click.left > containment[2]) ? left : ((left - this.offset.click.left >= containment[0]) ? left - o.grid[0] : left + o.grid[0])) : left;
+			}
+
+		}
+
+		return {
+			top: (
+				pageY -																	// The absolute mouse position
+				this.offset.click.top	-												// Click offset (relative to the element)
+				this.offset.relative.top -												// Only for relative positioned nodes: Relative offset from element to offset parent
+				this.offset.parent.top +												// The offsetParent's offset without borders (offset + border)
+				( this.cssPosition === "fixed" ? -this.scrollParent.scrollTop() : this.offset.scroll.top )
+			),
+			left: (
+				pageX -																	// The absolute mouse position
+				this.offset.click.left -												// Click offset (relative to the element)
+				this.offset.relative.left -												// Only for relative positioned nodes: Relative offset from element to offset parent
+				this.offset.parent.left +												// The offsetParent's offset without borders (offset + border)
+				( this.cssPosition === "fixed" ? -this.scrollParent.scrollLeft() : this.offset.scroll.left )
+			)
+		};
+
+	},
+
+	_clear: function() {
+		this.helper.removeClass("ui-draggable-dragging");
+		if(this.helper[0] !== this.element[0] && !this.cancelHelperRemoval) {
+			this.helper.remove();
+		}
+		this.helper = null;
+		this.cancelHelperRemoval = false;
+	},
+
+	// From now on bulk stuff - mainly helpers
+
+	_trigger: function(type, event, ui) {
+		ui = ui || this._uiHash();
+		$.ui.plugin.call(this, type, [event, ui]);
+		//The absolute position has to be recalculated after plugins
+		if(type === "drag") {
+			this.positionAbs = this._convertPositionTo("absolute");
+		}
+		return $.Widget.prototype._trigger.call(this, type, event, ui);
+	},
+
+	plugins: {},
+
+	_uiHash: function() {
+		return {
+			helper: this.helper,
+			position: this.position,
+			originalPosition: this.originalPosition,
+			offset: this.positionAbs
+		};
+	}
+
+});
+
+$.ui.plugin.add("draggable", "connectToSortable", {
+	start: function(event, ui) {
+
+		var inst = $(this).data("ui-draggable"), o = inst.options,
+			uiSortable = $.extend({}, ui, { item: inst.element });
+		inst.sortables = [];
+		$(o.connectToSortable).each(function() {
+			var sortable = $.data(this, "ui-sortable");
+			if (sortable && !sortable.options.disabled) {
+				inst.sortables.push({
+					instance: sortable,
+					shouldRevert: sortable.options.revert
+				});
+				sortable.refreshPositions();	// Call the sortable's refreshPositions at drag start to refresh the containerCache since the sortable container cache is used in drag and needs to be up to date (this will ensure it's initialised as well as being kept in step with any changes that might have happened on the page).
+				sortable._trigger("activate", event, uiSortable);
+			}
+		});
+
+	},
+	stop: function(event, ui) {
+
+		//If we are still over the sortable, we fake the stop event of the sortable, but also remove helper
+		var inst = $(this).data("ui-draggable"),
+			uiSortable = $.extend({}, ui, { item: inst.element });
+
+		$.each(inst.sortables, function() {
+			if(this.instance.isOver) {
+
+				this.instance.isOver = 0;
+
+				inst.cancelHelperRemoval = true; //Don't remove the helper in the draggable instance
+				this.instance.cancelHelperRemoval = false; //Remove it in the sortable instance (so sortable plugins like revert still work)
+
+				//The sortable revert is supported, and we have to set a temporary dropped variable on the draggable to support revert: "valid/invalid"
+				if(this.shouldRevert) {
+					this.instance.options.revert = this.shouldRevert;
+				}
+
+				//Trigger the stop of the sortable
+				this.instance._mouseStop(event);
+
+				this.instance.options.helper = this.instance.options._helper;
+
+				//If the helper has been the original item, restore properties in the sortable
+				if(inst.options.helper === "original") {
+					this.instance.currentItem.css({ top: "auto", left: "auto" });
+				}
+
+			} else {
+				this.instance.cancelHelperRemoval = false; //Remove the helper in the sortable instance
+				this.instance._trigger("deactivate", event, uiSortable);
+			}
+
+		});
+
+	},
+	drag: function(event, ui) {
+
+		var inst = $(this).data("ui-draggable"), that = this;
+
+		$.each(inst.sortables, function() {
+
+			var innermostIntersecting = false,
+				thisSortable = this;
+
+			//Copy over some variables to allow calling the sortable's native _intersectsWith
+			this.instance.positionAbs = inst.positionAbs;
+			this.instance.helperProportions = inst.helperProportions;
+			this.instance.offset.click = inst.offset.click;
+
+			if(this.instance._intersectsWith(this.instance.containerCache)) {
+				innermostIntersecting = true;
+				$.each(inst.sortables, function () {
+					this.instance.positionAbs = inst.positionAbs;
+					this.instance.helperProportions = inst.helperProportions;
+					this.instance.offset.click = inst.offset.click;
+					if (this !== thisSortable &&
+						this.instance._intersectsWith(this.instance.containerCache) &&
+						$.contains(thisSortable.instance.element[0], this.instance.element[0])
+					) {
+						innermostIntersecting = false;
+					}
+					return innermostIntersecting;
+				});
+			}
+
+
+			if(innermostIntersecting) {
+				//If it intersects, we use a little isOver variable and set it once, so our move-in stuff gets fired only once
+				if(!this.instance.isOver) {
+
+					this.instance.isOver = 1;
+					//Now we fake the start of dragging for the sortable instance,
+					//by cloning the list group item, appending it to the sortable and using it as inst.currentItem
+					//We can then fire the start event of the sortable with our passed browser event, and our own helper (so it doesn't create a new one)
+					this.instance.currentItem = $(that).clone().removeAttr("id").appendTo(this.instance.element).data("ui-sortable-item", true);
+					this.instance.options._helper = this.instance.options.helper; //Store helper option to later restore it
+					this.instance.options.helper = function() { return ui.helper[0]; };
+
+					event.target = this.instance.currentItem[0];
+					this.instance._mouseCapture(event, true);
+					this.instance._mouseStart(event, true, true);
+
+					//Because the browser event is way off the new appended portlet, we modify a couple of variables to reflect the changes
+					this.instance.offset.click.top = inst.offset.click.top;
+					this.instance.offset.click.left = inst.offset.click.left;
+					this.instance.offset.parent.left -= inst.offset.parent.left - this.instance.offset.parent.left;
+					this.instance.offset.parent.top -= inst.offset.parent.top - this.instance.offset.parent.top;
+
+					inst._trigger("toSortable", event);
+					inst.dropped = this.instance.element; //draggable revert needs that
+					//hack so receive/update callbacks work (mostly)
+					inst.currentItem = inst.element;
+					this.instance.fromOutside = inst;
+
+				}
+
+				//Provided we did all the previous steps, we can fire the drag event of the sortable on every draggable drag, when it intersects with the sortable
+				if(this.instance.currentItem) {
+					this.instance._mouseDrag(event);
+				}
+
+			} else {
+
+				//If it doesn't intersect with the sortable, and it intersected before,
+				//we fake the drag stop of the sortable, but make sure it doesn't remove the helper by using cancelHelperRemoval
+				if(this.instance.isOver) {
+
+					this.instance.isOver = 0;
+					this.instance.cancelHelperRemoval = true;
+
+					//Prevent reverting on this forced stop
+					this.instance.options.revert = false;
+
+					// The out event needs to be triggered independently
+					this.instance._trigger("out", event, this.instance._uiHash(this.instance));
+
+					this.instance._mouseStop(event, true);
+					this.instance.options.helper = this.instance.options._helper;
+
+					//Now we remove our currentItem, the list group clone again, and the placeholder, and animate the helper back to it's original size
+					this.instance.currentItem.remove();
+					if(this.instance.placeholder) {
+						this.instance.placeholder.remove();
+					}
+
+					inst._trigger("fromSortable", event);
+					inst.dropped = false; //draggable revert needs that
+				}
+
+			}
+
+		});
+
+	}
+});
+
+$.ui.plugin.add("draggable", "cursor", {
+	start: function() {
+		var t = $("body"), o = $(this).data("ui-draggable").options;
+		if (t.css("cursor")) {
+			o._cursor = t.css("cursor");
+		}
+		t.css("cursor", o.cursor);
+	},
+	stop: function() {
+		var o = $(this).data("ui-draggable").options;
+		if (o._cursor) {
+			$("body").css("cursor", o._cursor);
+		}
+	}
+});
+
+$.ui.plugin.add("draggable", "opacity", {
+	start: function(event, ui) {
+		var t = $(ui.helper), o = $(this).data("ui-draggable").options;
+		if(t.css("opacity")) {
+			o._opacity = t.css("opacity");
+		}
+		t.css("opacity", o.opacity);
+	},
+	stop: function(event, ui) {
+		var o = $(this).data("ui-draggable").options;
+		if(o._opacity) {
+			$(ui.helper).css("opacity", o._opacity);
+		}
+	}
+});
+
+$.ui.plugin.add("draggable", "scroll", {
+	start: function() {
+		var i = $(this).data("ui-draggable");
+		if(i.scrollParent[0] !== document && i.scrollParent[0].tagName !== "HTML") {
+			i.overflowOffset = i.scrollParent.offset();
+		}
+	},
+	drag: function( event ) {
+
+		var i = $(this).data("ui-draggable"), o = i.options, scrolled = false;
+
+		if(i.scrollParent[0] !== document && i.scrollParent[0].tagName !== "HTML") {
+
+			if(!o.axis || o.axis !== "x") {
+				if((i.overflowOffset.top + i.scrollParent[0].offsetHeight) - event.pageY < o.scrollSensitivity) {
+					i.scrollParent[0].scrollTop = scrolled = i.scrollParent[0].scrollTop + o.scrollSpeed;
+				} else if(event.pageY - i.overflowOffset.top < o.scrollSensitivity) {
+					i.scrollParent[0].scrollTop = scrolled = i.scrollParent[0].scrollTop - o.scrollSpeed;
+				}
+			}
+
+			if(!o.axis || o.axis !== "y") {
+				if((i.overflowOffset.left + i.scrollParent[0].offsetWidth) - event.pageX < o.scrollSensitivity) {
+					i.scrollParent[0].scrollLeft = scrolled = i.scrollParent[0].scrollLeft + o.scrollSpeed;
+				} else if(event.pageX - i.overflowOffset.left < o.scrollSensitivity) {
+					i.scrollParent[0].scrollLeft = scrolled = i.scrollParent[0].scrollLeft - o.scrollSpeed;
+				}
+			}
+
+		} else {
+
+			if(!o.axis || o.axis !== "x") {
+				if(event.pageY - $(document).scrollTop() < o.scrollSensitivity) {
+					scrolled = $(document).scrollTop($(document).scrollTop() - o.scrollSpeed);
+				} else if($(window).height() - (event.pageY - $(document).scrollTop()) < o.scrollSensitivity) {
+					scrolled = $(document).scrollTop($(document).scrollTop() + o.scrollSpeed);
+				}
+			}
+
+			if(!o.axis || o.axis !== "y") {
+				if(event.pageX - $(document).scrollLeft() < o.scrollSensitivity) {
+					scrolled = $(document).scrollLeft($(document).scrollLeft() - o.scrollSpeed);
+				} else if($(window).width() - (event.pageX - $(document).scrollLeft()) < o.scrollSensitivity) {
+					scrolled = $(document).scrollLeft($(document).scrollLeft() + o.scrollSpeed);
+				}
+			}
+
+		}
+
+		if(scrolled !== false && $.ui.ddmanager && !o.dropBehaviour) {
+			$.ui.ddmanager.prepareOffsets(i, event);
+		}
+
+	}
+});
+
+$.ui.plugin.add("draggable", "snap", {
+	start: function() {
+
+		var i = $(this).data("ui-draggable"),
+			o = i.options;
+
+		i.snapElements = [];
+
+		$(o.snap.constructor !== String ? ( o.snap.items || ":data(ui-draggable)" ) : o.snap).each(function() {
+			var $t = $(this),
+				$o = $t.offset();
+			if(this !== i.element[0]) {
+				i.snapElements.push({
+					item: this,
+					width: $t.outerWidth(), height: $t.outerHeight(),
+					top: $o.top, left: $o.left
+				});
+			}
+		});
+
+	},
+	drag: function(event, ui) {
+
+		var ts, bs, ls, rs, l, r, t, b, i, first,
+			inst = $(this).data("ui-draggable"),
+			o = inst.options,
+			d = o.snapTolerance,
+			x1 = ui.offset.left, x2 = x1 + inst.helperProportions.width,
+			y1 = ui.offset.top, y2 = y1 + inst.helperProportions.height;
+
+		for (i = inst.snapElements.length - 1; i >= 0; i--){
+
+			l = inst.snapElements[i].left;
+			r = l + inst.snapElements[i].width;
+			t = inst.snapElements[i].top;
+			b = t + inst.snapElements[i].height;
+
+			if ( x2 < l - d || x1 > r + d || y2 < t - d || y1 > b + d || !$.contains( inst.snapElements[ i ].item.ownerDocument, inst.snapElements[ i ].item ) ) {
+				if(inst.snapElements[i].snapping) {
+					(inst.options.snap.release && inst.options.snap.release.call(inst.element, event, $.extend(inst._uiHash(), { snapItem: inst.snapElements[i].item })));
+				}
+				inst.snapElements[i].snapping = false;
+				continue;
+			}
+
+			if(o.snapMode !== "inner") {
+				ts = Math.abs(t - y2) <= d;
+				bs = Math.abs(b - y1) <= d;
+				ls = Math.abs(l - x2) <= d;
+				rs = Math.abs(r - x1) <= d;
+				if(ts) {
+					ui.position.top = inst._convertPositionTo("relative", { top: t - inst.helperProportions.height, left: 0 }).top - inst.margins.top;
+				}
+				if(bs) {
+					ui.position.top = inst._convertPositionTo("relative", { top: b, left: 0 }).top - inst.margins.top;
+				}
+				if(ls) {
+					ui.position.left = inst._convertPositionTo("relative", { top: 0, left: l - inst.helperProportions.width }).left - inst.margins.left;
+				}
+				if(rs) {
+					ui.position.left = inst._convertPositionTo("relative", { top: 0, left: r }).left - inst.margins.left;
+				}
+			}
+
+			first = (ts || bs || ls || rs);
+
+			if(o.snapMode !== "outer") {
+				ts = Math.abs(t - y1) <= d;
+				bs = Math.abs(b - y2) <= d;
+				ls = Math.abs(l - x1) <= d;
+				rs = Math.abs(r - x2) <= d;
+				if(ts) {
+					ui.position.top = inst._convertPositionTo("relative", { top: t, left: 0 }).top - inst.margins.top;
+				}
+				if(bs) {
+					ui.position.top = inst._convertPositionTo("relative", { top: b - inst.helperProportions.height, left: 0 }).top - inst.margins.top;
+				}
+				if(ls) {
+					ui.position.left = inst._convertPositionTo("relative", { top: 0, left: l }).left - inst.margins.left;
+				}
+				if(rs) {
+					ui.position.left = inst._convertPositionTo("relative", { top: 0, left: r - inst.helperProportions.width }).left - inst.margins.left;
+				}
+			}
+
+			if(!inst.snapElements[i].snapping && (ts || bs || ls || rs || first)) {
+				(inst.options.snap.snap && inst.options.snap.snap.call(inst.element, event, $.extend(inst._uiHash(), { snapItem: inst.snapElements[i].item })));
+			}
+			inst.snapElements[i].snapping = (ts || bs || ls || rs || first);
+
+		}
+
+	}
+});
+
+$.ui.plugin.add("draggable", "stack", {
+	start: function() {
+		var min,
+			o = this.data("ui-draggable").options,
+			group = $.makeArray($(o.stack)).sort(function(a,b) {
+				return (parseInt($(a).css("zIndex"),10) || 0) - (parseInt($(b).css("zIndex"),10) || 0);
+			});
+
+		if (!group.length) { return; }
+
+		min = parseInt($(group[0]).css("zIndex"), 10) || 0;
+		$(group).each(function(i) {
+			$(this).css("zIndex", min + i);
+		});
+		this.css("zIndex", (min + group.length));
+	}
+});
+
+$.ui.plugin.add("draggable", "zIndex", {
+	start: function(event, ui) {
+		var t = $(ui.helper), o = $(this).data("ui-draggable").options;
+		if(t.css("zIndex")) {
+			o._zIndex = t.css("zIndex");
+		}
+		t.css("zIndex", o.zIndex);
+	},
+	stop: function(event, ui) {
+		var o = $(this).data("ui-draggable").options;
+		if(o._zIndex) {
+			$(ui.helper).css("zIndex", o._zIndex);
+		}
+	}
+});
+
+})(jQuery);
+
+(function( $, undefined ) {
+
+function isOverAxis( x, reference, size ) {
+	return ( x > reference ) && ( x < ( reference + size ) );
+}
+
+$.widget("ui.droppable", {
+	version: "1.10.3",
+	widgetEventPrefix: "drop",
+	options: {
+		accept: "*",
+		activeClass: false,
+		addClasses: true,
+		greedy: false,
+		hoverClass: false,
+		scope: "default",
+		tolerance: "intersect",
+
+		// callbacks
+		activate: null,
+		deactivate: null,
+		drop: null,
+		out: null,
+		over: null
+	},
+	_create: function() {
+
+		var o = this.options,
+			accept = o.accept;
+
+		this.isover = false;
+		this.isout = true;
+
+		this.accept = $.isFunction(accept) ? accept : function(d) {
+			return d.is(accept);
+		};
+
+		//Store the droppable's proportions
+		this.proportions = { width: this.element[0].offsetWidth, height: this.element[0].offsetHeight };
+
+		// Add the reference and positions to the manager
+		$.ui.ddmanager.droppables[o.scope] = $.ui.ddmanager.droppables[o.scope] || [];
+		$.ui.ddmanager.droppables[o.scope].push(this);
+
+		(o.addClasses && this.element.addClass("ui-droppable"));
+
+	},
+
+	_destroy: function() {
+		var i = 0,
+			drop = $.ui.ddmanager.droppables[this.options.scope];
+
+		for ( ; i < drop.length; i++ ) {
+			if ( drop[i] === this ) {
+				drop.splice(i, 1);
+			}
+		}
+
+		this.element.removeClass("ui-droppable ui-droppable-disabled");
+	},
+
+	_setOption: function(key, value) {
+
+		if(key === "accept") {
+			this.accept = $.isFunction(value) ? value : function(d) {
+				return d.is(value);
+			};
+		}
+		$.Widget.prototype._setOption.apply(this, arguments);
+	},
+
+	_activate: function(event) {
+		var draggable = $.ui.ddmanager.current;
+		if(this.options.activeClass) {
+			this.element.addClass(this.options.activeClass);
+		}
+		if(draggable){
+			this._trigger("activate", event, this.ui(draggable));
+		}
+	},
+
+	_deactivate: function(event) {
+		var draggable = $.ui.ddmanager.current;
+		if(this.options.activeClass) {
+			this.element.removeClass(this.options.activeClass);
+		}
+		if(draggable){
+			this._trigger("deactivate", event, this.ui(draggable));
+		}
+	},
+
+	_over: function(event) {
+
+		var draggable = $.ui.ddmanager.current;
+
+		// Bail if draggable and droppable are same element
+		if (!draggable || (draggable.currentItem || draggable.element)[0] === this.element[0]) {
+			return;
+		}
+
+		if (this.accept.call(this.element[0],(draggable.currentItem || draggable.element))) {
+			if(this.options.hoverClass) {
+				this.element.addClass(this.options.hoverClass);
+			}
+			this._trigger("over", event, this.ui(draggable));
+		}
+
+	},
+
+	_out: function(event) {
+
+		var draggable = $.ui.ddmanager.current;
+
+		// Bail if draggable and droppable are same element
+		if (!draggable || (draggable.currentItem || draggable.element)[0] === this.element[0]) {
+			return;
+		}
+
+		if (this.accept.call(this.element[0],(draggable.currentItem || draggable.element))) {
+			if(this.options.hoverClass) {
+				this.element.removeClass(this.options.hoverClass);
+			}
+			this._trigger("out", event, this.ui(draggable));
+		}
+
+	},
+
+	_drop: function(event,custom) {
+
+		var draggable = custom || $.ui.ddmanager.current,
+			childrenIntersection = false;
+
+		// Bail if draggable and droppable are same element
+		if (!draggable || (draggable.currentItem || draggable.element)[0] === this.element[0]) {
+			return false;
+		}
+
+		this.element.find(":data(ui-droppable)").not(".ui-draggable-dragging").each(function() {
+			var inst = $.data(this, "ui-droppable");
+			if(
+				inst.options.greedy &&
+				!inst.options.disabled &&
+				inst.options.scope === draggable.options.scope &&
+				inst.accept.call(inst.element[0], (draggable.currentItem || draggable.element)) &&
+				$.ui.intersect(draggable, $.extend(inst, { offset: inst.element.offset() }), inst.options.tolerance)
+			) { childrenIntersection = true; return false; }
+		});
+		if(childrenIntersection) {
+			return false;
+		}
+
+		if(this.accept.call(this.element[0],(draggable.currentItem || draggable.element))) {
+			if(this.options.activeClass) {
+				this.element.removeClass(this.options.activeClass);
+			}
+			if(this.options.hoverClass) {
+				this.element.removeClass(this.options.hoverClass);
+			}
+			this._trigger("drop", event, this.ui(draggable));
+			return this.element;
+		}
+
+		return false;
+
+	},
+
+	ui: function(c) {
+		return {
+			draggable: (c.currentItem || c.element),
+			helper: c.helper,
+			position: c.position,
+			offset: c.positionAbs
+		};
+	}
+
+});
+
+$.ui.intersect = function(draggable, droppable, toleranceMode) {
+
+	if (!droppable.offset) {
+		return false;
+	}
+
+	var draggableLeft, draggableTop,
+		x1 = (draggable.positionAbs || draggable.position.absolute).left, x2 = x1 + draggable.helperProportions.width,
+		y1 = (draggable.positionAbs || draggable.position.absolute).top, y2 = y1 + draggable.helperProportions.height,
+		l = droppable.offset.left, r = l + droppable.proportions.width,
+		t = droppable.offset.top, b = t + droppable.proportions.height;
+
+	switch (toleranceMode) {
+		case "fit":
+			return (l <= x1 && x2 <= r && t <= y1 && y2 <= b);
+		case "intersect":
+			return (l < x1 + (draggable.helperProportions.width / 2) && // Right Half
+				x2 - (draggable.helperProportions.width / 2) < r && // Left Half
+				t < y1 + (draggable.helperProportions.height / 2) && // Bottom Half
+				y2 - (draggable.helperProportions.height / 2) < b ); // Top Half
+		case "pointer":
+			draggableLeft = ((draggable.positionAbs || draggable.position.absolute).left + (draggable.clickOffset || draggable.offset.click).left);
+			draggableTop = ((draggable.positionAbs || draggable.position.absolute).top + (draggable.clickOffset || draggable.offset.click).top);
+			return isOverAxis( draggableTop, t, droppable.proportions.height ) && isOverAxis( draggableLeft, l, droppable.proportions.width );
+		case "touch":
+			return (
+				(y1 >= t && y1 <= b) ||	// Top edge touching
+				(y2 >= t && y2 <= b) ||	// Bottom edge touching
+				(y1 < t && y2 > b)		// Surrounded vertically
+			) && (
+				(x1 >= l && x1 <= r) ||	// Left edge touching
+				(x2 >= l && x2 <= r) ||	// Right edge touching
+				(x1 < l && x2 > r)		// Surrounded horizontally
+			);
+		default:
+			return false;
+		}
+
+};
+
+/*
+	This manager tracks offsets of draggables and droppables
+*/
+$.ui.ddmanager = {
+	current: null,
+	droppables: { "default": [] },
+	prepareOffsets: function(t, event) {
+
+		var i, j,
+			m = $.ui.ddmanager.droppables[t.options.scope] || [],
+			type = event ? event.type : null, // workaround for #2317
+			list = (t.currentItem || t.element).find(":data(ui-droppable)").addBack();
+
+		droppablesLoop: for (i = 0; i < m.length; i++) {
+
+			//No disabled and non-accepted
+			if(m[i].options.disabled || (t && !m[i].accept.call(m[i].element[0],(t.currentItem || t.element)))) {
+				continue;
+			}
+
+			// Filter out elements in the current dragged item
+			for (j=0; j < list.length; j++) {
+				if(list[j] === m[i].element[0]) {
+					m[i].proportions.height = 0;
+					continue droppablesLoop;
+				}
+			}
+
+			m[i].visible = m[i].element.css("display") !== "none";
+			if(!m[i].visible) {
+				continue;
+			}
+
+			//Activate the droppable if used directly from draggables
+			if(type === "mousedown") {
+				m[i]._activate.call(m[i], event);
+			}
+
+			m[i].offset = m[i].element.offset();
+			m[i].proportions = { width: m[i].element[0].offsetWidth, height: m[i].element[0].offsetHeight };
+
+		}
+
+	},
+	drop: function(draggable, event) {
+
+		var dropped = false;
+		// Create a copy of the droppables in case the list changes during the drop (#9116)
+		$.each(($.ui.ddmanager.droppables[draggable.options.scope] || []).slice(), function() {
+
+			if(!this.options) {
+				return;
+			}
+			if (!this.options.disabled && this.visible && $.ui.intersect(draggable, this, this.options.tolerance)) {
+				dropped = this._drop.call(this, event) || dropped;
+			}
+
+			if (!this.options.disabled && this.visible && this.accept.call(this.element[0],(draggable.currentItem || draggable.element))) {
+				this.isout = true;
+				this.isover = false;
+				this._deactivate.call(this, event);
+			}
+
+		});
+		return dropped;
+
+	},
+	dragStart: function( draggable, event ) {
+		//Listen for scrolling so that if the dragging causes scrolling the position of the droppables can be recalculated (see #5003)
+		draggable.element.parentsUntil( "body" ).bind( "scroll.droppable", function() {
+			if( !draggable.options.refreshPositions ) {
+				$.ui.ddmanager.prepareOffsets( draggable, event );
+			}
+		});
+	},
+	drag: function(draggable, event) {
+
+		//If you have a highly dynamic page, you might try this option. It renders positions every time you move the mouse.
+		if(draggable.options.refreshPositions) {
+			$.ui.ddmanager.prepareOffsets(draggable, event);
+		}
+
+		//Run through all droppables and check their positions based on specific tolerance options
+		$.each($.ui.ddmanager.droppables[draggable.options.scope] || [], function() {
+
+			if(this.options.disabled || this.greedyChild || !this.visible) {
+				return;
+			}
+
+			var parentInstance, scope, parent,
+				intersects = $.ui.intersect(draggable, this, this.options.tolerance),
+				c = !intersects && this.isover ? "isout" : (intersects && !this.isover ? "isover" : null);
+			if(!c) {
+				return;
+			}
+
+			if (this.options.greedy) {
+				// find droppable parents with same scope
+				scope = this.options.scope;
+				parent = this.element.parents(":data(ui-droppable)").filter(function () {
+					return $.data(this, "ui-droppable").options.scope === scope;
+				});
+
+				if (parent.length) {
+					parentInstance = $.data(parent[0], "ui-droppable");
+					parentInstance.greedyChild = (c === "isover");
+				}
+			}
+
+			// we just moved into a greedy child
+			if (parentInstance && c === "isover") {
+				parentInstance.isover = false;
+				parentInstance.isout = true;
+				parentInstance._out.call(parentInstance, event);
+			}
+
+			this[c] = true;
+			this[c === "isout" ? "isover" : "isout"] = false;
+			this[c === "isover" ? "_over" : "_out"].call(this, event);
+
+			// we just moved out of a greedy child
+			if (parentInstance && c === "isout") {
+				parentInstance.isout = false;
+				parentInstance.isover = true;
+				parentInstance._over.call(parentInstance, event);
+			}
+		});
+
+	},
+	dragStop: function( draggable, event ) {
+		draggable.element.parentsUntil( "body" ).unbind( "scroll.droppable" );
+		//Call prepareOffsets one final time since IE does not fire return scroll events when overflow was caused by drag (see #5003)
+		if( !draggable.options.refreshPositions ) {
+			$.ui.ddmanager.prepareOffsets( draggable, event );
+		}
+	}
+};
+
+})(jQuery);
+
+(function( $, undefined ) {
+
+function num(v) {
+	return parseInt(v, 10) || 0;
+}
+
+function isNumber(value) {
+	return !isNaN(parseInt(value, 10));
+}
+
+$.widget("ui.resizable", $.ui.mouse, {
+	version: "1.10.3",
+	widgetEventPrefix: "resize",
+	options: {
+		alsoResize: false,
+		animate: false,
+		animateDuration: "slow",
+		animateEasing: "swing",
+		aspectRatio: false,
+		autoHide: false,
+		containment: false,
+		ghost: false,
+		grid: false,
+		handles: "e,s,se",
+		helper: false,
+		maxHeight: null,
+		maxWidth: null,
+		minHeight: 10,
+		minWidth: 10,
+		// See #7960
+		zIndex: 90,
+
+		// callbacks
+		resize: null,
+		start: null,
+		stop: null
+	},
+	_create: function() {
+
+		var n, i, handle, axis, hname,
+			that = this,
+			o = this.options;
+		this.element.addClass("ui-resizable");
+
+		$.extend(this, {
+			_aspectRatio: !!(o.aspectRatio),
+			aspectRatio: o.aspectRatio,
+			originalElement: this.element,
+			_proportionallyResizeElements: [],
+			_helper: o.helper || o.ghost || o.animate ? o.helper || "ui-resizable-helper" : null
+		});
+
+		//Wrap the element if it cannot hold child nodes
+		if(this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)) {
+
+			//Create a wrapper element and set the wrapper to the new current internal element
+			this.element.wrap(
+				$("<div class='ui-wrapper' style='overflow: hidden;'></div>").css({
+					position: this.element.css("position"),
+					width: this.element.outerWidth(),
+					height: this.element.outerHeight(),
+					top: this.element.css("top"),
+					left: this.element.css("left")
+				})
+			);
+
+			//Overwrite the original this.element
+			this.element = this.element.parent().data(
+				"ui-resizable", this.element.data("ui-resizable")
+			);
+
+			this.elementIsWrapper = true;
+
+			//Move margins to the wrapper
+			this.element.css({ marginLeft: this.originalElement.css("marginLeft"), marginTop: this.originalElement.css("marginTop"), marginRight: this.originalElement.css("marginRight"), marginBottom: this.originalElement.css("marginBottom") });
+			this.originalElement.css({ marginLeft: 0, marginTop: 0, marginRight: 0, marginBottom: 0});
+
+			//Prevent Safari textarea resize
+			this.originalResizeStyle = this.originalElement.css("resize");
+			this.originalElement.css("resize", "none");
+
+			//Push the actual element to our proportionallyResize internal array
+			this._proportionallyResizeElements.push(this.originalElement.css({ position: "static", zoom: 1, display: "block" }));
+
+			// avoid IE jump (hard set the margin)
+			this.originalElement.css({ margin: this.originalElement.css("margin") });
+
+			// fix handlers offset
+			this._proportionallyResize();
+
+		}
+
+		this.handles = o.handles || (!$(".ui-resizable-handle", this.element).length ? "e,s,se" : { n: ".ui-resizable-n", e: ".ui-resizable-e", s: ".ui-resizable-s", w: ".ui-resizable-w", se: ".ui-resizable-se", sw: ".ui-resizable-sw", ne: ".ui-resizable-ne", nw: ".ui-resizable-nw" });
+		if(this.handles.constructor === String) {
+
+			if ( this.handles === "all") {
+				this.handles = "n,e,s,w,se,sw,ne,nw";
+			}
+
+			n = this.handles.split(",");
+			this.handles = {};
+
+			for(i = 0; i < n.length; i++) {
+
+				handle = $.trim(n[i]);
+				hname = "ui-resizable-"+handle;
+				axis = $("<div class='ui-resizable-handle " + hname + "'></div>");
+
+				// Apply zIndex to all handles - see #7960
+				axis.css({ zIndex: o.zIndex });
+
+				//TODO : What's going on here?
+				if ("se" === handle) {
+					axis.addClass("ui-icon ui-icon-gripsmall-diagonal-se");
+				}
+
+				//Insert into internal handles object and append to element
+				this.handles[handle] = ".ui-resizable-"+handle;
+				this.element.append(axis);
+			}
+
+		}
+
+		this._renderAxis = function(target) {
+
+			var i, axis, padPos, padWrapper;
+
+			target = target || this.element;
+
+			for(i in this.handles) {
+
+				if(this.handles[i].constructor === String) {
+					this.handles[i] = $(this.handles[i], this.element).show();
+				}
+
+				//Apply pad to wrapper element, needed to fix axis position (textarea, inputs, scrolls)
+				if (this.elementIsWrapper && this.originalElement[0].nodeName.match(/textarea|input|select|button/i)) {
+
+					axis = $(this.handles[i], this.element);
+
+					//Checking the correct pad and border
+					padWrapper = /sw|ne|nw|se|n|s/.test(i) ? axis.outerHeight() : axis.outerWidth();
+
+					//The padding type i have to apply...
+					padPos = [ "padding",
+						/ne|nw|n/.test(i) ? "Top" :
+						/se|sw|s/.test(i) ? "Bottom" :
+						/^e$/.test(i) ? "Right" : "Left" ].join("");
+
+					target.css(padPos, padWrapper);
+
+					this._proportionallyResize();
+
+				}
+
+				//TODO: What's that good for? There's not anything to be executed left
+				if(!$(this.handles[i]).length) {
+					continue;
+				}
+			}
+		};
+
+		//TODO: make renderAxis a prototype function
+		this._renderAxis(this.element);
+
+		this._handles = $(".ui-resizable-handle", this.element)
+			.disableSelection();
+
+		//Matching axis name
+		this._handles.mouseover(function() {
+			if (!that.resizing) {
+				if (this.className) {
+					axis = this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i);
+				}
+				//Axis, default = se
+				that.axis = axis && axis[1] ? axis[1] : "se";
+			}
+		});
+
+		//If we want to auto hide the elements
+		if (o.autoHide) {
+			this._handles.hide();
+			$(this.element)
+				.addClass("ui-resizable-autohide")
+				.mouseenter(function() {
+					if (o.disabled) {
+						return;
+					}
+					$(this).removeClass("ui-resizable-autohide");
+					that._handles.show();
+				})
+				.mouseleave(function(){
+					if (o.disabled) {
+						return;
+					}
+					if (!that.resizing) {
+						$(this).addClass("ui-resizable-autohide");
+						that._handles.hide();
+					}
+				});
+		}
+
+		//Initialize the mouse interaction
+		this._mouseInit();
+
+	},
+
+	_destroy: function() {
+
+		this._mouseDestroy();
+
+		var wrapper,
+			_destroy = function(exp) {
+				$(exp).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing")
+					.removeData("resizable").removeData("ui-resizable").unbind(".resizable").find(".ui-resizable-handle").remove();
+			};
+
+		//TODO: Unwrap at same DOM position
+		if (this.elementIsWrapper) {
+			_destroy(this.element);
+			wrapper = this.element;
+			this.originalElement.css({
+				position: wrapper.css("position"),
+				width: wrapper.outerWidth(),
+				height: wrapper.outerHeight(),
+				top: wrapper.css("top"),
+				left: wrapper.css("left")
+			}).insertAfter( wrapper );
+			wrapper.remove();
+		}
+
+		this.originalElement.css("resize", this.originalResizeStyle);
+		_destroy(this.originalElement);
+
+		return this;
+	},
+
+	_mouseCapture: function(event) {
+		var i, handle,
+			capture = false;
+
+		for (i in this.handles) {
+			handle = $(this.handles[i])[0];
+			if (handle === event.target || $.contains(handle, event.target)) {
+				capture = true;
+			}
+		}
+
+		return !this.options.disabled && capture;
+	},
+
+	_mouseStart: function(event) {
+
+		var curleft, curtop, cursor,
+			o = this.options,
+			iniPos = this.element.position(),
+			el = this.element;
+
+		this.resizing = true;
+
+		// bugfix for http://dev.jquery.com/ticket/1749
+		if ( (/absolute/).test( el.css("position") ) ) {
+			el.css({ position: "absolute", top: el.css("top"), left: el.css("left") });
+		} else if (el.is(".ui-draggable")) {
+			el.css({ position: "absolute", top: iniPos.top, left: iniPos.left });
+		}
+
+		this._renderProxy();
+
+		curleft = num(this.helper.css("left"));
+		curtop = num(this.helper.css("top"));
+
+		if (o.containment) {
+			curleft += $(o.containment).scrollLeft() || 0;
+			curtop += $(o.containment).scrollTop() || 0;
+		}
+
+		//Store needed variables
+		this.offset = this.helper.offset();
+		this.position = { left: curleft, top: curtop };
+		this.size = this._helper ? { width: el.outerWidth(), height: el.outerHeight() } : { width: el.width(), height: el.height() };
+		this.originalSize = this._helper ? { width: el.outerWidth(), height: el.outerHeight() } : { width: el.width(), height: el.height() };
+		this.originalPosition = { left: curleft, top: curtop };
+		this.sizeDiff = { width: el.outerWidth() - el.width(), height: el.outerHeight() - el.height() };
+		this.originalMousePosition = { left: event.pageX, top: event.pageY };
+
+		//Aspect Ratio
+		this.aspectRatio = (typeof o.aspectRatio === "number") ? o.aspectRatio : ((this.originalSize.width / this.originalSize.height) || 1);
+
+		cursor = $(".ui-resizable-" + this.axis).css("cursor");
+		$("body").css("cursor", cursor === "auto" ? this.axis + "-resize" : cursor);
+
+		el.addClass("ui-resizable-resizing");
+		this._propagate("start", event);
+		return true;
+	},
+
+	_mouseDrag: function(event) {
+
+		//Increase performance, avoid regex
+		var data,
+			el = this.helper, props = {},
+			smp = this.originalMousePosition,
+			a = this.axis,
+			prevTop = this.position.top,
+			prevLeft = this.position.left,
+			prevWidth = this.size.width,
+			prevHeight = this.size.height,
+			dx = (event.pageX-smp.left)||0,
+			dy = (event.pageY-smp.top)||0,
+			trigger = this._change[a];
+
+		if (!trigger) {
+			return false;
+		}
+
+		// Calculate the attrs that will be change
+		data = trigger.apply(this, [event, dx, dy]);
+
+		// Put this in the mouseDrag handler since the user can start pressing shift while resizing
+		this._updateVirtualBoundaries(event.shiftKey);
+		if (this._aspectRatio || event.shiftKey) {
+			data = this._updateRatio(data, event);
+		}
+
+		data = this._respectSize(data, event);
+
+		this._updateCache(data);
+
+		// plugins callbacks need to be called first
+		this._propagate("resize", event);
+
+		if (this.position.top !== prevTop) {
+			props.top = this.position.top + "px";
+		}
+		if (this.position.left !== prevLeft) {
+			props.left = this.position.left + "px";
+		}
+		if (this.size.width !== prevWidth) {
+			props.width = this.size.width + "px";
+		}
+		if (this.size.height !== prevHeight) {
+			props.height = this.size.height + "px";
+		}
+		el.css(props);
+
+		if (!this._helper && this._proportionallyResizeElements.length) {
+			this._proportionallyResize();
+		}
+
+		// Call the user callback if the element was resized
+		if ( ! $.isEmptyObject(props) ) {
+			this._trigger("resize", event, this.ui());
+		}
+
+		return false;
+	},
+
+	_mouseStop: function(event) {
+
+		this.resizing = false;
+		var pr, ista, soffseth, soffsetw, s, left, top,
+			o = this.options, that = this;
+
+		if(this._helper) {
+
+			pr = this._proportionallyResizeElements;
+			ista = pr.length && (/textarea/i).test(pr[0].nodeName);
+			soffseth = ista && $.ui.hasScroll(pr[0], "left") /* TODO - jump height */ ? 0 : that.sizeDiff.height;
+			soffsetw = ista ? 0 : that.sizeDiff.width;
+
+			s = { width: (that.helper.width()  - soffsetw), height: (that.helper.height() - soffseth) };
+			left = (parseInt(that.element.css("left"), 10) + (that.position.left - that.originalPosition.left)) || null;
+			top = (parseInt(that.element.css("top"), 10) + (that.position.top - that.originalPosition.top)) || null;
+
+			if (!o.animate) {
+				this.element.css($.extend(s, { top: top, left: left }));
+			}
+
+			that.helper.height(that.size.height);
+			that.helper.width(that.size.width);
+
+			if (this._helper && !o.animate) {
+				this._proportionallyResize();
+			}
+		}
+
+		$("body").css("cursor", "auto");
+
+		this.element.removeClass("ui-resizable-resizing");
+
+		this._propagate("stop", event);
+
+		if (this._helper) {
+			this.helper.remove();
+		}
+
+		return false;
+
+	},
+
+	_updateVirtualBoundaries: function(forceAspectRatio) {
+		var pMinWidth, pMaxWidth, pMinHeight, pMaxHeight, b,
+			o = this.options;
+
+		b = {
+			minWidth: isNumber(o.minWidth) ? o.minWidth : 0,
+			maxWidth: isNumber(o.maxWidth) ? o.maxWidth : Infinity,
+			minHeight: isNumber(o.minHeight) ? o.minHeight : 0,
+			maxHeight: isNumber(o.maxHeight) ? o.maxHeight : Infinity
+		};
+
+		if(this._aspectRatio || forceAspectRatio) {
+			// We want to create an enclosing box whose aspect ration is the requested one
+			// First, compute the "projected" size for each dimension based on the aspect ratio and other dimension
+			pMinWidth = b.minHeight * this.aspectRatio;
+			pMinHeight = b.minWidth / this.aspectRatio;
+			pMaxWidth = b.maxHeight * this.aspectRatio;
+			pMaxHeight = b.maxWidth / this.aspectRatio;
+
+			if(pMinWidth > b.minWidth) {
+				b.minWidth = pMinWidth;
+			}
+			if(pMinHeight > b.minHeight) {
+				b.minHeight = pMinHeight;
+			}
+			if(pMaxWidth < b.maxWidth) {
+				b.maxWidth = pMaxWidth;
+			}
+			if(pMaxHeight < b.maxHeight) {
+				b.maxHeight = pMaxHeight;
+			}
+		}
+		this._vBoundaries = b;
+	},
+
+	_updateCache: function(data) {
+		this.offset = this.helper.offset();
+		if (isNumber(data.left)) {
+			this.position.left = data.left;
+		}
+		if (isNumber(data.top)) {
+			this.position.top = data.top;
+		}
+		if (isNumber(data.height)) {
+			this.size.height = data.height;
+		}
+		if (isNumber(data.width)) {
+			this.size.width = data.width;
+		}
+	},
+
+	_updateRatio: function( data ) {
+
+		var cpos = this.position,
+			csize = this.size,
+			a = this.axis;
+
+		if (isNumber(data.height)) {
+			data.width = (data.height * this.aspectRatio);
+		} else if (isNumber(data.width)) {
+			data.height = (data.width / this.aspectRatio);
+		}
+
+		if (a === "sw") {
+			data.left = cpos.left + (csize.width - data.width);
+			data.top = null;
+		}
+		if (a === "nw") {
+			data.top = cpos.top + (csize.height - data.height);
+			data.left = cpos.left + (csize.width - data.width);
+		}
+
+		return data;
+	},
+
+	_respectSize: function( data ) {
+
+		var o = this._vBoundaries,
+			a = this.axis,
+			ismaxw = isNumber(data.width) && o.maxWidth && (o.maxWidth < data.width), ismaxh = isNumber(data.height) && o.maxHeight && (o.maxHeight < data.height),
+			isminw = isNumber(data.width) && o.minWidth && (o.minWidth > data.width), isminh = isNumber(data.height) && o.minHeight && (o.minHeight > data.height),
+			dw = this.originalPosition.left + this.originalSize.width,
+			dh = this.position.top + this.size.height,
+			cw = /sw|nw|w/.test(a), ch = /nw|ne|n/.test(a);
+		if (isminw) {
+			data.width = o.minWidth;
+		}
+		if (isminh) {
+			data.height = o.minHeight;
+		}
+		if (ismaxw) {
+			data.width = o.maxWidth;
+		}
+		if (ismaxh) {
+			data.height = o.maxHeight;
+		}
+
+		if (isminw && cw) {
+			data.left = dw - o.minWidth;
+		}
+		if (ismaxw && cw) {
+			data.left = dw - o.maxWidth;
+		}
+		if (isminh && ch) {
+			data.top = dh - o.minHeight;
+		}
+		if (ismaxh && ch) {
+			data.top = dh - o.maxHeight;
+		}
+
+		// fixing jump error on top/left - bug #2330
+		if (!data.width && !data.height && !data.left && data.top) {
+			data.top = null;
+		} else if (!data.width && !data.height && !data.top && data.left) {
+			data.left = null;
+		}
+
+		return data;
+	},
+
+	_proportionallyResize: function() {
+
+		if (!this._proportionallyResizeElements.length) {
+			return;
+		}
+
+		var i, j, borders, paddings, prel,
+			element = this.helper || this.element;
+
+		for ( i=0; i < this._proportionallyResizeElements.length; i++) {
+
+			prel = this._proportionallyResizeElements[i];
+
+			if (!this.borderDif) {
+				this.borderDif = [];
+				borders = [prel.css("borderTopWidth"), prel.css("borderRightWidth"), prel.css("borderBottomWidth"), prel.css("borderLeftWidth")];
+				paddings = [prel.css("paddingTop"), prel.css("paddingRight"), prel.css("paddingBottom"), prel.css("paddingLeft")];
+
+				for ( j = 0; j < borders.length; j++ ) {
+					this.borderDif[ j ] = ( parseInt( borders[ j ], 10 ) || 0 ) + ( parseInt( paddings[ j ], 10 ) || 0 );
+				}
+			}
+
+			prel.css({
+				height: (element.height() - this.borderDif[0] - this.borderDif[2]) || 0,
+				width: (element.width() - this.borderDif[1] - this.borderDif[3]) || 0
+			});
+
+		}
+
+	},
+
+	_renderProxy: function() {
+
+		var el = this.element, o = this.options;
+		this.elementOffset = el.offset();
+
+		if(this._helper) {
+
+			this.helper = this.helper || $("<div style='overflow:hidden;'></div>");
+
+			this.helper.addClass(this._helper).css({
+				width: this.element.outerWidth() - 1,
+				height: this.element.outerHeight() - 1,
+				position: "absolute",
+				left: this.elementOffset.left +"px",
+				top: this.elementOffset.top +"px",
+				zIndex: ++o.zIndex //TODO: Don't modify option
+			});
+
+			this.helper
+				.appendTo("body")
+				.disableSelection();
+
+		} else {
+			this.helper = this.element;
+		}
+
+	},
+
+	_change: {
+		e: function(event, dx) {
+			return { width: this.originalSize.width + dx };
+		},
+		w: function(event, dx) {
+			var cs = this.originalSize, sp = this.originalPosition;
+			return { left: sp.left + dx, width: cs.width - dx };
+		},
+		n: function(event, dx, dy) {
+			var cs = this.originalSize, sp = this.originalPosition;
+			return { top: sp.top + dy, height: cs.height - dy };
+		},
+		s: function(event, dx, dy) {
+			return { height: this.originalSize.height + dy };
+		},
+		se: function(event, dx, dy) {
+			return $.extend(this._change.s.apply(this, arguments), this._change.e.apply(this, [event, dx, dy]));
+		},
+		sw: function(event, dx, dy) {
+			return $.extend(this._change.s.apply(this, arguments), this._change.w.apply(this, [event, dx, dy]));
+		},
+		ne: function(event, dx, dy) {
+			return $.extend(this._change.n.apply(this, arguments), this._change.e.apply(this, [event, dx, dy]));
+		},
+		nw: function(event, dx, dy) {
+			return $.extend(this._change.n.apply(this, arguments), this._change.w.apply(this, [event, dx, dy]));
+		}
+	},
+
+	_propagate: function(n, event) {
+		$.ui.plugin.call(this, n, [event, this.ui()]);
+		(n !== "resize" && this._trigger(n, event, this.ui()));
+	},
+
+	plugins: {},
+
+	ui: function() {
+		return {
+			originalElement: this.originalElement,
+			element: this.element,
+			helper: this.helper,
+			position: this.position,
+			size: this.size,
+			originalSize: this.originalSize,
+			originalPosition: this.originalPosition
+		};
+	}
+
+});
+
+/*
+ * Resizable Extensions
+ */
+
+$.ui.plugin.add("resizable", "animate", {
+
+	stop: function( event ) {
+		var that = $(this).data("ui-resizable"),
+			o = that.options,
+			pr = that._proportionallyResizeElements,
+			ista = pr.length && (/textarea/i).test(pr[0].nodeName),
+			soffseth = ista && $.ui.hasScroll(pr[0], "left") /* TODO - jump height */ ? 0 : that.sizeDiff.height,
+			soffsetw = ista ? 0 : that.sizeDiff.width,
+			style = { width: (that.size.width - soffsetw), height: (that.size.height - soffseth) },
+			left = (parseInt(that.element.css("left"), 10) + (that.position.left - that.originalPosition.left)) || null,
+			top = (parseInt(that.element.css("top"), 10) + (that.position.top - that.originalPosition.top)) || null;
+
+		that.element.animate(
+			$.extend(style, top && left ? { top: top, left: left } : {}), {
+				duration: o.animateDuration,
+				easing: o.animateEasing,
+				step: function() {
+
+					var data = {
+						width: parseInt(that.element.css("width"), 10),
+						height: parseInt(that.element.css("height"), 10),
+						top: parseInt(that.element.css("top"), 10),
+						left: parseInt(that.element.css("left"), 10)
+					};
+
+					if (pr && pr.length) {
+						$(pr[0]).css({ width: data.width, height: data.height });
+					}
+
+					// propagating resize, and updating values for each animation step
+					that._updateCache(data);
+					that._propagate("resize", event);
+
+				}
+			}
+		);
+	}
+
+});
+
+$.ui.plugin.add("resizable", "containment", {
+
+	start: function() {
+		var element, p, co, ch, cw, width, height,
+			that = $(this).data("ui-resizable"),
+			o = that.options,
+			el = that.element,
+			oc = o.containment,
+			ce = (oc instanceof $) ? oc.get(0) : (/parent/.test(oc)) ? el.parent().get(0) : oc;
+
+		if (!ce) {
+			return;
+		}
+
+		that.containerElement = $(ce);
+
+		if (/document/.test(oc) || oc === document) {
+			that.containerOffset = { left: 0, top: 0 };
+			that.containerPosition = { left: 0, top: 0 };
+
+			that.parentData = {
+				element: $(document), left: 0, top: 0,
+				width: $(document).width(), height: $(document).height() || document.body.parentNode.scrollHeight
+			};
+		}
+
+		// i'm a node, so compute top, left, right, bottom
+		else {
+			element = $(ce);
+			p = [];
+			$([ "Top", "Right", "Left", "Bottom" ]).each(function(i, name) { p[i] = num(element.css("padding" + name)); });
+
+			that.containerOffset = element.offset();
+			that.containerPosition = element.position();
+			that.containerSize = { height: (element.innerHeight() - p[3]), width: (element.innerWidth() - p[1]) };
+
+			co = that.containerOffset;
+			ch = that.containerSize.height;
+			cw = that.containerSize.width;
+			width = ($.ui.hasScroll(ce, "left") ? ce.scrollWidth : cw );
+			height = ($.ui.hasScroll(ce) ? ce.scrollHeight : ch);
+
+			that.parentData = {
+				element: ce, left: co.left, top: co.top, width: width, height: height
+			};
+		}
+	},
+
+	resize: function( event ) {
+		var woset, hoset, isParent, isOffsetRelative,
+			that = $(this).data("ui-resizable"),
+			o = that.options,
+			co = that.containerOffset, cp = that.position,
+			pRatio = that._aspectRatio || event.shiftKey,
+			cop = { top:0, left:0 }, ce = that.containerElement;
+
+		if (ce[0] !== document && (/static/).test(ce.css("position"))) {
+			cop = co;
+		}
+
+		if (cp.left < (that._helper ? co.left : 0)) {
+			that.size.width = that.size.width + (that._helper ? (that.position.left - co.left) : (that.position.left - cop.left));
+			if (pRatio) {
+				that.size.height = that.size.width / that.aspectRatio;
+			}
+			that.position.left = o.helper ? co.left : 0;
+		}
+
+		if (cp.top < (that._helper ? co.top : 0)) {
+			that.size.height = that.size.height + (that._helper ? (that.position.top - co.top) : that.position.top);
+			if (pRatio) {
+				that.size.width = that.size.height * that.aspectRatio;
+			}
+			that.position.top = that._helper ? co.top : 0;
+		}
+
+		that.offset.left = that.parentData.left+that.position.left;
+		that.offset.top = that.parentData.top+that.position.top;
+
+		woset = Math.abs( (that._helper ? that.offset.left - cop.left : (that.offset.left - cop.left)) + that.sizeDiff.width );
+		hoset = Math.abs( (that._helper ? that.offset.top - cop.top : (that.offset.top - co.top)) + that.sizeDiff.height );
+
+		isParent = that.containerElement.get(0) === that.element.parent().get(0);
+		isOffsetRelative = /relative|absolute/.test(that.containerElement.css("position"));
+
+		if(isParent && isOffsetRelative) {
+			woset -= that.parentData.left;
+		}
+
+		if (woset + that.size.width >= that.parentData.width) {
+			that.size.width = that.parentData.width - woset;
+			if (pRatio) {
+				that.size.height = that.size.width / that.aspectRatio;
+			}
+		}
+
+		if (hoset + that.size.height >= that.parentData.height) {
+			that.size.height = that.parentData.height - hoset;
+			if (pRatio) {
+				that.size.width = that.size.height * that.aspectRatio;
+			}
+		}
+	},
+
+	stop: function(){
+		var that = $(this).data("ui-resizable"),
+			o = that.options,
+			co = that.containerOffset,
+			cop = that.containerPosition,
+			ce = that.containerElement,
+			helper = $(that.helper),
+			ho = helper.offset(),
+			w = helper.outerWidth() - that.sizeDiff.width,
+			h = helper.outerHeight() - that.sizeDiff.height;
+
+		if (that._helper && !o.animate && (/relative/).test(ce.css("position"))) {
+			$(this).css({ left: ho.left - cop.left - co.left, width: w, height: h });
+		}
+
+		if (that._helper && !o.animate && (/static/).test(ce.css("position"))) {
+			$(this).css({ left: ho.left - cop.left - co.left, width: w, height: h });
+		}
+
+	}
+});
+
+$.ui.plugin.add("resizable", "alsoResize", {
+
+	start: function () {
+		var that = $(this).data("ui-resizable"),
+			o = that.options,
+			_store = function (exp) {
+				$(exp).each(function() {
+					var el = $(this);
+					el.data("ui-resizable-alsoresize", {
+						width: parseInt(el.width(), 10), height: parseInt(el.height(), 10),
+						left: parseInt(el.css("left"), 10), top: parseInt(el.css("top"), 10)
+					});
+				});
+			};
+
+		if (typeof(o.alsoResize) === "object" && !o.alsoResize.parentNode) {
+			if (o.alsoResize.length) { o.alsoResize = o.alsoResize[0]; _store(o.alsoResize); }
+			else { $.each(o.alsoResize, function (exp) { _store(exp); }); }
+		}else{
+			_store(o.alsoResize);
+		}
+	},
+
+	resize: function (event, ui) {
+		var that = $(this).data("ui-resizable"),
+			o = that.options,
+			os = that.originalSize,
+			op = that.originalPosition,
+			delta = {
+				height: (that.size.height - os.height) || 0, width: (that.size.width - os.width) || 0,
+				top: (that.position.top - op.top) || 0, left: (that.position.left - op.left) || 0
+			},
+
+			_alsoResize = function (exp, c) {
+				$(exp).each(function() {
+					var el = $(this), start = $(this).data("ui-resizable-alsoresize"), style = {},
+						css = c && c.length ? c : el.parents(ui.originalElement[0]).length ? ["width", "height"] : ["width", "height", "top", "left"];
+
+					$.each(css, function (i, prop) {
+						var sum = (start[prop]||0) + (delta[prop]||0);
+						if (sum && sum >= 0) {
+							style[prop] = sum || null;
+						}
+					});
+
+					el.css(style);
+				});
+			};
+
+		if (typeof(o.alsoResize) === "object" && !o.alsoResize.nodeType) {
+			$.each(o.alsoResize, function (exp, c) { _alsoResize(exp, c); });
+		}else{
+			_alsoResize(o.alsoResize);
+		}
+	},
+
+	stop: function () {
+		$(this).removeData("resizable-alsoresize");
+	}
+});
+
+$.ui.plugin.add("resizable", "ghost", {
+
+	start: function() {
+
+		var that = $(this).data("ui-resizable"), o = that.options, cs = that.size;
+
+		that.ghost = that.originalElement.clone();
+		that.ghost
+			.css({ opacity: 0.25, display: "block", position: "relative", height: cs.height, width: cs.width, margin: 0, left: 0, top: 0 })
+			.addClass("ui-resizable-ghost")
+			.addClass(typeof o.ghost === "string" ? o.ghost : "");
+
+		that.ghost.appendTo(that.helper);
+
+	},
+
+	resize: function(){
+		var that = $(this).data("ui-resizable");
+		if (that.ghost) {
+			that.ghost.css({ position: "relative", height: that.size.height, width: that.size.width });
+		}
+	},
+
+	stop: function() {
+		var that = $(this).data("ui-resizable");
+		if (that.ghost && that.helper) {
+			that.helper.get(0).removeChild(that.ghost.get(0));
+		}
+	}
+
+});
+
+$.ui.plugin.add("resizable", "grid", {
+
+	resize: function() {
+		var that = $(this).data("ui-resizable"),
+			o = that.options,
+			cs = that.size,
+			os = that.originalSize,
+			op = that.originalPosition,
+			a = that.axis,
+			grid = typeof o.grid === "number" ? [o.grid, o.grid] : o.grid,
+			gridX = (grid[0]||1),
+			gridY = (grid[1]||1),
+			ox = Math.round((cs.width - os.width) / gridX) * gridX,
+			oy = Math.round((cs.height - os.height) / gridY) * gridY,
+			newWidth = os.width + ox,
+			newHeight = os.height + oy,
+			isMaxWidth = o.maxWidth && (o.maxWidth < newWidth),
+			isMaxHeight = o.maxHeight && (o.maxHeight < newHeight),
+			isMinWidth = o.minWidth && (o.minWidth > newWidth),
+			isMinHeight = o.minHeight && (o.minHeight > newHeight);
+
+		o.grid = grid;
+
+		if (isMinWidth) {
+			newWidth = newWidth + gridX;
+		}
+		if (isMinHeight) {
+			newHeight = newHeight + gridY;
+		}
+		if (isMaxWidth) {
+			newWidth = newWidth - gridX;
+		}
+		if (isMaxHeight) {
+			newHeight = newHeight - gridY;
+		}
+
+		if (/^(se|s|e)$/.test(a)) {
+			that.size.width = newWidth;
+			that.size.height = newHeight;
+		} else if (/^(ne)$/.test(a)) {
+			that.size.width = newWidth;
+			that.size.height = newHeight;
+			that.position.top = op.top - oy;
+		} else if (/^(sw)$/.test(a)) {
+			that.size.width = newWidth;
+			that.size.height = newHeight;
+			that.position.left = op.left - ox;
+		} else {
+			that.size.width = newWidth;
+			that.size.height = newHeight;
+			that.position.top = op.top - oy;
+			that.position.left = op.left - ox;
+		}
+	}
+
+});
+
+})(jQuery);
+
+(function( $, undefined ) {
+
+$.widget("ui.selectable", $.ui.mouse, {
+	version: "1.10.3",
+	options: {
+		appendTo: "body",
+		autoRefresh: true,
+		distance: 0,
+		filter: "*",
+		tolerance: "touch",
+
+		// callbacks
+		selected: null,
+		selecting: null,
+		start: null,
+		stop: null,
+		unselected: null,
+		unselecting: null
+	},
+	_create: function() {
+		var selectees,
+			that = this;
+
+		this.element.addClass("ui-selectable");
+
+		this.dragged = false;
+
+		// cache selectee children based on filter
+		this.refresh = function() {
+			selectees = $(that.options.filter, that.element[0]);
+			selectees.addClass("ui-selectee");
+			selectees.each(function() {
+				var $this = $(this),
+					pos = $this.offset();
+				$.data(this, "selectable-item", {
+					element: this,
+					$element: $this,
+					left: pos.left,
+					top: pos.top,
+					right: pos.left + $this.outerWidth(),
+					bottom: pos.top + $this.outerHeight(),
+					startselected: false,
+					selected: $this.hasClass("ui-selected"),
+					selecting: $this.hasClass("ui-selecting"),
+					unselecting: $this.hasClass("ui-unselecting")
+				});
+			});
+		};
+		this.refresh();
+
+		this.selectees = selectees.addClass("ui-selectee");
+
+		this._mouseInit();
+
+		this.helper = $("<div class='ui-selectable-helper'></div>");
+	},
+
+	_destroy: function() {
+		this.selectees
+			.removeClass("ui-selectee")
+			.removeData("selectable-item");
+		this.element
+			.removeClass("ui-selectable ui-selectable-disabled");
+		this._mouseDestroy();
+	},
+
+	_mouseStart: function(event) {
+		var that = this,
+			options = this.options;
+
+		this.opos = [event.pageX, event.pageY];
+
+		if (this.options.disabled) {
+			return;
+		}
+
+		this.selectees = $(options.filter, this.element[0]);
+
+		this._trigger("start", event);
+
+		$(options.appendTo).append(this.helper);
+		// position helper (lasso)
+		this.helper.css({
+			"left": event.pageX,
+			"top": event.pageY,
+			"width": 0,
+			"height": 0
+		});
+
+		if (options.autoRefresh) {
+			this.refresh();
+		}
+
+		this.selectees.filter(".ui-selected").each(function() {
+			var selectee = $.data(this, "selectable-item");
+			selectee.startselected = true;
+			if (!event.metaKey && !event.ctrlKey) {
+				selectee.$element.removeClass("ui-selected");
+				selectee.selected = false;
+				selectee.$element.addClass("ui-unselecting");
+				selectee.unselecting = true;
+				// selectable UNSELECTING callback
+				that._trigger("unselecting", event, {
+					unselecting: selectee.element
+				});
+			}
+		});
+
+		$(event.target).parents().addBack().each(function() {
+			var doSelect,
+				selectee = $.data(this, "selectable-item");
+			if (selectee) {
+				doSelect = (!event.metaKey && !event.ctrlKey) || !selectee.$element.hasClass("ui-selected");
+				selectee.$element
+					.removeClass(doSelect ? "ui-unselecting" : "ui-selected")
+					.addClass(doSelect ? "ui-selecting" : "ui-unselecting");
+				selectee.unselecting = !doSelect;
+				selectee.selecting = doSelect;
+				selectee.selected = doSelect;
+				// selectable (UN)SELECTING callback
+				if (doSelect) {
+					that._trigger("selecting", event, {
+						selecting: selectee.element
+					});
+				} else {
+					that._trigger("unselecting", event, {
+						unselecting: selectee.element
+					});
+				}
+				return false;
+			}
+		});
+
+	},
+
+	_mouseDrag: function(event) {
+
+		this.dragged = true;
+
+		if (this.options.disabled) {
+			return;
+		}
+
+		var tmp,
+			that = this,
+			options = this.options,
+			x1 = this.opos[0],
+			y1 = this.opos[1],
+			x2 = event.pageX,
+			y2 = event.pageY;
+
+		if (x1 > x2) { tmp = x2; x2 = x1; x1 = tmp; }
+		if (y1 > y2) { tmp = y2; y2 = y1; y1 = tmp; }
+		this.helper.css({left: x1, top: y1, width: x2-x1, height: y2-y1});
+
+		this.selectees.each(function() {
+			var selectee = $.data(this, "selectable-item"),
+				hit = false;
+
+			//prevent helper from being selected if appendTo: selectable
+			if (!selectee || selectee.element === that.element[0]) {
+				return;
+			}
+
+			if (options.tolerance === "touch") {
+				hit = ( !(selectee.left > x2 || selectee.right < x1 || selectee.top > y2 || selectee.bottom < y1) );
+			} else if (options.tolerance === "fit") {
+				hit = (selectee.left > x1 && selectee.right < x2 && selectee.top > y1 && selectee.bottom < y2);
+			}
+
+			if (hit) {
+				// SELECT
+				if (selectee.selected) {
+					selectee.$element.removeClass("ui-selected");
+					selectee.selected = false;
+				}
+				if (selectee.unselecting) {
+					selectee.$element.removeClass("ui-unselecting");
+					selectee.unselecting = false;
+				}
+				if (!selectee.selecting) {
+					selectee.$element.addClass("ui-selecting");
+					selectee.selecting = true;
+					// selectable SELECTING callback
+					that._trigger("selecting", event, {
+						selecting: selectee.element
+					});
+				}
+			} else {
+				// UNSELECT
+				if (selectee.selecting) {
+					if ((event.metaKey || event.ctrlKey) && selectee.startselected) {
+						selectee.$element.removeClass("ui-selecting");
+						selectee.selecting = false;
+						selectee.$element.addClass("ui-selected");
+						selectee.selected = true;
+					} else {
+						selectee.$element.removeClass("ui-selecting");
+						selectee.selecting = false;
+						if (selectee.startselected) {
+							selectee.$element.addClass("ui-unselecting");
+							selectee.unselecting = true;
+						}
+						// selectable UNSELECTING callback
+						that._trigger("unselecting", event, {
+							unselecting: selectee.element
+						});
+					}
+				}
+				if (selectee.selected) {
+					if (!event.metaKey && !event.ctrlKey && !selectee.startselected) {
+						selectee.$element.removeClass("ui-selected");
+						selectee.selected = false;
+
+						selectee.$element.addClass("ui-unselecting");
+						selectee.unselecting = true;
+						// selectable UNSELECTING callback
+						that._trigger("unselecting", event, {
+							unselecting: selectee.element
+						});
+					}
+				}
+			}
+		});
+
+		return false;
+	},
+
+	_mouseStop: function(event) {
+		var that = this;
+
+		this.dragged = false;
+
+		$(".ui-unselecting", this.element[0]).each(function() {
+			var selectee = $.data(this, "selectable-item");
+			selectee.$element.removeClass("ui-unselecting");
+			selectee.unselecting = false;
+			selectee.startselected = false;
+			that._trigger("unselected", event, {
+				unselected: selectee.element
+			});
+		});
+		$(".ui-selecting", this.element[0]).each(function() {
+			var selectee = $.data(this, "selectable-item");
+			selectee.$element.removeClass("ui-selecting").addClass("ui-selected");
+			selectee.selecting = false;
+			selectee.selected = true;
+			selectee.startselected = true;
+			that._trigger("selected", event, {
+				selected: selectee.element
+			});
+		});
+		this._trigger("stop", event);
+
+		this.helper.remove();
+
+		return false;
+	}
+
+});
+
+})(jQuery);
+
+(function( $, undefined ) {
+
+/*jshint loopfunc: true */
+
+function isOverAxis( x, reference, size ) {
+	return ( x > reference ) && ( x < ( reference + size ) );
+}
+
+function isFloating(item) {
+	return (/left|right/).test(item.css("float")) || (/inline|table-cell/).test(item.css("display"));
+}
+
+$.widget("ui.sortable", $.ui.mouse, {
+	version: "1.10.3",
+	widgetEventPrefix: "sort",
+	ready: false,
+	options: {
+		appendTo: "parent",
+		axis: false,
+		connectWith: false,
+		containment: false,
+		cursor: "auto",
+		cursorAt: false,
+		dropOnEmpty: true,
+		forcePlaceholderSize: false,
+		forceHelperSize: false,
+		grid: false,
+		handle: false,
+		helper: "original",
+		items: "> *",
+		opacity: false,
+		placeholder: false,
+		revert: false,
+		scroll: true,
+		scrollSensitivity: 20,
+		scrollSpeed: 20,
+		scope: "default",
+		tolerance: "intersect",
+		zIndex: 1000,
+
+		// callbacks
+		activate: null,
+		beforeStop: null,
+		change: null,
+		deactivate: null,
+		out: null,
+		over: null,
+		receive: null,
+		remove: null,
+		sort: null,
+		start: null,
+		stop: null,
+		update: null
+	},
+	_create: function() {
+
+		var o = this.options;
+		this.containerCache = {};
+		this.element.addClass("ui-sortable");
+
+		//Get the items
+		this.refresh();
+
+		//Let's determine if the items are being displayed horizontally
+		this.floating = this.items.length ? o.axis === "x" || isFloating(this.items[0].item) : false;
+
+		//Let's determine the parent's offset
+		this.offset = this.element.offset();
+
+		//Initialize mouse events for interaction
+		this._mouseInit();
+
+		//We're ready to go
+		this.ready = true;
+
+	},
+
+	_destroy: function() {
+		this.element
+			.removeClass("ui-sortable ui-sortable-disabled");
+		this._mouseDestroy();
+
+		for ( var i = this.items.length - 1; i >= 0; i-- ) {
+			this.items[i].item.removeData(this.widgetName + "-item");
+		}
+
+		return this;
+	},
+
+	_setOption: function(key, value){
+		if ( key === "disabled" ) {
+			this.options[ key ] = value;
+
+			this.widget().toggleClass( "ui-sortable-disabled", !!value );
+		} else {
+			// Don't call widget base _setOption for disable as it adds ui-state-disabled class
+			$.Widget.prototype._setOption.apply(this, arguments);
+		}
+	},
+
+	_mouseCapture: function(event, overrideHandle) {
+		var currentItem = null,
+			validHandle = false,
+			that = this;
+
+		if (this.reverting) {
+			return false;
+		}
+
+		if(this.options.disabled || this.options.type === "static") {
+			return false;
+		}
+
+		//We have to refresh the items data once first
+		this._refreshItems(event);
+
+		//Find out if the clicked node (or one of its parents) is a actual item in this.items
+		$(event.target).parents().each(function() {
+			if($.data(this, that.widgetName + "-item") === that) {
+				currentItem = $(this);
+				return false;
+			}
+		});
+		if($.data(event.target, that.widgetName + "-item") === that) {
+			currentItem = $(event.target);
+		}
+
+		if(!currentItem) {
+			return false;
+		}
+		if(this.options.handle && !overrideHandle) {
+			$(this.options.handle, currentItem).find("*").addBack().each(function() {
+				if(this === event.target) {
+					validHandle = true;
+				}
+			});
+			if(!validHandle) {
+				return false;
+			}
+		}
+
+		this.currentItem = currentItem;
+		this._removeCurrentsFromItems();
+		return true;
+
+	},
+
+	_mouseStart: function(event, overrideHandle, noActivation) {
+
+		var i, body,
+			o = this.options;
+
+		this.currentContainer = this;
+
+		//We only need to call refreshPositions, because the refreshItems call has been moved to mouseCapture
+		this.refreshPositions();
+
+		//Create and append the visible helper
+		this.helper = this._createHelper(event);
+
+		//Cache the helper size
+		this._cacheHelperProportions();
+
+		/*
+		 * - Position generation -
+		 * This block generates everything position related - it's the core of draggables.
+		 */
+
+		//Cache the margins of the original element
+		this._cacheMargins();
+
+		//Get the next scrolling parent
+		this.scrollParent = this.helper.scrollParent();
+
+		//The element's absolute position on the page minus margins
+		this.offset = this.currentItem.offset();
+		this.offset = {
+			top: this.offset.top - this.margins.top,
+			left: this.offset.left - this.margins.left
+		};
+
+		$.extend(this.offset, {
+			click: { //Where the click happened, relative to the element
+				left: event.pageX - this.offset.left,
+				top: event.pageY - this.offset.top
+			},
+			parent: this._getParentOffset(),
+			relative: this._getRelativeOffset() //This is a relative to absolute position minus the actual position calculation - only used for relative positioned helper
+		});
+
+		// Only after we got the offset, we can change the helper's position to absolute
+		// TODO: Still need to figure out a way to make relative sorting possible
+		this.helper.css("position", "absolute");
+		this.cssPosition = this.helper.css("position");
+
+		//Generate the original position
+		this.originalPosition = this._generatePosition(event);
+		this.originalPageX = event.pageX;
+		this.originalPageY = event.pageY;
+
+		//Adjust the mouse offset relative to the helper if "cursorAt" is supplied
+		(o.cursorAt && this._adjustOffsetFromHelper(o.cursorAt));
+
+		//Cache the former DOM position
+		this.domPosition = { prev: this.currentItem.prev()[0], parent: this.currentItem.parent()[0] };
+
+		//If the helper is not the original, hide the original so it's not playing any role during the drag, won't cause anything bad this way
+		if(this.helper[0] !== this.currentItem[0]) {
+			this.currentItem.hide();
+		}
+
+		//Create the placeholder
+		this._createPlaceholder();
+
+		//Set a containment if given in the options
+		if(o.containment) {
+			this._setContainment();
+		}
+
+		if( o.cursor && o.cursor !== "auto" ) { // cursor option
+			body = this.document.find( "body" );
+
+			// support: IE
+			this.storedCursor = body.css( "cursor" );
+			body.css( "cursor", o.cursor );
+
+			this.storedStylesheet = $( "<style>*{ cursor: "+o.cursor+" !important; }</style>" ).appendTo( body );
+		}
+
+		if(o.opacity) { // opacity option
+			if (this.helper.css("opacity")) {
+				this._storedOpacity = this.helper.css("opacity");
+			}
+			this.helper.css("opacity", o.opacity);
+		}
+
+		if(o.zIndex) { // zIndex option
+			if (this.helper.css("zIndex")) {
+				this._storedZIndex = this.helper.css("zIndex");
+			}
+			this.helper.css("zIndex", o.zIndex);
+		}
+
+		//Prepare scrolling
+		if(this.scrollParent[0] !== document && this.scrollParent[0].tagName !== "HTML") {
+			this.overflowOffset = this.scrollParent.offset();
+		}
+
+		//Call callbacks
+		this._trigger("start", event, this._uiHash());
+
+		//Recache the helper size
+		if(!this._preserveHelperProportions) {
+			this._cacheHelperProportions();
+		}
+
+
+		//Post "activate" events to possible containers
+		if( !noActivation ) {
+			for ( i = this.containers.length - 1; i >= 0; i-- ) {
+				this.containers[ i ]._trigger( "activate", event, this._uiHash( this ) );
+			}
+		}
+
+		//Prepare possible droppables
+		if($.ui.ddmanager) {
+			$.ui.ddmanager.current = this;
+		}
+
+		if ($.ui.ddmanager && !o.dropBehaviour) {
+			$.ui.ddmanager.prepareOffsets(this, event);
+		}
+
+		this.dragging = true;
+
+		this.helper.addClass("ui-sortable-helper");
+		this._mouseDrag(event); //Execute the drag once - this causes the helper not to be visible before getting its correct position
+		return true;
+
+	},
+
+	_mouseDrag: function(event) {
+		var i, item, itemElement, intersection,
+			o = this.options,
+			scrolled = false;
+
+		//Compute the helpers position
+		this.position = this._generatePosition(event);
+		this.positionAbs = this._convertPositionTo("absolute");
+
+		if (!this.lastPositionAbs) {
+			this.lastPositionAbs = this.positionAbs;
+		}
+
+		//Do scrolling
+		if(this.options.scroll) {
+			if(this.scrollParent[0] !== document && this.scrollParent[0].tagName !== "HTML") {
+
+				if((this.overflowOffset.top + this.scrollParent[0].offsetHeight) - event.pageY < o.scrollSensitivity) {
+					this.scrollParent[0].scrollTop = scrolled = this.scrollParent[0].scrollTop + o.scrollSpeed;
+				} else if(event.pageY - this.overflowOffset.top < o.scrollSensitivity) {
+					this.scrollParent[0].scrollTop = scrolled = this.scrollParent[0].scrollTop - o.scrollSpeed;
+				}
+
+				if((this.overflowOffset.left + this.scrollParent[0].offsetWidth) - event.pageX < o.scrollSensitivity) {
+					this.scrollParent[0].scrollLeft = scrolled = this.scrollParent[0].scrollLeft + o.scrollSpeed;
+				} else if(event.pageX - this.overflowOffset.left < o.scrollSensitivity) {
+					this.scrollParent[0].scrollLeft = scrolled = this.scrollParent[0].scrollLeft - o.scrollSpeed;
+				}
+
+			} else {
+
+				if(event.pageY - $(document).scrollTop() < o.scrollSensitivity) {
+					scrolled = $(document).scrollTop($(document).scrollTop() - o.scrollSpeed);
+				} else if($(window).height() - (event.pageY - $(document).scrollTop()) < o.scrollSensitivity) {
+					scrolled = $(document).scrollTop($(document).scrollTop() + o.scrollSpeed);
+				}
+
+				if(event.pageX - $(document).scrollLeft() < o.scrollSensitivity) {
+					scrolled = $(document).scrollLeft($(document).scrollLeft() - o.scrollSpeed);
+				} else if($(window).width() - (event.pageX - $(document).scrollLeft()) < o.scrollSensitivity) {
+					scrolled = $(document).scrollLeft($(document).scrollLeft() + o.scrollSpeed);
+				}
+
+			}
+
+			if(scrolled !== false && $.ui.ddmanager && !o.dropBehaviour) {
+				$.ui.ddmanager.prepareOffsets(this, event);
+			}
+		}
+
+		//Regenerate the absolute position used for position checks
+		this.positionAbs = this._convertPositionTo("absolute");
+
+		//Set the helper position
+		if(!this.options.axis || this.options.axis !== "y") {
+			this.helper[0].style.left = this.position.left+"px";
+		}
+		if(!this.options.axis || this.options.axis !== "x") {
+			this.helper[0].style.top = this.position.top+"px";
+		}
+
+		//Rearrange
+		for (i = this.items.length - 1; i >= 0; i--) {
+
+			//Cache variables and intersection, continue if no intersection
+			item = this.items[i];
+			itemElement = item.item[0];
+			intersection = this._intersectsWithPointer(item);
+			if (!intersection) {
+				continue;
+			}
+
+			// Only put the placeholder inside the current Container, skip all
+			// items form other containers. This works because when moving
+			// an item from one container to another the
+			// currentContainer is switched before the placeholder is moved.
+			//
+			// Without this moving items in "sub-sortables" can cause the placeholder to jitter
+			// beetween the outer and inner container.
+			if (item.instance !== this.currentContainer) {
+				continue;
+			}
+
+			// cannot intersect with itself
+			// no useless actions that have been done before
+			// no action if the item moved is the parent of the item checked
+			if (itemElement !== this.currentItem[0] &&
+				this.placeholder[intersection === 1 ? "next" : "prev"]()[0] !== itemElement &&
+				!$.contains(this.placeholder[0], itemElement) &&
+				(this.options.type === "semi-dynamic" ? !$.contains(this.element[0], itemElement) : true)
+			) {
+
+				this.direction = intersection === 1 ? "down" : "up";
+
+				if (this.options.tolerance === "pointer" || this._intersectsWithSides(item)) {
+					this._rearrange(event, item);
+				} else {
+					break;
+				}
+
+				this._trigger("change", event, this._uiHash());
+				break;
+			}
+		}
+
+		//Post events to containers
+		this._contactContainers(event);
+
+		//Interconnect with droppables
+		if($.ui.ddmanager) {
+			$.ui.ddmanager.drag(this, event);
+		}
+
+		//Call callbacks
+		this._trigger("sort", event, this._uiHash());
+
+		this.lastPositionAbs = this.positionAbs;
+		return false;
+
+	},
+
+	_mouseStop: function(event, noPropagation) {
+
+		if(!event) {
+			return;
+		}
+
+		//If we are using droppables, inform the manager about the drop
+		if ($.ui.ddmanager && !this.options.dropBehaviour) {
+			$.ui.ddmanager.drop(this, event);
+		}
+
+		if(this.options.revert) {
+			var that = this,
+				cur = this.placeholder.offset(),
+				axis = this.options.axis,
+				animation = {};
+
+			if ( !axis || axis === "x" ) {
+				animation.left = cur.left - this.offset.parent.left - this.margins.left + (this.offsetParent[0] === document.body ? 0 : this.offsetParent[0].scrollLeft);
+			}
+			if ( !axis || axis === "y" ) {
+				animation.top = cur.top - this.offset.parent.top - this.margins.top + (this.offsetParent[0] === document.body ? 0 : this.offsetParent[0].scrollTop);
+			}
+			this.reverting = true;
+			$(this.helper).animate( animation, parseInt(this.options.revert, 10) || 500, function() {
+				that._clear(event);
+			});
+		} else {
+			this._clear(event, noPropagation);
+		}
+
+		return false;
+
+	},
+
+	cancel: function() {
+
+		if(this.dragging) {
+
+			this._mouseUp({ target: null });
+
+			if(this.options.helper === "original") {
+				this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper");
+			} else {
+				this.currentItem.show();
+			}
+
+			//Post deactivating events to containers
+			for (var i = this.containers.length - 1; i >= 0; i--){
+				this.containers[i]._trigger("deactivate", null, this._uiHash(this));
+				if(this.containers[i].containerCache.over) {
+					this.containers[i]._trigger("out", null, this._uiHash(this));
+					this.containers[i].containerCache.over = 0;
+				}
+			}
+
+		}
+
+		if (this.placeholder) {
+			//$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately, it unbinds ALL events from the original node!
+			if(this.placeholder[0].parentNode) {
+				this.placeholder[0].parentNode.removeChild(this.placeholder[0]);
+			}
+			if(this.options.helper !== "original" && this.helper && this.helper[0].parentNode) {
+				this.helper.remove();
+			}
+
+			$.extend(this, {
+				helper: null,
+				dragging: false,
+				reverting: false,
+				_noFinalSort: null
+			});
+
+			if(this.domPosition.prev) {
+				$(this.domPosition.prev).after(this.currentItem);
+			} else {
+				$(this.domPosition.parent).prepend(this.currentItem);
+			}
+		}
+
+		return this;
+
+	},
+
+	serialize: function(o) {
+
+		var items = this._getItemsAsjQuery(o && o.connected),
+			str = [];
+		o = o || {};
+
+		$(items).each(function() {
+			var res = ($(o.item || this).attr(o.attribute || "id") || "").match(o.expression || (/(.+)[\-=_](.+)/));
+			if (res) {
+				str.push((o.key || res[1]+"[]")+"="+(o.key && o.expression ? res[1] : res[2]));
+			}
+		});
+
+		if(!str.length && o.key) {
+			str.push(o.key + "=");
+		}
+
+		return str.join("&");
+
+	},
+
+	toArray: function(o) {
+
+		var items = this._getItemsAsjQuery(o && o.connected),
+			ret = [];
+
+		o = o || {};
+
+		items.each(function() { ret.push($(o.item || this).attr(o.attribute || "id") || ""); });
+		return ret;
+
+	},
+
+	/* Be careful with the following core functions */
+	_intersectsWith: function(item) {
+
+		var x1 = this.positionAbs.left,
+			x2 = x1 + this.helperProportions.width,
+			y1 = this.positionAbs.top,
+			y2 = y1 + this.helperProportions.height,
+			l = item.left,
+			r = l + item.width,
+			t = item.top,
+			b = t + item.height,
+			dyClick = this.offset.click.top,
+			dxClick = this.offset.click.left,
+			isOverElementHeight = ( this.options.axis === "x" ) || ( ( y1 + dyClick ) > t && ( y1 + dyClick ) < b ),
+			isOverElementWidth = ( this.options.axis === "y" ) || ( ( x1 + dxClick ) > l && ( x1 + dxClick ) < r ),
+			isOverElement = isOverElementHeight && isOverElementWidth;
+
+		if ( this.options.tolerance === "pointer" ||
+			this.options.forcePointerForContainers ||
+			(this.options.tolerance !== "pointer" && this.helperProportions[this.floating ? "width" : "height"] > item[this.floating ? "width" : "height"])
+		) {
+			return isOverElement;
+		} else {
+
+			return (l < x1 + (this.helperProportions.width / 2) && // Right Half
+				x2 - (this.helperProportions.width / 2) < r && // Left Half
+				t < y1 + (this.helperProportions.height / 2) && // Bottom Half
+				y2 - (this.helperProportions.height / 2) < b ); // Top Half
+
+		}
+	},
+
+	_intersectsWithPointer: function(item) {
+
+		var isOverElementHeight = (this.options.axis === "x") || isOverAxis(this.positionAbs.top + this.offset.click.top, item.top, item.height),
+			isOverElementWidth = (this.options.axis === "y") || isOverAxis(this.positionAbs.left + this.offset.click.left, item.left, item.width),
+			isOverElement = isOverElementHeight && isOverElementWidth,
+			verticalDirection = this._getDragVerticalDirection(),
+			horizontalDirection = this._getDragHorizontalDirection();
+
+		if (!isOverElement) {
+			return false;
+		}
+
+		return this.floating ?
+			( ((horizontalDirection && horizontalDirection === "right") || verticalDirection === "down") ? 2 : 1 )
+			: ( verticalDirection && (verticalDirection === "down" ? 2 : 1) );
+
+	},
+
+	_intersectsWithSides: function(item) {
+
+		var isOverBottomHalf = isOverAxis(this.positionAbs.top + this.offset.click.top, item.top + (item.height/2), item.height),
+			isOverRightHalf = isOverAxis(this.positionAbs.left + this.offset.click.left, item.left + (item.width/2), item.width),
+			verticalDirection = this._getDragVerticalDirection(),
+			horizontalDirection = this._getDragHorizontalDirection();
+
+		if (this.floating && horizontalDirection) {
+			return ((horizontalDirection === "right" && isOverRightHalf) || (horizontalDirection === "left" && !isOverRightHalf));
+		} else {
+			return verticalDirection && ((verticalDirection === "down" && isOverBottomHalf) || (verticalDirection === "up" && !isOverBottomHalf));
+		}
+
+	},
+
+	_getDragVerticalDirection: function() {
+		var delta = this.positionAbs.top - this.lastPositionAbs.top;
+		return delta !== 0 && (delta > 0 ? "down" : "up");
+	},
+
+	_getDragHorizontalDirection: function() {
+		var delta = this.positionAbs.left - this.lastPositionAbs.left;
+		return delta !== 0 && (delta > 0 ? "right" : "left");
+	},
+
+	refresh: function(event) {
+		this._refreshItems(event);
+		this.refreshPositions();
+		return this;
+	},
+
+	_connectWith: function() {
+		var options = this.options;
+		return options.connectWith.constructor === String ? [options.connectWith] : options.connectWith;
+	},
+
+	_getItemsAsjQuery: function(connected) {
+
+		var i, j, cur, inst,
+			items = [],
+			queries = [],
+			connectWith = this._connectWith();
+
+		if(connectWith && connected) {
+			for (i = connectWith.length - 1; i >= 0; i--){
+				cur = $(connectWith[i]);
+				for ( j = cur.length - 1; j >= 0; j--){
+					inst = $.data(cur[j], this.widgetFullName);
+					if(inst && inst !== this && !inst.options.disabled) {
+						queries.push([$.isFunction(inst.options.items) ? inst.options.items.call(inst.element) : $(inst.options.items, inst.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"), inst]);
+					}
+				}
+			}
+		}
+
+		queries.push([$.isFunction(this.options.items) ? this.options.items.call(this.element, null, { options: this.options, item: this.currentItem }) : $(this.options.items, this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"), this]);
+
+		for (i = queries.length - 1; i >= 0; i--){
+			queries[i][0].each(function() {
+				items.push(this);
+			});
+		}
+
+		return $(items);
+
+	},
+
+	_removeCurrentsFromItems: function() {
+
+		var list = this.currentItem.find(":data(" + this.widgetName + "-item)");
+
+		this.items = $.grep(this.items, function (item) {
+			for (var j=0; j < list.length; j++) {
+				if(list[j] === item.item[0]) {
+					return false;
+				}
+			}
+			return true;
+		});
+
+	},
+
+	_refreshItems: function(event) {
+
+		this.items = [];
+		this.containers = [this];
+
+		var i, j, cur, inst, targetData, _queries, item, queriesLength,
+			items = this.items,
+			queries = [[$.isFunction(this.options.items) ? this.options.items.call(this.element[0], event, { item: this.currentItem }) : $(this.options.items, this.element), this]],
+			connectWith = this._connectWith();
+
+		if(connectWith && this.ready) { //Shouldn't be run the first time through due to massive slow-down
+			for (i = connectWith.length - 1; i >= 0; i--){
+				cur = $(connectWith[i]);
+				for (j = cur.length - 1; j >= 0; j--){
+					inst = $.data(cur[j], this.widgetFullName);
+					if(inst && inst !== this && !inst.options.disabled) {
+						queries.push([$.isFunction(inst.options.items) ? inst.options.items.call(inst.element[0], event, { item: this.currentItem }) : $(inst.options.items, inst.element), inst]);
+						this.containers.push(inst);
+					}
+				}
+			}
+		}
+
+		for (i = queries.length - 1; i >= 0; i--) {
+			targetData = queries[i][1];
+			_queries = queries[i][0];
+
+			for (j=0, queriesLength = _queries.length; j < queriesLength; j++) {
+				item = $(_queries[j]);
+
+				item.data(this.widgetName + "-item", targetData); // Data for target checking (mouse manager)
+
+				items.push({
+					item: item,
+					instance: targetData,
+					width: 0, height: 0,
+					left: 0, top: 0
+				});
+			}
+		}
+
+	},
+
+	refreshPositions: function(fast) {
+
+		//This has to be redone because due to the item being moved out/into the offsetParent, the offsetParent's position will change
+		if(this.offsetParent && this.helper) {
+			this.offset.parent = this._getParentOffset();
+		}
+
+		var i, item, t, p;
+
+		for (i = this.items.length - 1; i >= 0; i--){
+			item = this.items[i];
+
+			//We ignore calculating positions of all connected containers when we're not over them
+			if(item.instance !== this.currentContainer && this.currentContainer && item.item[0] !== this.currentItem[0]) {
+				continue;
+			}
+
+			t = this.options.toleranceElement ? $(this.options.toleranceElement, item.item) : item.item;
+
+			if (!fast) {
+				item.width = t.outerWidth();
+				item.height = t.outerHeight();
+			}
+
+			p = t.offset();
+			item.left = p.left;
+			item.top = p.top;
+		}
+
+		if(this.options.custom && this.options.custom.refreshContainers) {
+			this.options.custom.refreshContainers.call(this);
+		} else {
+			for (i = this.containers.length - 1; i >= 0; i--){
+				p = this.containers[i].element.offset();
+				this.containers[i].containerCache.left = p.left;
+				this.containers[i].containerCache.top = p.top;
+				this.containers[i].containerCache.width	= this.containers[i].element.outerWidth();
+				this.containers[i].containerCache.height = this.containers[i].element.outerHeight();
+			}
+		}
+
+		return this;
+	},
+
+	_createPlaceholder: function(that) {
+		that = that || this;
+		var className,
+			o = that.options;
+
+		if(!o.placeholder || o.placeholder.constructor === String) {
+			className = o.placeholder;
+			o.placeholder = {
+				element: function() {
+
+					var nodeName = that.currentItem[0].nodeName.toLowerCase(),
+						element = $( "<" + nodeName + ">", that.document[0] )
+							.addClass(className || that.currentItem[0].className+" ui-sortable-placeholder")
+							.removeClass("ui-sortable-helper");
+
+					if ( nodeName === "tr" ) {
+						that.currentItem.children().each(function() {
+							$( "<td>&#160;</td>", that.document[0] )
+								.attr( "colspan", $( this ).attr( "colspan" ) || 1 )
+								.appendTo( element );
+						});
+					} else if ( nodeName === "img" ) {
+						element.attr( "src", that.currentItem.attr( "src" ) );
+					}
+
+					if ( !className ) {
+						element.css( "visibility", "hidden" );
+					}
+
+					return element;
+				},
+				update: function(container, p) {
+
+					// 1. If a className is set as 'placeholder option, we don't force sizes - the class is responsible for that
+					// 2. The option 'forcePlaceholderSize can be enabled to force it even if a class name is specified
+					if(className && !o.forcePlaceholderSize) {
+						return;
+					}
+
+					//If the element doesn't have a actual height by itself (without styles coming from a stylesheet), it receives the inline height from the dragged item
+					if(!p.height()) { p.height(that.currentItem.innerHeight() - parseInt(that.currentItem.css("paddingTop")||0, 10) - parseInt(that.currentItem.css("paddingBottom")||0, 10)); }
+					if(!p.width()) { p.width(that.currentItem.innerWidth() - parseInt(that.currentItem.css("paddingLeft")||0, 10) - parseInt(that.currentItem.css("paddingRight")||0, 10)); }
+				}
+			};
+		}
+
+		//Create the placeholder
+		that.placeholder = $(o.placeholder.element.call(that.element, that.currentItem));
+
+		//Append it after the actual current item
+		that.currentItem.after(that.placeholder);
+
+		//Update the size of the placeholder (TODO: Logic to fuzzy, see line 316/317)
+		o.placeholder.update(that, that.placeholder);
+
+	},
+
+	_contactContainers: function(event) {
+		var i, j, dist, itemWithLeastDistance, posProperty, sizeProperty, base, cur, nearBottom, floating,
+			innermostContainer = null,
+			innermostIndex = null;
+
+		// get innermost container that intersects with item
+		for (i = this.containers.length - 1; i >= 0; i--) {
+
+			// never consider a container that's located within the item itself
+			if($.contains(this.currentItem[0], this.containers[i].element[0])) {
+				continue;
+			}
+
+			if(this._intersectsWith(this.containers[i].containerCache)) {
+
+				// if we've already found a container and it's more "inner" than this, then continue
+				if(innermostContainer && $.contains(this.containers[i].element[0], innermostContainer.element[0])) {
+					continue;
+				}
+
+				innermostContainer = this.containers[i];
+				innermostIndex = i;
+
+			} else {
+				// container doesn't intersect. trigger "out" event if necessary
+				if(this.containers[i].containerCache.over) {
+					this.containers[i]._trigger("out", event, this._uiHash(this));
+					this.containers[i].containerCache.over = 0;
+				}
+			}
+
+		}
+
+		// if no intersecting containers found, return
+		if(!innermostContainer) {
+			return;
+		}
+
+		// move the item into the container if it's not there already
+		if(this.containers.length === 1) {
+			if (!this.containers[innermostIndex].containerCache.over) {
+				this.containers[innermostIndex]._trigger("over", event, this._uiHash(this));
+				this.containers[innermostIndex].containerCache.over = 1;
+			}
+		} else {
+
+			//When entering a new container, we will find the item with the least distance and append our item near it
+			dist = 10000;
+			itemWithLeastDistance = null;
+			floating = innermostContainer.floating || isFloating(this.currentItem);
+			posProperty = floating ? "left" : "top";
+			sizeProperty = floating ? "width" : "height";
+			base = this.positionAbs[posProperty] + this.offset.click[posProperty];
+			for (j = this.items.length - 1; j >= 0; j--) {
+				if(!$.contains(this.containers[innermostIndex].element[0], this.items[j].item[0])) {
+					continue;
+				}
+				if(this.items[j].item[0] === this.currentItem[0]) {
+					continue;
+				}
+				if (floating && !isOverAxis(this.positionAbs.top + this.offset.click.top, this.items[j].top, this.items[j].height)) {
+					continue;
+				}
+				cur = this.items[j].item.offset()[posProperty];
+				nearBottom = false;
+				if(Math.abs(cur - base) > Math.abs(cur + this.items[j][sizeProperty] - base)){
+					nearBottom = true;
+					cur += this.items[j][sizeProperty];
+				}
+
+				if(Math.abs(cur - base) < dist) {
+					dist = Math.abs(cur - base); itemWithLeastDistance = this.items[j];
+					this.direction = nearBottom ? "up": "down";
+				}
+			}
+
+			//Check if dropOnEmpty is enabled
+			if(!itemWithLeastDistance && !this.options.dropOnEmpty) {
+				return;
+			}
+
+			if(this.currentContainer === this.containers[innermostIndex]) {
+				return;
+			}
+
+			itemWithLeastDistance ? this._rearrange(event, itemWithLeastDistance, null, true) : this._rearrange(event, null, this.containers[innermostIndex].element, true);
+			this._trigger("change", event, this._uiHash());
+			this.containers[innermostIndex]._trigger("change", event, this._uiHash(this));
+			this.currentContainer = this.containers[innermostIndex];
+
+			//Update the placeholder
+			this.options.placeholder.update(this.currentContainer, this.placeholder);
+
+			this.containers[innermostIndex]._trigger("over", event, this._uiHash(this));
+			this.containers[innermostIndex].containerCache.over = 1;
+		}
+
+
+	},
+
+	_createHelper: function(event) {
+
+		var o = this.options,
+			helper = $.isFunction(o.helper) ? $(o.helper.apply(this.element[0], [event, this.currentItem])) : (o.helper === "clone" ? this.currentItem.clone() : this.currentItem);
+
+		//Add the helper to the DOM if that didn't happen already
+		if(!helper.parents("body").length) {
+			$(o.appendTo !== "parent" ? o.appendTo : this.currentItem[0].parentNode)[0].appendChild(helper[0]);
+		}
+
+		if(helper[0] === this.currentItem[0]) {
+			this._storedCSS = { width: this.currentItem[0].style.width, height: this.currentItem[0].style.height, position: this.currentItem.css("position"), top: this.currentItem.css("top"), left: this.currentItem.css("left") };
+		}
+
+		if(!helper[0].style.width || o.forceHelperSize) {
+			helper.width(this.currentItem.width());
+		}
+		if(!helper[0].style.height || o.forceHelperSize) {
+			helper.height(this.currentItem.height());
+		}
+
+		return helper;
+
+	},
+
+	_adjustOffsetFromHelper: function(obj) {
+		if (typeof obj === "string") {
+			obj = obj.split(" ");
+		}
+		if ($.isArray(obj)) {
+			obj = {left: +obj[0], top: +obj[1] || 0};
+		}
+		if ("left" in obj) {
+			this.offset.click.left = obj.left + this.margins.left;
+		}
+		if ("right" in obj) {
+			this.offset.click.left = this.helperProportions.width - obj.right + this.margins.left;
+		}
+		if ("top" in obj) {
+			this.offset.click.top = obj.top + this.margins.top;
+		}
+		if ("bottom" in obj) {
+			this.offset.click.top = this.helperProportions.height - obj.bottom + this.margins.top;
+		}
+	},
+
+	_getParentOffset: function() {
+
+
+		//Get the offsetParent and cache its position
+		this.offsetParent = this.helper.offsetParent();
+		var po = this.offsetParent.offset();
+
+		// This is a special case where we need to modify a offset calculated on start, since the following happened:
+		// 1. The position of the helper is absolute, so it's position is calculated based on the next positioned parent
+		// 2. The actual offset parent is a child of the scroll parent, and the scroll parent isn't the document, which means that
+		//    the scroll is included in the initial calculation of the offset of the parent, and never recalculated upon drag
+		if(this.cssPosition === "absolute" && this.scrollParent[0] !== document && $.contains(this.scrollParent[0], this.offsetParent[0])) {
+			po.left += this.scrollParent.scrollLeft();
+			po.top += this.scrollParent.scrollTop();
+		}
+
+		// This needs to be actually done for all browsers, since pageX/pageY includes this information
+		// with an ugly IE fix
+		if( this.offsetParent[0] === document.body || (this.offsetParent[0].tagName && this.offsetParent[0].tagName.toLowerCase() === "html" && $.ui.ie)) {
+			po = { top: 0, left: 0 };
+		}
+
+		return {
+			top: po.top + (parseInt(this.offsetParent.css("borderTopWidth"),10) || 0),
+			left: po.left + (parseInt(this.offsetParent.css("borderLeftWidth"),10) || 0)
+		};
+
+	},
+
+	_getRelativeOffset: function() {
+
+		if(this.cssPosition === "relative") {
+			var p = this.currentItem.position();
+			return {
+				top: p.top - (parseInt(this.helper.css("top"),10) || 0) + this.scrollParent.scrollTop(),
+				left: p.left - (parseInt(this.helper.css("left"),10) || 0) + this.scrollParent.scrollLeft()
+			};
+		} else {
+			return { top: 0, left: 0 };
+		}
+
+	},
+
+	_cacheMargins: function() {
+		this.margins = {
+			left: (parseInt(this.currentItem.css("marginLeft"),10) || 0),
+			top: (parseInt(this.currentItem.css("marginTop"),10) || 0)
+		};
+	},
+
+	_cacheHelperProportions: function() {
+		this.helperProportions = {
+			width: this.helper.outerWidth(),
+			height: this.helper.outerHeight()
+		};
+	},
+
+	_setContainment: function() {
+
+		var ce, co, over,
+			o = this.options;
+		if(o.containment === "parent") {
+			o.containment = this.helper[0].parentNode;
+		}
+		if(o.containment === "document" || o.containment === "window") {
+			this.containment = [
+				0 - this.offset.relative.left - this.offset.parent.left,
+				0 - this.offset.relative.top - this.offset.parent.top,
+				$(o.containment === "document" ? document : window).width() - this.helperProportions.width - this.margins.left,
+				($(o.containment === "document" ? document : window).height() || document.body.parentNode.scrollHeight) - this.helperProportions.height - this.margins.top
+			];
+		}
+
+		if(!(/^(document|window|parent)$/).test(o.containment)) {
+			ce = $(o.containment)[0];
+			co = $(o.containment).offset();
+			over = ($(ce).css("overflow") !== "hidden");
+
+			this.containment = [
+				co.left + (parseInt($(ce).css("borderLeftWidth"),10) || 0) + (parseInt($(ce).css("paddingLeft"),10) || 0) - this.margins.left,
+				co.top + (parseInt($(ce).css("borderTopWidth"),10) || 0) + (parseInt($(ce).css("paddingTop"),10) || 0) - this.margins.top,
+				co.left+(over ? Math.max(ce.scrollWidth,ce.offsetWidth) : ce.offsetWidth) - (parseInt($(ce).css("borderLeftWidth"),10) || 0) - (parseInt($(ce).css("paddingRight"),10) || 0) - this.helperProportions.width - this.margins.left,
+				co.top+(over ? Math.max(ce.scrollHeight,ce.offsetHeight) : ce.offsetHeight) - (parseInt($(ce).css("borderTopWidth"),10) || 0) - (parseInt($(ce).css("paddingBottom"),10) || 0) - this.helperProportions.height - this.margins.top
+			];
+		}
+
+	},
+
+	_convertPositionTo: function(d, pos) {
+
+		if(!pos) {
+			pos = this.position;
+		}
+		var mod = d === "absolute" ? 1 : -1,
+			scroll = this.cssPosition === "absolute" && !(this.scrollParent[0] !== document && $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent,
+			scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
+
+		return {
+			top: (
+				pos.top	+																// The absolute mouse position
+				this.offset.relative.top * mod +										// Only for relative positioned nodes: Relative offset from element to offset parent
+				this.offset.parent.top * mod -											// The offsetParent's offset without borders (offset + border)
+				( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ) * mod)
+			),
+			left: (
+				pos.left +																// The absolute mouse position
+				this.offset.relative.left * mod +										// Only for relative positioned nodes: Relative offset from element to offset parent
+				this.offset.parent.left * mod	-										// The offsetParent's offset without borders (offset + border)
+				( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ) * mod)
+			)
+		};
+
+	},
+
+	_generatePosition: function(event) {
+
+		var top, left,
+			o = this.options,
+			pageX = event.pageX,
+			pageY = event.pageY,
+			scroll = this.cssPosition === "absolute" && !(this.scrollParent[0] !== document && $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
+
+		// This is another very weird special case that only happens for relative elements:
+		// 1. If the css position is relative
+		// 2. and the scroll parent is the document or similar to the offset parent
+		// we have to refresh the relative offset during the scroll so there are no jumps
+		if(this.cssPosition === "relative" && !(this.scrollParent[0] !== document && this.scrollParent[0] !== this.offsetParent[0])) {
+			this.offset.relative = this._getRelativeOffset();
+		}
+
+		/*
+		 * - Position constraining -
+		 * Constrain the position to a mix of grid, containment.
+		 */
+
+		if(this.originalPosition) { //If we are not dragging yet, we won't check for options
+
+			if(this.containment) {
+				if(event.pageX - this.offset.click.left < this.containment[0]) {
+					pageX = this.containment[0] + this.offset.click.left;
+				}
+				if(event.pageY - this.offset.click.top < this.containment[1]) {
+					pageY = this.containment[1] + this.offset.click.top;
+				}
+				if(event.pageX - this.offset.click.left > this.containment[2]) {
+					pageX = this.containment[2] + this.offset.click.left;
+				}
+				if(event.pageY - this.offset.click.top > this.containment[3]) {
+					pageY = this.containment[3] + this.offset.click.top;
+				}
+			}
+
+			if(o.grid) {
+				top = this.originalPageY + Math.round((pageY - this.originalPageY) / o.grid[1]) * o.grid[1];
+				pageY = this.containment ? ( (top - this.offset.click.top >= this.containment[1] && top - this.offset.click.top <= this.containment[3]) ? top : ((top - this.offset.click.top >= this.containment[1]) ? top - o.grid[1] : top + o.grid[1])) : top;
+
+				left = this.originalPageX + Math.round((pageX - this.originalPageX) / o.grid[0]) * o.grid[0];
+				pageX = this.containment ? ( (left - this.offset.click.left >= this.containment[0] && left - this.offset.click.left <= this.containment[2]) ? left : ((left - this.offset.click.left >= this.containment[0]) ? left - o.grid[0] : left + o.grid[0])) : left;
+			}
+
+		}
+
+		return {
+			top: (
+				pageY -																// The absolute mouse position
+				this.offset.click.top -													// Click offset (relative to the element)
+				this.offset.relative.top	-											// Only for relative positioned nodes: Relative offset from element to offset parent
+				this.offset.parent.top +												// The offsetParent's offset without borders (offset + border)
+				( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ))
+			),
+			left: (
+				pageX -																// The absolute mouse position
+				this.offset.click.left -												// Click offset (relative to the element)
+				this.offset.relative.left	-											// Only for relative positioned nodes: Relative offset from element to offset parent
+				this.offset.parent.left +												// The offsetParent's offset without borders (offset + border)
+				( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ))
+			)
+		};
+
+	},
+
+	_rearrange: function(event, i, a, hardRefresh) {
+
+		a ? a[0].appendChild(this.placeholder[0]) : i.item[0].parentNode.insertBefore(this.placeholder[0], (this.direction === "down" ? i.item[0] : i.item[0].nextSibling));
+
+		//Various things done here to improve the performance:
+		// 1. we create a setTimeout, that calls refreshPositions
+		// 2. on the instance, we have a counter variable, that get's higher after every append
+		// 3. on the local scope, we copy the counter variable, and check in the timeout, if it's still the same
+		// 4. this lets only the last addition to the timeout stack through
+		this.counter = this.counter ? ++this.counter : 1;
+		var counter = this.counter;
+
+		this._delay(function() {
+			if(counter === this.counter) {
+				this.refreshPositions(!hardRefresh); //Precompute after each DOM insertion, NOT on mousemove
+			}
+		});
+
+	},
+
+	_clear: function(event, noPropagation) {
+
+		this.reverting = false;
+		// We delay all events that have to be triggered to after the point where the placeholder has been removed and
+		// everything else normalized again
+		var i,
+			delayedTriggers = [];
+
+		// We first have to update the dom position of the actual currentItem
+		// Note: don't do it if the current item is already removed (by a user), or it gets reappended (see #4088)
+		if(!this._noFinalSort && this.currentItem.parent().length) {
+			this.placeholder.before(this.currentItem);
+		}
+		this._noFinalSort = null;
+
+		if(this.helper[0] === this.currentItem[0]) {
+			for(i in this._storedCSS) {
+				if(this._storedCSS[i] === "auto" || this._storedCSS[i] === "static") {
+					this._storedCSS[i] = "";
+				}
+			}
+			this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper");
+		} else {
+			this.currentItem.show();
+		}
+
+		if(this.fromOutside && !noPropagation) {
+			delayedTriggers.push(function(event) { this._trigger("receive", event, this._uiHash(this.fromOutside)); });
+		}
+		if((this.fromOutside || this.domPosition.prev !== this.currentItem.prev().not(".ui-sortable-helper")[0] || this.domPosition.parent !== this.currentItem.parent()[0]) && !noPropagation) {
+			delayedTriggers.push(function(event) { this._trigger("update", event, this._uiHash()); }); //Trigger update callback if the DOM position has changed
+		}
+
+		// Check if the items Container has Changed and trigger appropriate
+		// events.
+		if (this !== this.currentContainer) {
+			if(!noPropagation) {
+				delayedTriggers.push(function(event) { this._trigger("remove", event, this._uiHash()); });
+				delayedTriggers.push((function(c) { return function(event) { c._trigger("receive", event, this._uiHash(this)); };  }).call(this, this.currentContainer));
+				delayedTriggers.push((function(c) { return function(event) { c._trigger("update", event, this._uiHash(this));  }; }).call(this, this.currentContainer));
+			}
+		}
+
+
+		//Post events to containers
+		for (i = this.containers.length - 1; i >= 0; i--){
+			if(!noPropagation) {
+				delayedTriggers.push((function(c) { return function(event) { c._trigger("deactivate", event, this._uiHash(this)); };  }).call(this, this.containers[i]));
+			}
+			if(this.containers[i].containerCache.over) {
+				delayedTriggers.push((function(c) { return function(event) { c._trigger("out", event, this._uiHash(this)); };  }).call(this, this.containers[i]));
+				this.containers[i].containerCache.over = 0;
+			}
+		}
+
+		//Do what was originally in plugins
+		if ( this.storedCursor ) {
+			this.document.find( "body" ).css( "cursor", this.storedCursor );
+			this.storedStylesheet.remove();
+		}
+		if(this._storedOpacity) {
+			this.helper.css("opacity", this._storedOpacity);
+		}
+		if(this._storedZIndex) {
+			this.helper.css("zIndex", this._storedZIndex === "auto" ? "" : this._storedZIndex);
+		}
+
+		this.dragging = false;
+		if(this.cancelHelperRemoval) {
+			if(!noPropagation) {
+				this._trigger("beforeStop", event, this._uiHash());
+				for (i=0; i < delayedTriggers.length; i++) {
+					delayedTriggers[i].call(this, event);
+				} //Trigger all delayed events
+				this._trigger("stop", event, this._uiHash());
+			}
+
+			this.fromOutside = false;
+			return false;
+		}
+
+		if(!noPropagation) {
+			this._trigger("beforeStop", event, this._uiHash());
+		}
+
+		//$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately, it unbinds ALL events from the original node!
+		this.placeholder[0].parentNode.removeChild(this.placeholder[0]);
+
+		if(this.helper[0] !== this.currentItem[0]) {
+			this.helper.remove();
+		}
+		this.helper = null;
+
+		if(!noPropagation) {
+			for (i=0; i < delayedTriggers.length; i++) {
+				delayedTriggers[i].call(this, event);
+			} //Trigger all delayed events
+			this._trigger("stop", event, this._uiHash());
+		}
+
+		this.fromOutside = false;
+		return true;
+
+	},
+
+	_trigger: function() {
+		if ($.Widget.prototype._trigger.apply(this, arguments) === false) {
+			this.cancel();
+		}
+	},
+
+	_uiHash: function(_inst) {
+		var inst = _inst || this;
+		return {
+			helper: inst.helper,
+			placeholder: inst.placeholder || $([]),
+			position: inst.position,
+			originalPosition: inst.originalPosition,
+			offset: inst.positionAbs,
+			item: inst.currentItem,
+			sender: _inst ? _inst.element : null
+		};
+	}
+
+});
+
+})(jQuery);
+
+(function($, undefined) {
+
+var dataSpace = "ui-effects-";
+
+$.effects = {
+	effect: {}
+};
+
+/*!
+ * jQuery Color Animations v2.1.2
+ * https://github.com/jquery/jquery-color
+ *
+ * Copyright 2013 jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ *
+ * Date: Wed Jan 16 08:47:09 2013 -0600
+ */
+(function( jQuery, undefined ) {
+
+	var stepHooks = "backgroundColor borderBottomColor borderLeftColor borderRightColor borderTopColor color columnRuleColor outlineColor textDecorationColor textEmphasisColor",
+
+	// plusequals test for += 100 -= 100
+	rplusequals = /^([\-+])=\s*(\d+\.?\d*)/,
+	// a set of RE's that can match strings and generate color tuples.
+	stringParsers = [{
+			re: /rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,
+			parse: function( execResult ) {
+				return [
+					execResult[ 1 ],
+					execResult[ 2 ],
+					execResult[ 3 ],
+					execResult[ 4 ]
+				];
+			}
+		}, {
+			re: /rgba?\(\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,
+			parse: function( execResult ) {
+				return [
+					execResult[ 1 ] * 2.55,
+					execResult[ 2 ] * 2.55,
+					execResult[ 3 ] * 2.55,
+					execResult[ 4 ]
+				];
+			}
+		}, {
+			// this regex ignores A-F because it's compared against an already lowercased string
+			re: /#([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})/,
+			parse: function( execResult ) {
+				return [
+					parseInt( execResult[ 1 ], 16 ),
+					parseInt( execResult[ 2 ], 16 ),
+					parseInt( execResult[ 3 ], 16 )
+				];
+			}
+		}, {
+			// this regex ignores A-F because it's compared against an already lowercased string
+			re: /#([a-f0-9])([a-f0-9])([a-f0-9])/,
+			parse: function( execResult ) {
+				return [
+					parseInt( execResult[ 1 ] + execResult[ 1 ], 16 ),
+					parseInt( execResult[ 2 ] + execResult[ 2 ], 16 ),
+					parseInt( execResult[ 3 ] + execResult[ 3 ], 16 )
+				];
+			}
+		}, {
+			re: /hsla?\(\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,
+			space: "hsla",
+			parse: function( execResult ) {
+				return [
+					execResult[ 1 ],
+					execResult[ 2 ] / 100,
+					execResult[ 3 ] / 100,
+					execResult[ 4 ]
+				];
+			}
+		}],
+
+	// jQuery.Color( )
+	color = jQuery.Color = function( color, green, blue, alpha ) {
+		return new jQuery.Color.fn.parse( color, green, blue, alpha );
+	},
+	spaces = {
+		rgba: {
+			props: {
+				red: {
+					idx: 0,
+					type: "byte"
+				},
+				green: {
+					idx: 1,
+					type: "byte"
+				},
+				blue: {
+					idx: 2,
+					type: "byte"
+				}
+			}
+		},
+
+		hsla: {
+			props: {
+				hue: {
+					idx: 0,
+					type: "degrees"
+				},
+				saturation: {
+					idx: 1,
+					type: "percent"
+				},
+				lightness: {
+					idx: 2,
+					type: "percent"
+				}
+			}
+		}
+	},
+	propTypes = {
+		"byte": {
+			floor: true,
+			max: 255
+		},
+		"percent": {
+			max: 1
+		},
+		"degrees": {
+			mod: 360,
+			floor: true
+		}
+	},
+	support = color.support = {},
+
+	// element for support tests
+	supportElem = jQuery( "<p>" )[ 0 ],
+
+	// colors = jQuery.Color.names
+	colors,
+
+	// local aliases of functions called often
+	each = jQuery.each;
+
+// determine rgba support immediately
+supportElem.style.cssText = "background-color:rgba(1,1,1,.5)";
+support.rgba = supportElem.style.backgroundColor.indexOf( "rgba" ) > -1;
+
+// define cache name and alpha properties
+// for rgba and hsla spaces
+each( spaces, function( spaceName, space ) {
+	space.cache = "_" + spaceName;
+	space.props.alpha = {
+		idx: 3,
+		type: "percent",
+		def: 1
+	};
+});
+
+function clamp( value, prop, allowEmpty ) {
+	var type = propTypes[ prop.type ] || {};
+
+	if ( value == null ) {
+		return (allowEmpty || !prop.def) ? null : prop.def;
+	}
+
+	// ~~ is an short way of doing floor for positive numbers
+	value = type.floor ? ~~value : parseFloat( value );
+
+	// IE will pass in empty strings as value for alpha,
+	// which will hit this case
+	if ( isNaN( value ) ) {
+		return prop.def;
+	}
+
+	if ( type.mod ) {
+		// we add mod before modding to make sure that negatives values
+		// get converted properly: -10 -> 350
+		return (value + type.mod) % type.mod;
+	}
+
+	// for now all property types without mod have min and max
+	return 0 > value ? 0 : type.max < value ? type.max : value;
+}
+
+function stringParse( string ) {
+	var inst = color(),
+		rgba = inst._rgba = [];
+
+	string = string.toLowerCase();
+
+	each( stringParsers, function( i, parser ) {
+		var parsed,
+			match = parser.re.exec( string ),
+			values = match && parser.parse( match ),
+			spaceName = parser.space || "rgba";
+
+		if ( values ) {
+			parsed = inst[ spaceName ]( values );
+
+			// if this was an rgba parse the assignment might happen twice
+			// oh well....
+			inst[ spaces[ spaceName ].cache ] = parsed[ spaces[ spaceName ].cache ];
+			rgba = inst._rgba = parsed._rgba;
+
+			// exit each( stringParsers ) here because we matched
+			return false;
+		}
+	});
+
+	// Found a stringParser that handled it
+	if ( rgba.length ) {
+
+		// if this came from a parsed string, force "transparent" when alpha is 0
+		// chrome, (and maybe others) return "transparent" as rgba(0,0,0,0)
+		if ( rgba.join() === "0,0,0,0" ) {
+			jQuery.extend( rgba, colors.transparent );
+		}
+		return inst;
+	}
+
+	// named colors
+	return colors[ string ];
+}
+
+color.fn = jQuery.extend( color.prototype, {
+	parse: function( red, green, blue, alpha ) {
+		if ( red === undefined ) {
+			this._rgba = [ null, null, null, null ];
+			return this;
+		}
+		if ( red.jquery || red.nodeType ) {
+			red = jQuery( red ).css( green );
+			green = undefined;
+		}
+
+		var inst = this,
+			type = jQuery.type( red ),
+			rgba = this._rgba = [];
+
+		// more than 1 argument specified - assume ( red, green, blue, alpha )
+		if ( green !== undefined ) {
+			red = [ red, green, blue, alpha ];
+			type = "array";
+		}
+
+		if ( type === "string" ) {
+			return this.parse( stringParse( red ) || colors._default );
+		}
+
+		if ( type === "array" ) {
+			each( spaces.rgba.props, function( key, prop ) {
+				rgba[ prop.idx ] = clamp( red[ prop.idx ], prop );
+			});
+			return this;
+		}
+
+		if ( type === "object" ) {
+			if ( red instanceof color ) {
+				each( spaces, function( spaceName, space ) {
+					if ( red[ space.cache ] ) {
+						inst[ space.cache ] = red[ space.cache ].slice();
+					}
+				});
+			} else {
+				each( spaces, function( spaceName, space ) {
+					var cache = space.cache;
+					each( space.props, function( key, prop ) {
+
+						// if the cache doesn't exist, and we know how to convert
+						if ( !inst[ cache ] && space.to ) {
+
+							// if the value was null, we don't need to copy it
+							// if the key was alpha, we don't need to copy it either
+							if ( key === "alpha" || red[ key ] == null ) {
+								return;
+							}
+							inst[ cache ] = space.to( inst._rgba );
+						}
+
+						// this is the only case where we allow nulls for ALL properties.
+						// call clamp with alwaysAllowEmpty
+						inst[ cache ][ prop.idx ] = clamp( red[ key ], prop, true );
+					});
+
+					// everything defined but alpha?
+					if ( inst[ cache ] && jQuery.inArray( null, inst[ cache ].slice( 0, 3 ) ) < 0 ) {
+						// use the default of 1
+						inst[ cache ][ 3 ] = 1;
+						if ( space.from ) {
+							inst._rgba = space.from( inst[ cache ] );
+						}
+					}
+				});
+			}
+			return this;
+		}
+	},
+	is: function( compare ) {
+		var is = color( compare ),
+			same = true,
+			inst = this;
+
+		each( spaces, function( _, space ) {
+			var localCache,
+				isCache = is[ space.cache ];
+			if (isCache) {
+				localCache = inst[ space.cache ] || space.to && space.to( inst._rgba ) || [];
+				each( space.props, function( _, prop ) {
+					if ( isCache[ prop.idx ] != null ) {
+						same = ( isCache[ prop.idx ] === localCache[ prop.idx ] );
+						return same;
+					}
+				});
+			}
+			return same;
+		});
+		return same;
+	},
+	_space: function() {
+		var used = [],
+			inst = this;
+		each( spaces, function( spaceName, space ) {
+			if ( inst[ space.cache ] ) {
+				used.push( spaceName );
+			}
+		});
+		return used.pop();
+	},
+	transition: function( other, distance ) {
+		var end = color( other ),
+			spaceName = end._space(),
+			space = spaces[ spaceName ],
+			startColor = this.alpha() === 0 ? color( "transparent" ) : this,
+			start = startColor[ space.cache ] || space.to( startColor._rgba ),
+			result = start.slice();
+
+		end = end[ space.cache ];
+		each( space.props, function( key, prop ) {
+			var index = prop.idx,
+				startValue = start[ index ],
+				endValue = end[ index ],
+				type = propTypes[ prop.type ] || {};
+
+			// if null, don't override start value
+			if ( endValue === null ) {
+				return;
+			}
+			// if null - use end
+			if ( startValue === null ) {
+				result[ index ] = endValue;
+			} else {
+				if ( type.mod ) {
+					if ( endValue - startValue > type.mod / 2 ) {
+						startValue += type.mod;
+					} else if ( startValue - endValue > type.mod / 2 ) {
+						startValue -= type.mod;
+					}
+				}
+				result[ index ] = clamp( ( endValue - startValue ) * distance + startValue, prop );
+			}
+		});
+		return this[ spaceName ]( result );
+	},
+	blend: function( opaque ) {
+		// if we are already opaque - return ourself
+		if ( this._rgba[ 3 ] === 1 ) {
+			return this;
+		}
+
+		var rgb = this._rgba.slice(),
+			a = rgb.pop(),
+			blend = color( opaque )._rgba;
+
+		return color( jQuery.map( rgb, function( v, i ) {
+			return ( 1 - a ) * blend[ i ] + a * v;
+		}));
+	},
+	toRgbaString: function() {
+		var prefix = "rgba(",
+			rgba = jQuery.map( this._rgba, function( v, i ) {
+				return v == null ? ( i > 2 ? 1 : 0 ) : v;
+			});
+
+		if ( rgba[ 3 ] === 1 ) {
+			rgba.pop();
+			prefix = "rgb(";
+		}
+
+		return prefix + rgba.join() + ")";
+	},
+	toHslaString: function() {
+		var prefix = "hsla(",
+			hsla = jQuery.map( this.hsla(), function( v, i ) {
+				if ( v == null ) {
+					v = i > 2 ? 1 : 0;
+				}
+
+				// catch 1 and 2
+				if ( i && i < 3 ) {
+					v = Math.round( v * 100 ) + "%";
+				}
+				return v;
+			});
+
+		if ( hsla[ 3 ] === 1 ) {
+			hsla.pop();
+			prefix = "hsl(";
+		}
+		return prefix + hsla.join() + ")";
+	},
+	toHexString: function( includeAlpha ) {
+		var rgba = this._rgba.slice(),
+			alpha = rgba.pop();
+
+		if ( includeAlpha ) {
+			rgba.push( ~~( alpha * 255 ) );
+		}
+
+		return "#" + jQuery.map( rgba, function( v ) {
+
+			// default to 0 when nulls exist
+			v = ( v || 0 ).toString( 16 );
+			return v.length === 1 ? "0" + v : v;
+		}).join("");
+	},
+	toString: function() {
+		return this._rgba[ 3 ] === 0 ? "transparent" : this.toRgbaString();
+	}
+});
+color.fn.parse.prototype = color.fn;
+
+// hsla conversions adapted from:
+// https://code.google.com/p/maashaack/source/browse/packages/graphics/trunk/src/graphics/colors/HUE2RGB.as?r=5021
+
+function hue2rgb( p, q, h ) {
+	h = ( h + 1 ) % 1;
+	if ( h * 6 < 1 ) {
+		return p + (q - p) * h * 6;
+	}
+	if ( h * 2 < 1) {
+		return q;
+	}
+	if ( h * 3 < 2 ) {
+		return p + (q - p) * ((2/3) - h) * 6;
+	}
+	return p;
+}
+
+spaces.hsla.to = function ( rgba ) {
+	if ( rgba[ 0 ] == null || rgba[ 1 ] == null || rgba[ 2 ] == null ) {
+		return [ null, null, null, rgba[ 3 ] ];
+	}
+	var r = rgba[ 0 ] / 255,
+		g = rgba[ 1 ] / 255,
+		b = rgba[ 2 ] / 255,
+		a = rgba[ 3 ],
+		max = Math.max( r, g, b ),
+		min = Math.min( r, g, b ),
+		diff = max - min,
+		add = max + min,
+		l = add * 0.5,
+		h, s;
+
+	if ( min === max ) {
+		h = 0;
+	} else if ( r === max ) {
+		h = ( 60 * ( g - b ) / diff ) + 360;
+	} else if ( g === max ) {
+		h = ( 60 * ( b - r ) / diff ) + 120;
+	} else {
+		h = ( 60 * ( r - g ) / diff ) + 240;
+	}
+
+	// chroma (diff) == 0 means greyscale which, by definition, saturation = 0%
+	// otherwise, saturation is based on the ratio of chroma (diff) to lightness (add)
+	if ( diff === 0 ) {
+		s = 0;
+	} else if ( l <= 0.5 ) {
+		s = diff / add;
+	} else {
+		s = diff / ( 2 - add );
+	}
+	return [ Math.round(h) % 360, s, l, a == null ? 1 : a ];
+};
+
+spaces.hsla.from = function ( hsla ) {
+	if ( hsla[ 0 ] == null || hsla[ 1 ] == null || hsla[ 2 ] == null ) {
+		return [ null, null, null, hsla[ 3 ] ];
+	}
+	var h = hsla[ 0 ] / 360,
+		s = hsla[ 1 ],
+		l = hsla[ 2 ],
+		a = hsla[ 3 ],
+		q = l <= 0.5 ? l * ( 1 + s ) : l + s - l * s,
+		p = 2 * l - q;
+
+	return [
+		Math.round( hue2rgb( p, q, h + ( 1 / 3 ) ) * 255 ),
+		Math.round( hue2rgb( p, q, h ) * 255 ),
+		Math.round( hue2rgb( p, q, h - ( 1 / 3 ) ) * 255 ),
+		a
+	];
+};
+
+
+each( spaces, function( spaceName, space ) {
+	var props = space.props,
+		cache = space.cache,
+		to = space.to,
+		from = space.from;
+
+	// makes rgba() and hsla()
+	color.fn[ spaceName ] = function( value ) {
+
+		// generate a cache for this space if it doesn't exist
+		if ( to && !this[ cache ] ) {
+			this[ cache ] = to( this._rgba );
+		}
+		if ( value === undefined ) {
+			return this[ cache ].slice();
+		}
+
+		var ret,
+			type = jQuery.type( value ),
+			arr = ( type === "array" || type === "object" ) ? value : arguments,
+			local = this[ cache ].slice();
+
+		each( props, function( key, prop ) {
+			var val = arr[ type === "object" ? key : prop.idx ];
+			if ( val == null ) {
+				val = local[ prop.idx ];
+			}
+			local[ prop.idx ] = clamp( val, prop );
+		});
+
+		if ( from ) {
+			ret = color( from( local ) );
+			ret[ cache ] = local;
+			return ret;
+		} else {
+			return color( local );
+		}
+	};
+
+	// makes red() green() blue() alpha() hue() saturation() lightness()
+	each( props, function( key, prop ) {
+		// alpha is included in more than one space
+		if ( color.fn[ key ] ) {
+			return;
+		}
+		color.fn[ key ] = function( value ) {
+			var vtype = jQuery.type( value ),
+				fn = ( key === "alpha" ? ( this._hsla ? "hsla" : "rgba" ) : spaceName ),
+				local = this[ fn ](),
+				cur = local[ prop.idx ],
+				match;
+
+			if ( vtype === "undefined" ) {
+				return cur;
+			}
+
+			if ( vtype === "function" ) {
+				value = value.call( this, cur );
+				vtype = jQuery.type( value );
+			}
+			if ( value == null && prop.empty ) {
+				return this;
+			}
+			if ( vtype === "string" ) {
+				match = rplusequals.exec( value );
+				if ( match ) {
+					value = cur + parseFloat( match[ 2 ] ) * ( match[ 1 ] === "+" ? 1 : -1 );
+				}
+			}
+			local[ prop.idx ] = value;
+			return this[ fn ]( local );
+		};
+	});
+});
+
+// add cssHook and .fx.step function for each named hook.
+// accept a space separated string of properties
+color.hook = function( hook ) {
+	var hooks = hook.split( " " );
+	each( hooks, function( i, hook ) {
+		jQuery.cssHooks[ hook ] = {
+			set: function( elem, value ) {
+				var parsed, curElem,
+					backgroundColor = "";
+
+				if ( value !== "transparent" && ( jQuery.type( value ) !== "string" || ( parsed = stringParse( value ) ) ) ) {
+					value = color( parsed || value );
+					if ( !support.rgba && value._rgba[ 3 ] !== 1 ) {
+						curElem = hook === "backgroundColor" ? elem.parentNode : elem;
+						while (
+							(backgroundColor === "" || backgroundColor === "transparent") &&
+							curElem && curElem.style
+						) {
+							try {
+								backgroundColor = jQuery.css( curElem, "backgroundColor" );
+								curElem = curElem.parentNode;
+							} catch ( e ) {
+							}
+						}
+
+						value = value.blend( backgroundColor && backgroundColor !== "transparent" ?
+							backgroundColor :
+							"_default" );
+					}
+
+					value = value.toRgbaString();
+				}
+				try {
+					elem.style[ hook ] = value;
+				} catch( e ) {
+					// wrapped to prevent IE from throwing errors on "invalid" values like 'auto' or 'inherit'
+				}
+			}
+		};
+		jQuery.fx.step[ hook ] = function( fx ) {
+			if ( !fx.colorInit ) {
+				fx.start = color( fx.elem, hook );
+				fx.end = color( fx.end );
+				fx.colorInit = true;
+			}
+			jQuery.cssHooks[ hook ].set( fx.elem, fx.start.transition( fx.end, fx.pos ) );
+		};
+	});
+
+};
+
+color.hook( stepHooks );
+
+jQuery.cssHooks.borderColor = {
+	expand: function( value ) {
+		var expanded = {};
+
+		each( [ "Top", "Right", "Bottom", "Left" ], function( i, part ) {
+			expanded[ "border" + part + "Color" ] = value;
+		});
+		return expanded;
+	}
+};
+
+// Basic color names only.
+// Usage of any of the other color names requires adding yourself or including
+// jquery.color.svg-names.js.
+colors = jQuery.Color.names = {
+	// 4.1. Basic color keywords
+	aqua: "#00ffff",
+	black: "#000000",
+	blue: "#0000ff",
+	fuchsia: "#ff00ff",
+	gray: "#808080",
+	green: "#008000",
+	lime: "#00ff00",
+	maroon: "#800000",
+	navy: "#000080",
+	olive: "#808000",
+	purple: "#800080",
+	red: "#ff0000",
+	silver: "#c0c0c0",
+	teal: "#008080",
+	white: "#ffffff",
+	yellow: "#ffff00",
+
+	// 4.2.3. "transparent" color keyword
+	transparent: [ null, null, null, 0 ],
+
+	_default: "#ffffff"
+};
+
+})( jQuery );
+
+
+/******************************************************************************/
+/****************************** CLASS ANIMATIONS ******************************/
+/******************************************************************************/
+(function() {
+
+var classAnimationActions = [ "add", "remove", "toggle" ],
+	shorthandStyles = {
+		border: 1,
+		borderBottom: 1,
+		borderColor: 1,
+		borderLeft: 1,
+		borderRight: 1,
+		borderTop: 1,
+		borderWidth: 1,
+		margin: 1,
+		padding: 1
+	};
+
+$.each([ "borderLeftStyle", "borderRightStyle", "borderBottomStyle", "borderTopStyle" ], function( _, prop ) {
+	$.fx.step[ prop ] = function( fx ) {
+		if ( fx.end !== "none" && !fx.setAttr || fx.pos === 1 && !fx.setAttr ) {
+			jQuery.style( fx.elem, prop, fx.end );
+			fx.setAttr = true;
+		}
+	};
+});
+
+function getElementStyles( elem ) {
+	var key, len,
+		style = elem.ownerDocument.defaultView ?
+			elem.ownerDocument.defaultView.getComputedStyle( elem, null ) :
+			elem.currentStyle,
+		styles = {};
+
+	if ( style && style.length && style[ 0 ] && style[ style[ 0 ] ] ) {
+		len = style.length;
+		while ( len-- ) {
+			key = style[ len ];
+			if ( typeof style[ key ] === "string" ) {
+				styles[ $.camelCase( key ) ] = style[ key ];
+			}
+		}
+	// support: Opera, IE <9
+	} else {
+		for ( key in style ) {
+			if ( typeof style[ key ] === "string" ) {
+				styles[ key ] = style[ key ];
+			}
+		}
+	}
+
+	return styles;
+}
+
+
+function styleDifference( oldStyle, newStyle ) {
+	var diff = {},
+		name, value;
+
+	for ( name in newStyle ) {
+		value = newStyle[ name ];
+		if ( oldStyle[ name ] !== value ) {
+			if ( !shorthandStyles[ name ] ) {
+				if ( $.fx.step[ name ] || !isNaN( parseFloat( value ) ) ) {
+					diff[ name ] = value;
+				}
+			}
+		}
+	}
+
+	return diff;
+}
+
+// support: jQuery <1.8
+if ( !$.fn.addBack ) {
+	$.fn.addBack = function( selector ) {
+		return this.add( selector == null ?
+			this.prevObject : this.prevObject.filter( selector )
+		);
+	};
+}
+
+$.effects.animateClass = function( value, duration, easing, callback ) {
+	var o = $.speed( duration, easing, callback );
+
+	return this.queue( function() {
+		var animated = $( this ),
+			baseClass = animated.attr( "class" ) || "",
+			applyClassChange,
+			allAnimations = o.children ? animated.find( "*" ).addBack() : animated;
+
+		// map the animated objects to store the original styles.
+		allAnimations = allAnimations.map(function() {
+			var el = $( this );
+			return {
+				el: el,
+				start: getElementStyles( this )
+			};
+		});
+
+		// apply class change
+		applyClassChange = function() {
+			$.each( classAnimationActions, function(i, action) {
+				if ( value[ action ] ) {
+					animated[ action + "Class" ]( value[ action ] );
+				}
+			});
+		};
+		applyClassChange();
+
+		// map all animated objects again - calculate new styles and diff
+		allAnimations = allAnimations.map(function() {
+			this.end = getElementStyles( this.el[ 0 ] );
+			this.diff = styleDifference( this.start, this.end );
+			return this;
+		});
+
+		// apply original class
+		animated.attr( "class", baseClass );
+
+		// map all animated objects again - this time collecting a promise
+		allAnimations = allAnimations.map(function() {
+			var styleInfo = this,
+				dfd = $.Deferred(),
+				opts = $.extend({}, o, {
+					queue: false,
+					complete: function() {
+						dfd.resolve( styleInfo );
+					}
+				});
+
+			this.el.animate( this.diff, opts );
+			return dfd.promise();
+		});
+
+		// once all animations have completed:
+		$.when.apply( $, allAnimations.get() ).done(function() {
+
+			// set the final class
+			applyClassChange();
+
+			// for each animated element,
+			// clear all css properties that were animated
+			$.each( arguments, function() {
+				var el = this.el;
+				$.each( this.diff, function(key) {
+					el.css( key, "" );
+				});
+			});
+
+			// this is guarnteed to be there if you use jQuery.speed()
+			// it also handles dequeuing the next anim...
+			o.complete.call( animated[ 0 ] );
+		});
+	});
+};
+
+$.fn.extend({
+	addClass: (function( orig ) {
+		return function( classNames, speed, easing, callback ) {
+			return speed ?
+				$.effects.animateClass.call( this,
+					{ add: classNames }, speed, easing, callback ) :
+				orig.apply( this, arguments );
+		};
+	})( $.fn.addClass ),
+
+	removeClass: (function( orig ) {
+		return function( classNames, speed, easing, callback ) {
+			return arguments.length > 1 ?
+				$.effects.animateClass.call( this,
+					{ remove: classNames }, speed, easing, callback ) :
+				orig.apply( this, arguments );
+		};
+	})( $.fn.removeClass ),
+
+	toggleClass: (function( orig ) {
+		return function( classNames, force, speed, easing, callback ) {
+			if ( typeof force === "boolean" || force === undefined ) {
+				if ( !speed ) {
+					// without speed parameter
+					return orig.apply( this, arguments );
+				} else {
+					return $.effects.animateClass.call( this,
+						(force ? { add: classNames } : { remove: classNames }),
+						speed, easing, callback );
+				}
+			} else {
+				// without force parameter
+				return $.effects.animateClass.call( this,
+					{ toggle: classNames }, force, speed, easing );
+			}
+		};
+	})( $.fn.toggleClass ),
+
+	switchClass: function( remove, add, speed, easing, callback) {
+		return $.effects.animateClass.call( this, {
+			add: add,
+			remove: remove
+		}, speed, easing, callback );
+	}
+});
+
+})();
+
+/******************************************************************************/
+/*********************************** EFFECTS **********************************/
+/******************************************************************************/
+
+(function() {
+
+$.extend( $.effects, {
+	version: "1.10.3",
+
+	// Saves a set of properties in a data storage
+	save: function( element, set ) {
+		for( var i=0; i < set.length; i++ ) {
+			if ( set[ i ] !== null ) {
+				element.data( dataSpace + set[ i ], element[ 0 ].style[ set[ i ] ] );
+			}
+		}
+	},
+
+	// Restores a set of previously saved properties from a data storage
+	restore: function( element, set ) {
+		var val, i;
+		for( i=0; i < set.length; i++ ) {
+			if ( set[ i ] !== null ) {
+				val = element.data( dataSpace + set[ i ] );
+				// support: jQuery 1.6.2
+				// http://bugs.jquery.com/ticket/9917
+				// jQuery 1.6.2 incorrectly returns undefined for any falsy value.
+				// We can't differentiate between "" and 0 here, so we just assume
+				// empty string since it's likely to be a more common value...
+				if ( val === undefined ) {
+					val = "";
+				}
+				element.css( set[ i ], val );
+			}
+		}
+	},
+
+	setMode: function( el, mode ) {
+		if (mode === "toggle") {
+			mode = el.is( ":hidden" ) ? "show" : "hide";
+		}
+		return mode;
+	},
+
+	// Translates a [top,left] array into a baseline value
+	// this should be a little more flexible in the future to handle a string & hash
+	getBaseline: function( origin, original ) {
+		var y, x;
+		switch ( origin[ 0 ] ) {
+			case "top": y = 0; break;
+			case "middle": y = 0.5; break;
+			case "bottom": y = 1; break;
+			default: y = origin[ 0 ] / original.height;
+		}
+		switch ( origin[ 1 ] ) {
+			case "left": x = 0; break;
+			case "center": x = 0.5; break;
+			case "right": x = 1; break;
+			default: x = origin[ 1 ] / original.width;
+		}
+		return {
+			x: x,
+			y: y
+		};
+	},
+
+	// Wraps the element around a wrapper that copies position properties
+	createWrapper: function( element ) {
+
+		// if the element is already wrapped, return it
+		if ( element.parent().is( ".ui-effects-wrapper" )) {
+			return element.parent();
+		}
+
+		// wrap the element
+		var props = {
+				width: element.outerWidth(true),
+				height: element.outerHeight(true),
+				"float": element.css( "float" )
+			},
+			wrapper = $( "<div></div>" )
+				.addClass( "ui-effects-wrapper" )
+				.css({
+					fontSize: "100%",
+					background: "transparent",
+					border: "none",
+					margin: 0,
+					padding: 0
+				}),
+			// Store the size in case width/height are defined in % - Fixes #5245
+			size = {
+				width: element.width(),
+				height: element.height()
+			},
+			active = document.activeElement;
+
+		// support: Firefox
+		// Firefox incorrectly exposes anonymous content
+		// https://bugzilla.mozilla.org/show_bug.cgi?id=561664
+		try {
+			active.id;
+		} catch( e ) {
+			active = document.body;
+		}
+
+		element.wrap( wrapper );
+
+		// Fixes #7595 - Elements lose focus when wrapped.
+		if ( element[ 0 ] === active || $.contains( element[ 0 ], active ) ) {
+			$( active ).focus();
+		}
+
+		wrapper = element.parent(); //Hotfix for jQuery 1.4 since some change in wrap() seems to actually lose the reference to the wrapped element
+
+		// transfer positioning properties to the wrapper
+		if ( element.css( "position" ) === "static" ) {
+			wrapper.css({ position: "relative" });
+			element.css({ position: "relative" });
+		} else {
+			$.extend( props, {
+				position: element.css( "position" ),
+				zIndex: element.css( "z-index" )
+			});
+			$.each([ "top", "left", "bottom", "right" ], function(i, pos) {
+				props[ pos ] = element.css( pos );
+				if ( isNaN( parseInt( props[ pos ], 10 ) ) ) {
+					props[ pos ] = "auto";
+				}
+			});
+			element.css({
+				position: "relative",
+				top: 0,
+				left: 0,
+				right: "auto",
+				bottom: "auto"
+			});
+		}
+		element.css(size);
+
+		return wrapper.css( props ).show();
+	},
+
+	removeWrapper: function( element ) {
+		var active = document.activeElement;
+
+		if ( element.parent().is( ".ui-effects-wrapper" ) ) {
+			element.parent().replaceWith( element );
+
+			// Fixes #7595 - Elements lose focus when wrapped.
+			if ( element[ 0 ] === active || $.contains( element[ 0 ], active ) ) {
+				$( active ).focus();
+			}
+		}
+
+
+		return element;
+	},
+
+	setTransition: function( element, list, factor, value ) {
+		value = value || {};
+		$.each( list, function( i, x ) {
+			var unit = element.cssUnit( x );
+			if ( unit[ 0 ] > 0 ) {
+				value[ x ] = unit[ 0 ] * factor + unit[ 1 ];
+			}
+		});
+		return value;
+	}
+});
+
+// return an effect options object for the given parameters:
+function _normalizeArguments( effect, options, speed, callback ) {
+
+	// allow passing all options as the first parameter
+	if ( $.isPlainObject( effect ) ) {
+		options = effect;
+		effect = effect.effect;
+	}
+
+	// convert to an object
+	effect = { effect: effect };
+
+	// catch (effect, null, ...)
+	if ( options == null ) {
+		options = {};
+	}
+
+	// catch (effect, callback)
+	if ( $.isFunction( options ) ) {
+		callback = options;
+		speed = null;
+		options = {};
+	}
+
+	// catch (effect, speed, ?)
+	if ( typeof options === "number" || $.fx.speeds[ options ] ) {
+		callback = speed;
+		speed = options;
+		options = {};
+	}
+
+	// catch (effect, options, callback)
+	if ( $.isFunction( speed ) ) {
+		callback = speed;
+		speed = null;
+	}
+
+	// add options to effect
+	if ( options ) {
+		$.extend( effect, options );
+	}
+
+	speed = speed || options.duration;
+	effect.duration = $.fx.off ? 0 :
+		typeof speed === "number" ? speed :
+		speed in $.fx.speeds ? $.fx.speeds[ speed ] :
+		$.fx.speeds._default;
+
+	effect.complete = callback || options.complete;
+
+	return effect;
+}
+
+function standardAnimationOption( option ) {
+	// Valid standard speeds (nothing, number, named speed)
+	if ( !option || typeof option === "number" || $.fx.speeds[ option ] ) {
+		return true;
+	}
+
+	// Invalid strings - treat as "normal" speed
+	if ( typeof option === "string" && !$.effects.effect[ option ] ) {
+		return true;
+	}
+
+	// Complete callback
+	if ( $.isFunction( option ) ) {
+		return true;
+	}
+
+	// Options hash (but not naming an effect)
+	if ( typeof option === "object" && !option.effect ) {
+		return true;
+	}
+
+	// Didn't match any standard API
+	return false;
+}
+
+$.fn.extend({
+	effect: function( /* effect, options, speed, callback */ ) {
+		var args = _normalizeArguments.apply( this, arguments ),
+			mode = args.mode,
+			queue = args.queue,
+			effectMethod = $.effects.effect[ args.effect ];
+
+		if ( $.fx.off || !effectMethod ) {
+			// delegate to the original method (e.g., .show()) if possible
+			if ( mode ) {
+				return this[ mode ]( args.duration, args.complete );
+			} else {
+				return this.each( function() {
+					if ( args.complete ) {
+						args.complete.call( this );
+					}
+				});
+			}
+		}
+
+		function run( next ) {
+			var elem = $( this ),
+				complete = args.complete,
+				mode = args.mode;
+
+			function done() {
+				if ( $.isFunction( complete ) ) {
+					complete.call( elem[0] );
+				}
+				if ( $.isFunction( next ) ) {
+					next();
+				}
+			}
+
+			// If the element already has the correct final state, delegate to
+			// the core methods so the internal tracking of "olddisplay" works.
+			if ( elem.is( ":hidden" ) ? mode === "hide" : mode === "show" ) {
+				elem[ mode ]();
+				done();
+			} else {
+				effectMethod.call( elem[0], args, done );
+			}
+		}
+
+		return queue === false ? this.each( run ) : this.queue( queue || "fx", run );
+	},
+
+	show: (function( orig ) {
+		return function( option ) {
+			if ( standardAnimationOption( option ) ) {
+				return orig.apply( this, arguments );
+			} else {
+				var args = _normalizeArguments.apply( this, arguments );
+				args.mode = "show";
+				return this.effect.call( this, args );
+			}
+		};
+	})( $.fn.show ),
+
+	hide: (function( orig ) {
+		return function( option ) {
+			if ( standardAnimationOption( option ) ) {
+				return orig.apply( this, arguments );
+			} else {
+				var args = _normalizeArguments.apply( this, arguments );
+				args.mode = "hide";
+				return this.effect.call( this, args );
+			}
+		};
+	})( $.fn.hide ),
+
+	toggle: (function( orig ) {
+		return function( option ) {
+			if ( standardAnimationOption( option ) || typeof option === "boolean" ) {
+				return orig.apply( this, arguments );
+			} else {
+				var args = _normalizeArguments.apply( this, arguments );
+				args.mode = "toggle";
+				return this.effect.call( this, args );
+			}
+		};
+	})( $.fn.toggle ),
+
+	// helper functions
+	cssUnit: function(key) {
+		var style = this.css( key ),
+			val = [];
+
+		$.each( [ "em", "px", "%", "pt" ], function( i, unit ) {
+			if ( style.indexOf( unit ) > 0 ) {
+				val = [ parseFloat( style ), unit ];
+			}
+		});
+		return val;
+	}
+});
+
+})();
+
+/******************************************************************************/
+/*********************************** EASING ***********************************/
+/******************************************************************************/
+
+(function() {
+
+// based on easing equations from Robert Penner (http://www.robertpenner.com/easing)
+
+var baseEasings = {};
+
+$.each( [ "Quad", "Cubic", "Quart", "Quint", "Expo" ], function( i, name ) {
+	baseEasings[ name ] = function( p ) {
+		return Math.pow( p, i + 2 );
+	};
+});
+
+$.extend( baseEasings, {
+	Sine: function ( p ) {
+		return 1 - Math.cos( p * Math.PI / 2 );
+	},
+	Circ: function ( p ) {
+		return 1 - Math.sqrt( 1 - p * p );
+	},
+	Elastic: function( p ) {
+		return p === 0 || p === 1 ? p :
+			-Math.pow( 2, 8 * (p - 1) ) * Math.sin( ( (p - 1) * 80 - 7.5 ) * Math.PI / 15 );
+	},
+	Back: function( p ) {
+		return p * p * ( 3 * p - 2 );
+	},
+	Bounce: function ( p ) {
+		var pow2,
+			bounce = 4;
+
+		while ( p < ( ( pow2 = Math.pow( 2, --bounce ) ) - 1 ) / 11 ) {}
+		return 1 / Math.pow( 4, 3 - bounce ) - 7.5625 * Math.pow( ( pow2 * 3 - 2 ) / 22 - p, 2 );
+	}
+});
+
+$.each( baseEasings, function( name, easeIn ) {
+	$.easing[ "easeIn" + name ] = easeIn;
+	$.easing[ "easeOut" + name ] = function( p ) {
+		return 1 - easeIn( 1 - p );
+	};
+	$.easing[ "easeInOut" + name ] = function( p ) {
+		return p < 0.5 ?
+			easeIn( p * 2 ) / 2 :
+			1 - easeIn( p * -2 + 2 ) / 2;
+	};
+});
+
+})();
+
+})(jQuery);
+
+(function( $, undefined ) {
+
+var uid = 0,
+	hideProps = {},
+	showProps = {};
+
+hideProps.height = hideProps.paddingTop = hideProps.paddingBottom =
+	hideProps.borderTopWidth = hideProps.borderBottomWidth = "hide";
+showProps.height = showProps.paddingTop = showProps.paddingBottom =
+	showProps.borderTopWidth = showProps.borderBottomWidth = "show";
+
+$.widget( "ui.accordion", {
+	version: "1.10.3",
+	options: {
+		active: 0,
+		animate: {},
+		collapsible: false,
+		event: "click",
+		header: "> li > :first-child,> :not(li):even",
+		heightStyle: "auto",
+		icons: {
+			activeHeader: "ui-icon-triangle-1-s",
+			header: "ui-icon-triangle-1-e"
+		},
+
+		// callbacks
+		activate: null,
+		beforeActivate: null
+	},
+
+	_create: function() {
+		var options = this.options;
+		this.prevShow = this.prevHide = $();
+		this.element.addClass( "ui-accordion ui-widget ui-helper-reset" )
+			// ARIA
+			.attr( "role", "tablist" );
+
+		// don't allow collapsible: false and active: false / null
+		if ( !options.collapsible && (options.active === false || options.active == null) ) {
+			options.active = 0;
+		}
+
+		this._processPanels();
+		// handle negative values
+		if ( options.active < 0 ) {
+			options.active += this.headers.length;
+		}
+		this._refresh();
+	},
+
+	_getCreateEventData: function() {
+		return {
+			header: this.active,
+			panel: !this.active.length ? $() : this.active.next(),
+			content: !this.active.length ? $() : this.active.next()
+		};
+	},
+
+	_createIcons: function() {
+		var icons = this.options.icons;
+		if ( icons ) {
+			$( "<span>" )
+				.addClass( "ui-accordion-header-icon ui-icon " + icons.header )
+				.prependTo( this.headers );
+			this.active.children( ".ui-accordion-header-icon" )
+				.removeClass( icons.header )
+				.addClass( icons.activeHeader );
+			this.headers.addClass( "ui-accordion-icons" );
+		}
+	},
+
+	_destroyIcons: function() {
+		this.headers
+			.removeClass( "ui-accordion-icons" )
+			.children( ".ui-accordion-header-icon" )
+				.remove();
+	},
+
+	_destroy: function() {
+		var contents;
+
+		// clean up main element
+		this.element
+			.removeClass( "ui-accordion ui-widget ui-helper-reset" )
+			.removeAttr( "role" );
+
+		// clean up headers
+		this.headers
+			.removeClass( "ui-accordion-header ui-accordion-header-active ui-helper-reset ui-state-default ui-corner-all ui-state-active ui-state-disabled ui-corner-top" )
+			.removeAttr( "role" )
+			.removeAttr( "aria-selected" )
+			.removeAttr( "aria-controls" )
+			.removeAttr( "tabIndex" )
+			.each(function() {
+				if ( /^ui-accordion/.test( this.id ) ) {
+					this.removeAttribute( "id" );
+				}
+			});
+		this._destroyIcons();
+
+		// clean up content panels
+		contents = this.headers.next()
+			.css( "display", "" )
+			.removeAttr( "role" )
+			.removeAttr( "aria-expanded" )
+			.removeAttr( "aria-hidden" )
+			.removeAttr( "aria-labelledby" )
+			.removeClass( "ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content ui-accordion-content-active ui-state-disabled" )
+			.each(function() {
+				if ( /^ui-accordion/.test( this.id ) ) {
+					this.removeAttribute( "id" );
+				}
+			});
+		if ( this.options.heightStyle !== "content" ) {
+			contents.css( "height", "" );
+		}
+	},
+
+	_setOption: function( key, value ) {
+		if ( key === "active" ) {
+			// _activate() will handle invalid values and update this.options
+			this._activate( value );
+			return;
+		}
+
+		if ( key === "event" ) {
+			if ( this.options.event ) {
+				this._off( this.headers, this.options.event );
+			}
+			this._setupEvents( value );
+		}
+
+		this._super( key, value );
+
+		// setting collapsible: false while collapsed; open first panel
+		if ( key === "collapsible" && !value && this.options.active === false ) {
+			this._activate( 0 );
+		}
+
+		if ( key === "icons" ) {
+			this._destroyIcons();
+			if ( value ) {
+				this._createIcons();
+			}
+		}
+
+		// #5332 - opacity doesn't cascade to positioned elements in IE
+		// so we need to add the disabled class to the headers and panels
+		if ( key === "disabled" ) {
+			this.headers.add( this.headers.next() )
+				.toggleClass( "ui-state-disabled", !!value );
+		}
+	},
+
+	_keydown: function( event ) {
+		/*jshint maxcomplexity:15*/
+		if ( event.altKey || event.ctrlKey ) {
+			return;
+		}
+
+		var keyCode = $.ui.keyCode,
+			length = this.headers.length,
+			currentIndex = this.headers.index( event.target ),
+			toFocus = false;
+
+		switch ( event.keyCode ) {
+			case keyCode.RIGHT:
+			case keyCode.DOWN:
+				toFocus = this.headers[ ( currentIndex + 1 ) % length ];
+				break;
+			case keyCode.LEFT:
+			case keyCode.UP:
+				toFocus = this.headers[ ( currentIndex - 1 + length ) % length ];
+				break;
+			case keyCode.SPACE:
+			case keyCode.ENTER:
+				this._eventHandler( event );
+				break;
+			case keyCode.HOME:
+				toFocus = this.headers[ 0 ];
+				break;
+			case keyCode.END:
+				toFocus = this.headers[ length - 1 ];
+				break;
+		}
+
+		if ( toFocus ) {
+			$( event.target ).attr( "tabIndex", -1 );
+			$( toFocus ).attr( "tabIndex", 0 );
+			toFocus.focus();
+			event.preventDefault();
+		}
+	},
+
+	_panelKeyDown : function( event ) {
+		if ( event.keyCode === $.ui.keyCode.UP && event.ctrlKey ) {
+			$( event.currentTarget ).prev().focus();
+		}
+	},
+
+	refresh: function() {
+		var options = this.options;
+		this._processPanels();
+
+		// was collapsed or no panel
+		if ( ( options.active === false && options.collapsible === true ) || !this.headers.length ) {
+			options.active = false;
+			this.active = $();
+		// active false only when collapsible is true
+		} else if ( options.active === false ) {
+			this._activate( 0 );
+		// was active, but active panel is gone
+		} else if ( this.active.length && !$.contains( this.element[ 0 ], this.active[ 0 ] ) ) {
+			// all remaining panel are disabled
+			if ( this.headers.length === this.headers.find(".ui-state-disabled").length ) {
+				options.active = false;
+				this.active = $();
+			// activate previous panel
+			} else {
+				this._activate( Math.max( 0, options.active - 1 ) );
+			}
+		// was active, active panel still exists
+		} else {
+			// make sure active index is correct
+			options.active = this.headers.index( this.active );
+		}
+
+		this._destroyIcons();
+
+		this._refresh();
+	},
+
+	_processPanels: function() {
+		this.headers = this.element.find( this.options.header )
+			.addClass( "ui-accordion-header ui-helper-reset ui-state-default ui-corner-all" );
+
+		this.headers.next()
+			.addClass( "ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom" )
+			.filter(":not(.ui-accordion-content-active)")
+			.hide();
+	},
+
+	_refresh: function() {
+		var maxHeight,
+			options = this.options,
+			heightStyle = options.heightStyle,
+			parent = this.element.parent(),
+			accordionId = this.accordionId = "ui-accordion-" +
+				(this.element.attr( "id" ) || ++uid);
+
+		this.active = this._findActive( options.active )
+			.addClass( "ui-accordion-header-active ui-state-active ui-corner-top" )
+			.removeClass( "ui-corner-all" );
+		this.active.next()
+			.addClass( "ui-accordion-content-active" )
+			.show();
+
+		this.headers
+			.attr( "role", "tab" )
+			.each(function( i ) {
+				var header = $( this ),
+					headerId = header.attr( "id" ),
+					panel = header.next(),
+					panelId = panel.attr( "id" );
+				if ( !headerId ) {
+					headerId = accordionId + "-header-" + i;
+					header.attr( "id", headerId );
+				}
+				if ( !panelId ) {
+					panelId = accordionId + "-panel-" + i;
+					panel.attr( "id", panelId );
+				}
+				header.attr( "aria-controls", panelId );
+				panel.attr( "aria-labelledby", headerId );
+			})
+			.next()
+				.attr( "role", "tabpanel" );
+
+		this.headers
+			.not( this.active )
+			.attr({
+				"aria-selected": "false",
+				tabIndex: -1
+			})
+			.next()
+				.attr({
+					"aria-expanded": "false",
+					"aria-hidden": "true"
+				})
+				.hide();
+
+		// make sure at least one header is in the tab order
+		if ( !this.active.length ) {
+			this.headers.eq( 0 ).attr( "tabIndex", 0 );
+		} else {
+			this.active.attr({
+				"aria-selected": "true",
+				tabIndex: 0
+			})
+			.next()
+				.attr({
+					"aria-expanded": "true",
+					"aria-hidden": "false"
+				});
+		}
+
+		this._createIcons();
+
+		this._setupEvents( options.event );
+
+		if ( heightStyle === "fill" ) {
+			maxHeight = parent.height();
+			this.element.siblings( ":visible" ).each(function() {
+				var elem = $( this ),
+					position = elem.css( "position" );
+
+				if ( position === "absolute" || position === "fixed" ) {
+					return;
+				}
+				maxHeight -= elem.outerHeight( true );
+			});
+
+			this.headers.each(function() {
+				maxHeight -= $( this ).outerHeight( true );
+			});
+
+			this.headers.next()
+				.each(function() {
+					$( this ).height( Math.max( 0, maxHeight -
+						$( this ).innerHeight() + $( this ).height() ) );
+				})
+				.css( "overflow", "auto" );
+		} else if ( heightStyle === "auto" ) {
+			maxHeight = 0;
+			this.headers.next()
+				.each(function() {
+					maxHeight = Math.max( maxHeight, $( this ).css( "height", "" ).height() );
+				})
+				.height( maxHeight );
+		}
+	},
+
+	_activate: function( index ) {
+		var active = this._findActive( index )[ 0 ];
+
+		// trying to activate the already active panel
+		if ( active === this.active[ 0 ] ) {
+			return;
+		}
+
+		// trying to collapse, simulate a click on the currently active header
+		active = active || this.active[ 0 ];
+
+		this._eventHandler({
+			target: active,
+			currentTarget: active,
+			preventDefault: $.noop
+		});
+	},
+
+	_findActive: function( selector ) {
+		return typeof selector === "number" ? this.headers.eq( selector ) : $();
+	},
+
+	_setupEvents: function( event ) {
+		var events = {
+			keydown: "_keydown"
+		};
+		if ( event ) {
+			$.each( event.split(" "), function( index, eventName ) {
+				events[ eventName ] = "_eventHandler";
+			});
+		}
+
+		this._off( this.headers.add( this.headers.next() ) );
+		this._on( this.headers, events );
+		this._on( this.headers.next(), { keydown: "_panelKeyDown" });
+		this._hoverable( this.headers );
+		this._focusable( this.headers );
+	},
+
+	_eventHandler: function( event ) {
+		var options = this.options,
+			active = this.active,
+			clicked = $( event.currentTarget ),
+			clickedIsActive = clicked[ 0 ] === active[ 0 ],
+			collapsing = clickedIsActive && options.collapsible,
+			toShow = collapsing ? $() : clicked.next(),
+			toHide = active.next(),
+			eventData = {
+				oldHeader: active,
+				oldPanel: toHide,
+				newHeader: collapsing ? $() : clicked,
+				newPanel: toShow
+			};
+
+		event.preventDefault();
+
+		if (
+				// click on active header, but not collapsible
+				( clickedIsActive && !options.collapsible ) ||
+				// allow canceling activation
+				( this._trigger( "beforeActivate", event, eventData ) === false ) ) {
+			return;
+		}
+
+		options.active = collapsing ? false : this.headers.index( clicked );
+
+		// when the call to ._toggle() comes after the class changes
+		// it causes a very odd bug in IE 8 (see #6720)
+		this.active = clickedIsActive ? $() : clicked;
+		this._toggle( eventData );
+
+		// switch classes
+		// corner classes on the previously active header stay after the animation
+		active.removeClass( "ui-accordion-header-active ui-state-active" );
+		if ( options.icons ) {
+			active.children( ".ui-accordion-header-icon" )
+				.removeClass( options.icons.activeHeader )
+				.addClass( options.icons.header );
+		}
+
+		if ( !clickedIsActive ) {
+			clicked
+				.removeClass( "ui-corner-all" )
+				.addClass( "ui-accordion-header-active ui-state-active ui-corner-top" );
+			if ( options.icons ) {
+				clicked.children( ".ui-accordion-header-icon" )
+					.removeClass( options.icons.header )
+					.addClass( options.icons.activeHeader );
+			}
+
+			clicked
+				.next()
+				.addClass( "ui-accordion-content-active" );
+		}
+	},
+
+	_toggle: function( data ) {
+		var toShow = data.newPanel,
+			toHide = this.prevShow.length ? this.prevShow : data.oldPanel;
+
+		// handle activating a panel during the animation for another activation
+		this.prevShow.add( this.prevHide ).stop( true, true );
+		this.prevShow = toShow;
+		this.prevHide = toHide;
+
+		if ( this.options.animate ) {
+			this._animate( toShow, toHide, data );
+		} else {
+			toHide.hide();
+			toShow.show();
+			this._toggleComplete( data );
+		}
+
+		toHide.attr({
+			"aria-expanded": "false",
+			"aria-hidden": "true"
+		});
+		toHide.prev().attr( "aria-selected", "false" );
+		// if we're switching panels, remove the old header from the tab order
+		// if we're opening from collapsed state, remove the previous header from the tab order
+		// if we're collapsing, then keep the collapsing header in the tab order
+		if ( toShow.length && toHide.length ) {
+			toHide.prev().attr( "tabIndex", -1 );
+		} else if ( toShow.length ) {
+			this.headers.filter(function() {
+				return $( this ).attr( "tabIndex" ) === 0;
+			})
+			.attr( "tabIndex", -1 );
+		}
+
+		toShow
+			.attr({
+				"aria-expanded": "true",
+				"aria-hidden": "false"
+			})
+			.prev()
+				.attr({
+					"aria-selected": "true",
+					tabIndex: 0
+				});
+	},
+
+	_animate: function( toShow, toHide, data ) {
+		var total, easing, duration,
+			that = this,
+			adjust = 0,
+			down = toShow.length &&
+				( !toHide.length || ( toShow.index() < toHide.index() ) ),
+			animate = this.options.animate || {},
+			options = down && animate.down || animate,
+			complete = function() {
+				that._toggleComplete( data );
+			};
+
+		if ( typeof options === "number" ) {
+			duration = options;
+		}
+		if ( typeof options === "string" ) {
+			easing = options;
+		}
+		// fall back from options to animation in case of partial down settings
+		easing = easing || options.easing || animate.easing;
+		duration = duration || options.duration || animate.duration;
+
+		if ( !toHide.length ) {
+			return toShow.animate( showProps, duration, easing, complete );
+		}
+		if ( !toShow.length ) {
+			return toHide.animate( hideProps, duration, easing, complete );
+		}
+
+		total = toShow.show().outerHeight();
+		toHide.animate( hideProps, {
+			duration: duration,
+			easing: easing,
+			step: function( now, fx ) {
+				fx.now = Math.round( now );
+			}
+		});
+		toShow
+			.hide()
+			.animate( showProps, {
+				duration: duration,
+				easing: easing,
+				complete: complete,
+				step: function( now, fx ) {
+					fx.now = Math.round( now );
+					if ( fx.prop !== "height" ) {
+						adjust += fx.now;
+					} else if ( that.options.heightStyle !== "content" ) {
+						fx.now = Math.round( total - toHide.outerHeight() - adjust );
+						adjust = 0;
+					}
+				}
+			});
+	},
+
+	_toggleComplete: function( data ) {
+		var toHide = data.oldPanel;
+
+		toHide
+			.removeClass( "ui-accordion-content-active" )
+			.prev()
+				.removeClass( "ui-corner-top" )
+				.addClass( "ui-corner-all" );
+
+		// Work around for rendering bug in IE (#5421)
+		if ( toHide.length ) {
+			toHide.parent()[0].className = toHide.parent()[0].className;
+		}
+
+		this._trigger( "activate", null, data );
+	}
+});
+
+})( jQuery );
+
+(function( $, undefined ) {
+
+// used to prevent race conditions with remote data sources
+var requestIndex = 0;
+
+$.widget( "ui.autocomplete", {
+	version: "1.10.3",
+	defaultElement: "<input>",
+	options: {
+		appendTo: null,
+		autoFocus: false,
+		delay: 300,
+		minLength: 1,
+		position: {
+			my: "left top",
+			at: "left bottom",
+			collision: "none"
+		},
+		source: null,
+
+		// callbacks
+		change: null,
+		close: null,
+		focus: null,
+		open: null,
+		response: null,
+		search: null,
+		select: null
+	},
+
+	pending: 0,
+
+	_create: function() {
+		// Some browsers only repeat keydown events, not keypress events,
+		// so we use the suppressKeyPress flag to determine if we've already
+		// handled the keydown event. #7269
+		// Unfortunately the code for & in keypress is the same as the up arrow,
+		// so we use the suppressKeyPressRepeat flag to avoid handling keypress
+		// events when we know the keydown event was used to modify the
+		// search term. #7799
+		var suppressKeyPress, suppressKeyPressRepeat, suppressInput,
+			nodeName = this.element[0].nodeName.toLowerCase(),
+			isTextarea = nodeName === "textarea",
+			isInput = nodeName === "input";
+
+		this.isMultiLine =
+			// Textareas are always multi-line
+			isTextarea ? true :
+			// Inputs are always single-line, even if inside a contentEditable element
+			// IE also treats inputs as contentEditable
+			isInput ? false :
+			// All other element types are determined by whether or not they're contentEditable
+			this.element.prop( "isContentEditable" );
+
+		this.valueMethod = this.element[ isTextarea || isInput ? "val" : "text" ];
+		this.isNewMenu = true;
+
+		this.element
+			.addClass( "ui-autocomplete-input" )
+			.attr( "autocomplete", "off" );
+
+		this._on( this.element, {
+			keydown: function( event ) {
+				/*jshint maxcomplexity:15*/
+				if ( this.element.prop( "readOnly" ) ) {
+					suppressKeyPress = true;
+					suppressInput = true;
+					suppressKeyPressRepeat = true;
+					return;
+				}
+
+				suppressKeyPress = false;
+				suppressInput = false;
+				suppressKeyPressRepeat = false;
+				var keyCode = $.ui.keyCode;
+				switch( event.keyCode ) {
+				case keyCode.PAGE_UP:
+					suppressKeyPress = true;
+					this._move( "previousPage", event );
+					break;
+				case keyCode.PAGE_DOWN:
+					suppressKeyPress = true;
+					this._move( "nextPage", event );
+					break;
+				case keyCode.UP:
+					suppressKeyPress = true;
+					this._keyEvent( "previous", event );
+					break;
+				case keyCode.DOWN:
+					suppressKeyPress = true;
+					this._keyEvent( "next", event );
+					break;
+				case keyCode.ENTER:
+				case keyCode.NUMPAD_ENTER:
+					// when menu is open and has focus
+					if ( this.menu.active ) {
+						// #6055 - Opera still allows the keypress to occur
+						// which causes forms to submit
+						suppressKeyPress = true;
+						event.preventDefault();
+						this.menu.select( event );
+					}
+					break;
+				case keyCode.TAB:
+					if ( this.menu.active ) {
+						this.menu.select( event );
+					}
+					break;
+				case keyCode.ESCAPE:
+					if ( this.menu.element.is( ":visible" ) ) {
+						this._value( this.term );
+						this.close( event );
+						// Different browsers have different default behavior for escape
+						// Single press can mean undo or clear
+						// Double press in IE means clear the whole form
+						event.preventDefault();
+					}
+					break;
+				default:
+					suppressKeyPressRepeat = true;
+					// search timeout should be triggered before the input value is changed
+					this._searchTimeout( event );
+					break;
+				}
+			},
+			keypress: function( event ) {
+				if ( suppressKeyPress ) {
+					suppressKeyPress = false;
+					if ( !this.isMultiLine || this.menu.element.is( ":visible" ) ) {
+						event.preventDefault();
+					}
+					return;
+				}
+				if ( suppressKeyPressRepeat ) {
+					return;
+				}
+
+				// replicate some key handlers to allow them to repeat in Firefox and Opera
+				var keyCode = $.ui.keyCode;
+				switch( event.keyCode ) {
+				case keyCode.PAGE_UP:
+					this._move( "previousPage", event );
+					break;
+				case keyCode.PAGE_DOWN:
+					this._move( "nextPage", event );
+					break;
+				case keyCode.UP:
+					this._keyEvent( "previous", event );
+					break;
+				case keyCode.DOWN:
+					this._keyEvent( "next", event );
+					break;
+				}
+			},
+			input: function( event ) {
+				if ( suppressInput ) {
+					suppressInput = false;
+					event.preventDefault();
+					return;
+				}
+				this._searchTimeout( event );
+			},
+			focus: function() {
+				this.selectedItem = null;
+				this.previous = this._value();
+			},
+			blur: function( event ) {
+				if ( this.cancelBlur ) {
+					delete this.cancelBlur;
+					return;
+				}
+
+				clearTimeout( this.searching );
+				this.close( event );
+				this._change( event );
+			}
+		});
+
+		this._initSource();
+		this.menu = $( "<ul>" )
+			.addClass( "ui-autocomplete ui-front" )
+			.appendTo( this._appendTo() )
+			.menu({
+				// disable ARIA support, the live region takes care of that
+				role: null
+			})
+			.hide()
+			.data( "ui-menu" );
+
+		this._on( this.menu.element, {
+			mousedown: function( event ) {
+				// prevent moving focus out of the text field
+				event.preventDefault();
+
+				// IE doesn't prevent moving focus even with event.preventDefault()
+				// so we set a flag to know when we should ignore the blur event
+				this.cancelBlur = true;
+				this._delay(function() {
+					delete this.cancelBlur;
+				});
+
+				// clicking on the scrollbar causes focus to shift to the body
+				// but we can't detect a mouseup or a click immediately afterward
+				// so we have to track the next mousedown and close the menu if
+				// the user clicks somewhere outside of the autocomplete
+				var menuElement = this.menu.element[ 0 ];
+				if ( !$( event.target ).closest( ".ui-menu-item" ).length ) {
+					this._delay(function() {
+						var that = this;
+						this.document.one( "mousedown", function( event ) {
+							if ( event.target !== that.element[ 0 ] &&
+									event.target !== menuElement &&
+									!$.contains( menuElement, event.target ) ) {
+								that.close();
+							}
+						});
+					});
+				}
+			},
+			menufocus: function( event, ui ) {
+				// support: Firefox
+				// Prevent accidental activation of menu items in Firefox (#7024 #9118)
+				if ( this.isNewMenu ) {
+					this.isNewMenu = false;
+					if ( event.originalEvent && /^mouse/.test( event.originalEvent.type ) ) {
+						this.menu.blur();
+
+						this.document.one( "mousemove", function() {
+							$( event.target ).trigger( event.originalEvent );
+						});
+
+						return;
+					}
+				}
+
+				var item = ui.item.data( "ui-autocomplete-item" );
+				if ( false !== this._trigger( "focus", event, { item: item } ) ) {
+					// use value to match what will end up in the input, if it was a key event
+					if ( event.originalEvent && /^key/.test( event.originalEvent.type ) ) {
+						this._value( item.value );
+					}
+				} else {
+					// Normally the input is populated with the item's value as the
+					// menu is navigated, causing screen readers to notice a change and
+					// announce the item. Since the focus event was canceled, this doesn't
+					// happen, so we update the live region so that screen readers can
+					// still notice the change and announce it.
+					this.liveRegion.text( item.value );
+				}
+			},
+			menuselect: function( event, ui ) {
+				var item = ui.item.data( "ui-autocomplete-item" ),
+					previous = this.previous;
+
+				// only trigger when focus was lost (click on menu)
+				if ( this.element[0] !== this.document[0].activeElement ) {
+					this.element.focus();
+					this.previous = previous;
+					// #6109 - IE triggers two focus events and the second
+					// is asynchronous, so we need to reset the previous
+					// term synchronously and asynchronously :-(
+					this._delay(function() {
+						this.previous = previous;
+						this.selectedItem = item;
+					});
+				}
+
+				if ( false !== this._trigger( "select", event, { item: item } ) ) {
+					this._value( item.value );
+				}
+				// reset the term after the select event
+				// this allows custom select handling to work properly
+				this.term = this._value();
+
+				this.close( event );
+				this.selectedItem = item;
+			}
+		});
+
+		this.liveRegion = $( "<span>", {
+				role: "status",
+				"aria-live": "polite"
+			})
+			.addClass( "ui-helper-hidden-accessible" )
+			.insertBefore( this.element );
+
+		// turning off autocomplete prevents the browser from remembering the
+		// value when navigating through history, so we re-enable autocomplete
+		// if the page is unloaded before the widget is destroyed. #7790
+		this._on( this.window, {
+			beforeunload: function() {
+				this.element.removeAttr( "autocomplete" );
+			}
+		});
+	},
+
+	_destroy: function() {
+		clearTimeout( this.searching );
+		this.element
+			.removeClass( "ui-autocomplete-input" )
+			.removeAttr( "autocomplete" );
+		this.menu.element.remove();
+		this.liveRegion.remove();
+	},
+
+	_setOption: function( key, value ) {
+		this._super( key, value );
+		if ( key === "source" ) {
+			this._initSource();
+		}
+		if ( key === "appendTo" ) {
+			this.menu.element.appendTo( this._appendTo() );
+		}
+		if ( key === "disabled" && value && this.xhr ) {
+			this.xhr.abort();
+		}
+	},
+
+	_appendTo: function() {
+		var element = this.options.appendTo;
+
+		if ( element ) {
+			element = element.jquery || element.nodeType ?
+				$( element ) :
+				this.document.find( element ).eq( 0 );
+		}
+
+		if ( !element ) {
+			element = this.element.closest( ".ui-front" );
+		}
+
+		if ( !element.length ) {
+			element = this.document[0].body;
+		}
+
+		return element;
+	},
+
+	_initSource: function() {
+		var array, url,
+			that = this;
+		if ( $.isArray(this.options.source) ) {
+			array = this.options.source;
+			this.source = function( request, response ) {
+				response( $.ui.autocomplete.filter( array, request.term ) );
+			};
+		} else if ( typeof this.options.source === "string" ) {
+			url = this.options.source;
+			this.source = function( request, response ) {
+				if ( that.xhr ) {
+					that.xhr.abort();
+				}
+				that.xhr = $.ajax({
+					url: url,
+					data: request,
+					dataType: "json",
+					success: function( data ) {
+						response( data );
+					},
+					error: function() {
+						response( [] );
+					}
+				});
+			};
+		} else {
+			this.source = this.options.source;
+		}
+	},
+
+	_searchTimeout: function( event ) {
+		clearTimeout( this.searching );
+		this.searching = this._delay(function() {
+			// only search if the value has changed
+			if ( this.term !== this._value() ) {
+				this.selectedItem = null;
+				this.search( null, event );
+			}
+		}, this.options.delay );
+	},
+
+	search: function( value, event ) {
+		value = value != null ? value : this._value();
+
+		// always save the actual value, not the one passed as an argument
+		this.term = this._value();
+
+		if ( value.length < this.options.minLength ) {
+			return this.close( event );
+		}
+
+		if ( this._trigger( "search", event ) === false ) {
+			return;
+		}
+
+		return this._search( value );
+	},
+
+	_search: function( value ) {
+		this.pending++;
+		this.element.addClass( "ui-autocomplete-loading" );
+		this.cancelSearch = false;
+
+		this.source( { term: value }, this._response() );
+	},
+
+	_response: function() {
+		var that = this,
+			index = ++requestIndex;
+
+		return function( content ) {
+			if ( index === requestIndex ) {
+				that.__response( content );
+			}
+
+			that.pending--;
+			if ( !that.pending ) {
+				that.element.removeClass( "ui-autocomplete-loading" );
+			}
+		};
+	},
+
+	__response: function( content ) {
+		if ( content ) {
+			content = this._normalize( content );
+		}
+		this._trigger( "response", null, { content: content } );
+		if ( !this.options.disabled && content && content.length && !this.cancelSearch ) {
+			this._suggest( content );
+			this._trigger( "open" );
+		} else {
+			// use ._close() instead of .close() so we don't cancel future searches
+			this._close();
+		}
+	},
+
+	close: function( event ) {
+		this.cancelSearch = true;
+		this._close( event );
+	},
+
+	_close: function( event ) {
+		if ( this.menu.element.is( ":visible" ) ) {
+			this.menu.element.hide();
+			this.menu.blur();
+			this.isNewMenu = true;
+			this._trigger( "close", event );
+		}
+	},
+
+	_change: function( event ) {
+		if ( this.previous !== this._value() ) {
+			this._trigger( "change", event, { item: this.selectedItem } );
+		}
+	},
+
+	_normalize: function( items ) {
+		// assume all items have the right format when the first item is complete
+		if ( items.length && items[0].label && items[0].value ) {
+			return items;
+		}
+		return $.map( items, function( item ) {
+			if ( typeof item === "string" ) {
+				return {
+					label: item,
+					value: item
+				};
+			}
+			return $.extend({
+				label: item.label || item.value,
+				value: item.value || item.label
+			}, item );
+		});
+	},
+
+	_suggest: function( items ) {
+		var ul = this.menu.element.empty();
+		this._renderMenu( ul, items );
+		this.isNewMenu = true;
+		this.menu.refresh();
+
+		// size and position menu
+		ul.show();
+		this._resizeMenu();
+		ul.position( $.extend({
+			of: this.element
+		}, this.options.position ));
+
+		if ( this.options.autoFocus ) {
+			this.menu.next();
+		}
+	},
+
+	_resizeMenu: function() {
+		var ul = this.menu.element;
+		ul.outerWidth( Math.max(
+			// Firefox wraps long text (possibly a rounding bug)
+			// so we add 1px to avoid the wrapping (#7513)
+			ul.width( "" ).outerWidth() + 1,
+			this.element.outerWidth()
+		) );
+	},
+
+	_renderMenu: function( ul, items ) {
+		var that = this;
+		$.each( items, function( index, item ) {
+			that._renderItemData( ul, item );
+		});
+	},
+
+	_renderItemData: function( ul, item ) {
+		return this._renderItem( ul, item ).data( "ui-autocomplete-item", item );
+	},
+
+	_renderItem: function( ul, item ) {
+		return $( "<li>" )
+			.append( $( "<a>" ).text( item.label ) )
+			.appendTo( ul );
+	},
+
+	_move: function( direction, event ) {
+		if ( !this.menu.element.is( ":visible" ) ) {
+			this.search( null, event );
+			return;
+		}
+		if ( this.menu.isFirstItem() && /^previous/.test( direction ) ||
+				this.menu.isLastItem() && /^next/.test( direction ) ) {
+			this._value( this.term );
+			this.menu.blur();
+			return;
+		}
+		this.menu[ direction ]( event );
+	},
+
+	widget: function() {
+		return this.menu.element;
+	},
+
+	_value: function() {
+		return this.valueMethod.apply( this.element, arguments );
+	},
+
+	_keyEvent: function( keyEvent, event ) {
+		if ( !this.isMultiLine || this.menu.element.is( ":visible" ) ) {
+			this._move( keyEvent, event );
+
+			// prevents moving cursor to beginning/end of the text field in some browsers
+			event.preventDefault();
+		}
+	}
+});
+
+$.extend( $.ui.autocomplete, {
+	escapeRegex: function( value ) {
+		return value.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&");
+	},
+	filter: function(array, term) {
+		var matcher = new RegExp( $.ui.autocomplete.escapeRegex(term), "i" );
+		return $.grep( array, function(value) {
+			return matcher.test( value.label || value.value || value );
+		});
+	}
+});
+
+
+// live region extension, adding a `messages` option
+// NOTE: This is an experimental API. We are still investigating
+// a full solution for string manipulation and internationalization.
+$.widget( "ui.autocomplete", $.ui.autocomplete, {
+	options: {
+		messages: {
+			noResults: "No search results.",
+			results: function( amount ) {
+				return amount + ( amount > 1 ? " results are" : " result is" ) +
+					" available, use up and down arrow keys to navigate.";
+			}
+		}
+	},
+
+	__response: function( content ) {
+		var message;
+		this._superApply( arguments );
+		if ( this.options.disabled || this.cancelSearch ) {
+			return;
+		}
+		if ( content && content.length ) {
+			message = this.options.messages.results( content.length );
+		} else {
+			message = this.options.messages.noResults;
+		}
+		this.liveRegion.text( message );
+	}
+});
+
+}( jQuery ));
+
+(function( $, undefined ) {
+
+var lastActive, startXPos, startYPos, clickDragged,
+	baseClasses = "ui-button ui-widget ui-state-default ui-corner-all",
+	stateClasses = "ui-state-hover ui-state-active ",
+	typeClasses = "ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only",
+	formResetHandler = function() {
+		var form = $( this );
+		setTimeout(function() {
+			form.find( ":ui-button" ).button( "refresh" );
+		}, 1 );
+	},
+	radioGroup = function( radio ) {
+		var name = radio.name,
+			form = radio.form,
+			radios = $( [] );
+		if ( name ) {
+			name = name.replace( /'/g, "\\'" );
+			if ( form ) {
+				radios = $( form ).find( "[name='" + name + "']" );
+			} else {
+				radios = $( "[name='" + name + "']", radio.ownerDocument )
+					.filter(function() {
+						return !this.form;
+					});
+			}
+		}
+		return radios;
+	};
+
+$.widget( "ui.button", {
+	version: "1.10.3",
+	defaultElement: "<button>",
+	options: {
+		disabled: null,
+		text: true,
+		label: null,
+		icons: {
+			primary: null,
+			secondary: null
+		}
+	},
+	_create: function() {
+		this.element.closest( "form" )
+			.unbind( "reset" + this.eventNamespace )
+			.bind( "reset" + this.eventNamespace, formResetHandler );
+
+		if ( typeof this.options.disabled !== "boolean" ) {
+			this.options.disabled = !!this.element.prop( "disabled" );
+		} else {
+			this.element.prop( "disabled", this.options.disabled );
+		}
+
+		this._determineButtonType();
+		this.hasTitle = !!this.buttonElement.attr( "title" );
+
+		var that = this,
+			options = this.options,
+			toggleButton = this.type === "checkbox" || this.type === "radio",
+			activeClass = !toggleButton ? "ui-state-active" : "",
+			focusClass = "ui-state-focus";
+
+		if ( options.label === null ) {
+			options.label = (this.type === "input" ? this.buttonElement.val() : this.buttonElement.html());
+		}
+
+		this._hoverable( this.buttonElement );
+
+		this.buttonElement
+			.addClass( baseClasses )
+			.attr( "role", "button" )
+			.bind( "mouseenter" + this.eventNamespace, function() {
+				if ( options.disabled ) {
+					return;
+				}
+				if ( this === lastActive ) {
+					$( this ).addClass( "ui-state-active" );
+				}
+			})
+			.bind( "mouseleave" + this.eventNamespace, function() {
+				if ( options.disabled ) {
+					return;
+				}
+				$( this ).removeClass( activeClass );
+			})
+			.bind( "click" + this.eventNamespace, function( event ) {
+				if ( options.disabled ) {
+					event.preventDefault();
+					event.stopImmediatePropagation();
+				}
+			});
+
+		this.element
+			.bind( "focus" + this.eventNamespace, function() {
+				// no need to check disabled, focus won't be triggered anyway
+				that.buttonElement.addClass( focusClass );
+			})
+			.bind( "blur" + this.eventNamespace, function() {
+				that.buttonElement.removeClass( focusClass );
+			});
+
+		if ( toggleButton ) {
+			this.element.bind( "change" + this.eventNamespace, function() {
+				if ( clickDragged ) {
+					return;
+				}
+				that.refresh();
+			});
+			// if mouse moves between mousedown and mouseup (drag) set clickDragged flag
+			// prevents issue where button state changes but checkbox/radio checked state
+			// does not in Firefox (see ticket #6970)
+			this.buttonElement
+				.bind( "mousedown" + this.eventNamespace, function( event ) {
+					if ( options.disabled ) {
+						return;
+					}
+					clickDragged = false;
+					startXPos = event.pageX;
+					startYPos = event.pageY;
+				})
+				.bind( "mouseup" + this.eventNamespace, function( event ) {
+					if ( options.disabled ) {
+						return;
+					}
+					if ( startXPos !== event.pageX || startYPos !== event.pageY ) {
+						clickDragged = true;
+					}
+			});
+		}
+
+		if ( this.type === "checkbox" ) {
+			this.buttonElement.bind( "click" + this.eventNamespace, function() {
+				if ( options.disabled || clickDragged ) {
+					return false;
+				}
+			});
+		} else if ( this.type === "radio" ) {
+			this.buttonElement.bind( "click" + this.eventNamespace, function() {
+				if ( options.disabled || clickDragged ) {
+					return false;
+				}
+				$( this ).addClass( "ui-state-active" );
+				that.buttonElement.attr( "aria-pressed", "true" );
+
+				var radio = that.element[ 0 ];
+				radioGroup( radio )
+					.not( radio )
+					.map(function() {
+						return $( this ).button( "widget" )[ 0 ];
+					})
+					.removeClass( "ui-state-active" )
+					.attr( "aria-pressed", "false" );
+			});
+		} else {
+			this.buttonElement
+				.bind( "mousedown" + this.eventNamespace, function() {
+					if ( options.disabled ) {
+						return false;
+					}
+					$( this ).addClass( "ui-state-active" );
+					lastActive = this;
+					that.document.one( "mouseup", function() {
+						lastActive = null;
+					});
+				})
+				.bind( "mouseup" + this.eventNamespace, function() {
+					if ( options.disabled ) {
+						return false;
+					}
+					$( this ).removeClass( "ui-state-active" );
+				})
+				.bind( "keydown" + this.eventNamespace, function(event) {
+					if ( options.disabled ) {
+						return false;
+					}
+					if ( event.keyCode === $.ui.keyCode.SPACE || event.keyCode === $.ui.keyCode.ENTER ) {
+						$( this ).addClass( "ui-state-active" );
+					}
+				})
+				// see #8559, we bind to blur here in case the button element loses
+				// focus between keydown and keyup, it would be left in an "active" state
+				.bind( "keyup" + this.eventNamespace + " blur" + this.eventNamespace, function() {
+					$( this ).removeClass( "ui-state-active" );
+				});
+
+			if ( this.buttonElement.is("a") ) {
+				this.buttonElement.keyup(function(event) {
+					if ( event.keyCode === $.ui.keyCode.SPACE ) {
+						// TODO pass through original event correctly (just as 2nd argument doesn't work)
+						$( this ).click();
+					}
+				});
+			}
+		}
+
+		// TODO: pull out $.Widget's handling for the disabled option into
+		// $.Widget.prototype._setOptionDisabled so it's easy to proxy and can
+		// be overridden by individual plugins
+		this._setOption( "disabled", options.disabled );
+		this._resetButton();
+	},
+
+	_determineButtonType: function() {
+		var ancestor, labelSelector, checked;
+
+		if ( this.element.is("[type=checkbox]") ) {
+			this.type = "checkbox";
+		} else if ( this.element.is("[type=radio]") ) {
+			this.type = "radio";
+		} else if ( this.element.is("input") ) {
+			this.type = "input";
+		} else {
+			this.type = "button";
+		}
+
+		if ( this.type === "checkbox" || this.type === "radio" ) {
+			// we don't search against the document in case the element
+			// is disconnected from the DOM
+			ancestor = this.element.parents().last();
+			labelSelector = "label[for='" + this.element.attr("id") + "']";
+			this.buttonElement = ancestor.find( labelSelector );
+			if ( !this.buttonElement.length ) {
+				ancestor = ancestor.length ? ancestor.siblings() : this.element.siblings();
+				this.buttonElement = ancestor.filter( labelSelector );
+				if ( !this.buttonElement.length ) {
+					this.buttonElement = ancestor.find( labelSelector );
+				}
+			}
+			this.element.addClass( "ui-helper-hidden-accessible" );
+
+			checked = this.element.is( ":checked" );
+			if ( checked ) {
+				this.buttonElement.addClass( "ui-state-active" );
+			}
+			this.buttonElement.prop( "aria-pressed", checked );
+		} else {
+			this.buttonElement = this.element;
+		}
+	},
+
+	widget: function() {
+		return this.buttonElement;
+	},
+
+	_destroy: function() {
+		this.element
+			.removeClass( "ui-helper-hidden-accessible" );
+		this.buttonElement
+			.removeClass( baseClasses + " " + stateClasses + " " + typeClasses )
+			.removeAttr( "role" )
+			.removeAttr( "aria-pressed" )
+			.html( this.buttonElement.find(".ui-button-text").html() );
+
+		if ( !this.hasTitle ) {
+			this.buttonElement.removeAttr( "title" );
+		}
+	},
+
+	_setOption: function( key, value ) {
+		this._super( key, value );
+		if ( key === "disabled" ) {
+			if ( value ) {
+				this.element.prop( "disabled", true );
+			} else {
+				this.element.prop( "disabled", false );
+			}
+			return;
+		}
+		this._resetButton();
+	},
+
+	refresh: function() {
+		//See #8237 & #8828
+		var isDisabled = this.element.is( "input, button" ) ? this.element.is( ":disabled" ) : this.element.hasClass( "ui-button-disabled" );
+
+		if ( isDisabled !== this.options.disabled ) {
+			this._setOption( "disabled", isDisabled );
+		}
+		if ( this.type === "radio" ) {
+			radioGroup( this.element[0] ).each(function() {
+				if ( $( this ).is( ":checked" ) ) {
+					$( this ).button( "widget" )
+						.addClass( "ui-state-active" )
+						.attr( "aria-pressed", "true" );
+				} else {
+					$( this ).button( "widget" )
+						.removeClass( "ui-state-active" )
+						.attr( "aria-pressed", "false" );
+				}
+			});
+		} else if ( this.type === "checkbox" ) {
+			if ( this.element.is( ":checked" ) ) {
+				this.buttonElement
+					.addClass( "ui-state-active" )
+					.attr( "aria-pressed", "true" );
+			} else {
+				this.buttonElement
+					.removeClass( "ui-state-active" )
+					.attr( "aria-pressed", "false" );
+			}
+		}
+	},
+
+	_resetButton: function() {
+		if ( this.type === "input" ) {
+			if ( this.options.label ) {
+				this.element.val( this.options.label );
+			}
+			return;
+		}
+		var buttonElement = this.buttonElement.removeClass( typeClasses ),
+			buttonText = $( "<span></span>", this.document[0] )
+				.addClass( "ui-button-text" )
+				.html( this.options.label )
+				.appendTo( buttonElement.empty() )
+				.text(),
+			icons = this.options.icons,
+			multipleIcons = icons.primary && icons.secondary,
+			buttonClasses = [];
+
+		if ( icons.primary || icons.secondary ) {
+			if ( this.options.text ) {
+				buttonClasses.push( "ui-button-text-icon" + ( multipleIcons ? "s" : ( icons.primary ? "-primary" : "-secondary" ) ) );
+			}
+
+			if ( icons.primary ) {
+				buttonElement.prepend( "<span class='ui-button-icon-primary ui-icon " + icons.primary + "'></span>" );
+			}
+
+			if ( icons.secondary ) {
+				buttonElement.append( "<span class='ui-button-icon-secondary ui-icon " + icons.secondary + "'></span>" );
+			}
+
+			if ( !this.options.text ) {
+				buttonClasses.push( multipleIcons ? "ui-button-icons-only" : "ui-button-icon-only" );
+
+				if ( !this.hasTitle ) {
+					buttonElement.attr( "title", $.trim( buttonText ) );
+				}
+			}
+		} else {
+			buttonClasses.push( "ui-button-text-only" );
+		}
+		buttonElement.addClass( buttonClasses.join( " " ) );
+	}
+});
+
+$.widget( "ui.buttonset", {
+	version: "1.10.3",
+	options: {
+		items: "button, input[type=button], input[type=submit], input[type=reset], input[type=checkbox], input[type=radio], a, :data(ui-button)"
+	},
+
+	_create: function() {
+		this.element.addClass( "ui-buttonset" );
+	},
+
+	_init: function() {
+		this.refresh();
+	},
+
+	_setOption: function( key, value ) {
+		if ( key === "disabled" ) {
+			this.buttons.button( "option", key, value );
+		}
+
+		this._super( key, value );
+	},
+
+	refresh: function() {
+		var rtl = this.element.css( "direction" ) === "rtl";
+
+		this.buttons = this.element.find( this.options.items )
+			.filter( ":ui-button" )
+				.button( "refresh" )
+			.end()
+			.not( ":ui-button" )
+				.button()
+			.end()
+			.map(function() {
+				return $( this ).button( "widget" )[ 0 ];
+			})
+				.removeClass( "ui-corner-all ui-corner-left ui-corner-right" )
+				.filter( ":first" )
+					.addClass( rtl ? "ui-corner-right" : "ui-corner-left" )
+				.end()
+				.filter( ":last" )
+					.addClass( rtl ? "ui-corner-left" : "ui-corner-right" )
+				.end()
+			.end();
+	},
+
+	_destroy: function() {
+		this.element.removeClass( "ui-buttonset" );
+		this.buttons
+			.map(function() {
+				return $( this ).button( "widget" )[ 0 ];
+			})
+				.removeClass( "ui-corner-left ui-corner-right" )
+			.end()
+			.button( "destroy" );
+	}
+});
+
+}( jQuery ) );
+
+(function( $, undefined ) {
+
+$.extend($.ui, { datepicker: { version: "1.10.3" } });
+
+var PROP_NAME = "datepicker",
+	instActive;
+
+/* Date picker manager.
+   Use the singleton instance of this class, $.datepicker, to interact with the date picker.
+   Settings for (groups of) date pickers are maintained in an instance object,
+   allowing multiple different settings on the same page. */
+
+function Datepicker() {
+	this._curInst = null; // The current instance in use
+	this._keyEvent = false; // If the last event was a key event
+	this._disabledInputs = []; // List of date picker inputs that have been disabled
+	this._datepickerShowing = false; // True if the popup picker is showing , false if not
+	this._inDialog = false; // True if showing within a "dialog", false if not
+	this._mainDivId = "ui-datepicker-div"; // The ID of the main datepicker division
+	this._inlineClass = "ui-datepicker-inline"; // The name of the inline marker class
+	this._appendClass = "ui-datepicker-append"; // The name of the append marker class
+	this._triggerClass = "ui-datepicker-trigger"; // The name of the trigger marker class
+	this._dialogClass = "ui-datepicker-dialog"; // The name of the dialog marker class
+	this._disableClass = "ui-datepicker-disabled"; // The name of the disabled covering marker class
+	this._unselectableClass = "ui-datepicker-unselectable"; // The name of the unselectable cell marker class
+	this._currentClass = "ui-datepicker-current-day"; // The name of the current day marker class
+	this._dayOverClass = "ui-datepicker-days-cell-over"; // The name of the day hover marker class
+	this.regional = []; // Available regional settings, indexed by language code
+	this.regional[""] = { // Default regional settings
+		closeText: "Done", // Display text for close link
+		prevText: "Prev", // Display text for previous month link
+		nextText: "Next", // Display text for next month link
+		currentText: "Today", // Display text for current month link
+		monthNames: ["January","February","March","April","May","June",
+			"July","August","September","October","November","December"], // Names of months for drop-down and formatting
+		monthNamesShort: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"], // For formatting
+		dayNames: ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"], // For formatting
+		dayNamesShort: ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"], // For formatting
+		dayNamesMin: ["Su","Mo","Tu","We","Th","Fr","Sa"], // Column headings for days starting at Sunday
+		weekHeader: "Wk", // Column header for week of the year
+		dateFormat: "mm/dd/yy", // See format options on parseDate
+		firstDay: 0, // The first day of the week, Sun = 0, Mon = 1, ...
+		isRTL: false, // True if right-to-left language, false if left-to-right
+		showMonthAfterYear: false, // True if the year select precedes month, false for month then year
+		yearSuffix: "" // Additional text to append to the year in the month headers
+	};
+	this._defaults = { // Global defaults for all the date picker instances
+		showOn: "focus", // "focus" for popup on focus,
+			// "button" for trigger button, or "both" for either
+		showAnim: "fadeIn", // Name of jQuery animation for popup
+		showOptions: {}, // Options for enhanced animations
+		defaultDate: null, // Used when field is blank: actual date,
+			// +/-number for offset from today, null for today
+		appendText: "", // Display text following the input box, e.g. showing the format
+		buttonText: "...", // Text for trigger button
+		buttonImage: "", // URL for trigger button image
+		buttonImageOnly: false, // True if the image appears alone, false if it appears on a button
+		hideIfNoPrevNext: false, // True to hide next/previous month links
+			// if not applicable, false to just disable them
+		navigationAsDateFormat: false, // True if date formatting applied to prev/today/next links
+		gotoCurrent: false, // True if today link goes back to current selection instead
+		changeMonth: false, // True if month can be selected directly, false if only prev/next
+		changeYear: false, // True if year can be selected directly, false if only prev/next
+		yearRange: "c-10:c+10", // Range of years to display in drop-down,
+			// either relative to today's year (-nn:+nn), relative to currently displayed year
+			// (c-nn:c+nn), absolute (nnnn:nnnn), or a combination of the above (nnnn:-n)
+		showOtherMonths: false, // True to show dates in other months, false to leave blank
+		selectOtherMonths: false, // True to allow selection of dates in other months, false for unselectable
+		showWeek: false, // True to show week of the year, false to not show it
+		calculateWeek: this.iso8601Week, // How to calculate the week of the year,
+			// takes a Date and returns the number of the week for it
+		shortYearCutoff: "+10", // Short year values < this are in the current century,
+			// > this are in the previous century,
+			// string value starting with "+" for current year + value
+		minDate: null, // The earliest selectable date, or null for no limit
+		maxDate: null, // The latest selectable date, or null for no limit
+		duration: "fast", // Duration of display/closure
+		beforeShowDay: null, // Function that takes a date and returns an array with
+			// [0] = true if selectable, false if not, [1] = custom CSS class name(s) or "",
+			// [2] = cell title (optional), e.g. $.datepicker.noWeekends
+		beforeShow: null, // Function that takes an input field and
+			// returns a set of custom settings for the date picker
+		onSelect: null, // Define a callback function when a date is selected
+		onChangeMonthYear: null, // Define a callback function when the month or year is changed
+		onClose: null, // Define a callback function when the datepicker is closed
+		numberOfMonths: 1, // Number of months to show at a time
+		showCurrentAtPos: 0, // The position in multipe months at which to show the current month (starting at 0)
+		stepMonths: 1, // Number of months to step back/forward
+		stepBigMonths: 12, // Number of months to step back/forward for the big links
+		altField: "", // Selector for an alternate field to store selected dates into
+		altFormat: "", // The date format to use for the alternate field
+		constrainInput: true, // The input is constrained by the current date format
+		showButtonPanel: false, // True to show button panel, false to not show it
+		autoSize: false, // True to size the input for the date format, false to leave as is
+		disabled: false // The initial disabled state
+	};
+	$.extend(this._defaults, this.regional[""]);
+	this.dpDiv = bindHover($("<div id='" + this._mainDivId + "' class='ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>"));
+}
+
+$.extend(Datepicker.prototype, {
+	/* Class name added to elements to indicate already configured with a date picker. */
+	markerClassName: "hasDatepicker",
+
+	//Keep track of the maximum number of rows displayed (see #7043)
+	maxRows: 4,
+
+	// TODO rename to "widget" when switching to widget factory
+	_widgetDatepicker: function() {
+		return this.dpDiv;
+	},
+
+	/* Override the default settings for all instances of the date picker.
+	 * @param  settings  object - the new settings to use as defaults (anonymous object)
+	 * @return the manager object
+	 */
+	setDefaults: function(settings) {
+		extendRemove(this._defaults, settings || {});
+		return this;
+	},
+
+	/* Attach the date picker to a jQuery selection.
+	 * @param  target	element - the target input field or division or span
+	 * @param  settings  object - the new settings to use for this date picker instance (anonymous)
+	 */
+	_attachDatepicker: function(target, settings) {
+		var nodeName, inline, inst;
+		nodeName = target.nodeName.toLowerCase();
+		inline = (nodeName === "div" || nodeName === "span");
+		if (!target.id) {
+			this.uuid += 1;
+			target.id = "dp" + this.uuid;
+		}
+		inst = this._newInst($(target), inline);
+		inst.settings = $.extend({}, settings || {});
+		if (nodeName === "input") {
+			this._connectDatepicker(target, inst);
+		} else if (inline) {
+			this._inlineDatepicker(target, inst);
+		}
+	},
+
+	/* Create a new instance object. */
+	_newInst: function(target, inline) {
+		var id = target[0].id.replace(/([^A-Za-z0-9_\-])/g, "\\\\$1"); // escape jQuery meta chars
+		return {id: id, input: target, // associated target
+			selectedDay: 0, selectedMonth: 0, selectedYear: 0, // current selection
+			drawMonth: 0, drawYear: 0, // month being drawn
+			inline: inline, // is datepicker inline or not
+			dpDiv: (!inline ? this.dpDiv : // presentation div
+			bindHover($("<div class='" + this._inlineClass + " ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>")))};
+	},
+
+	/* Attach the date picker to an input field. */
+	_connectDatepicker: function(target, inst) {
+		var input = $(target);
+		inst.append = $([]);
+		inst.trigger = $([]);
+		if (input.hasClass(this.markerClassName)) {
+			return;
+		}
+		this._attachments(input, inst);
+		input.addClass(this.markerClassName).keydown(this._doKeyDown).
+			keypress(this._doKeyPress).keyup(this._doKeyUp);
+		this._autoSize(inst);
+		$.data(target, PROP_NAME, inst);
+		//If disabled option is true, disable the datepicker once it has been attached to the input (see ticket #5665)
+		if( inst.settings.disabled ) {
+			this._disableDatepicker( target );
+		}
+	},
+
+	/* Make attachments based on settings. */
+	_attachments: function(input, inst) {
+		var showOn, buttonText, buttonImage,
+			appendText = this._get(inst, "appendText"),
+			isRTL = this._get(inst, "isRTL");
+
+		if (inst.append) {
+			inst.append.remove();
+		}
+		if (appendText) {
+			inst.append = $("<span class='" + this._appendClass + "'>" + appendText + "</span>");
+			input[isRTL ? "before" : "after"](inst.append);
+		}
+
+		input.unbind("focus", this._showDatepicker);
+
+		if (inst.trigger) {
+			inst.trigger.remove();
+		}
+
+		showOn = this._get(inst, "showOn");
+		if (showOn === "focus" || showOn === "both") { // pop-up date picker when in the marked field
+			input.focus(this._showDatepicker);
+		}
+		if (showOn === "button" || showOn === "both") { // pop-up date picker when button clicked
+			buttonText = this._get(inst, "buttonText");
+			buttonImage = this._get(inst, "buttonImage");
+			inst.trigger = $(this._get(inst, "buttonImageOnly") ?
+				$("<img/>").addClass(this._triggerClass).
+					attr({ src: buttonImage, alt: buttonText, title: buttonText }) :
+				$("<button type='button'></button>").addClass(this._triggerClass).
+					html(!buttonImage ? buttonText : $("<img/>").attr(
+					{ src:buttonImage, alt:buttonText, title:buttonText })));
+			input[isRTL ? "before" : "after"](inst.trigger);
+			inst.trigger.click(function() {
+				if ($.datepicker._datepickerShowing && $.datepicker._lastInput === input[0]) {
+					$.datepicker._hideDatepicker();
+				} else if ($.datepicker._datepickerShowing && $.datepicker._lastInput !== input[0]) {
+					$.datepicker._hideDatepicker();
+					$.datepicker._showDatepicker(input[0]);
+				} else {
+					$.datepicker._showDatepicker(input[0]);
+				}
+				return false;
+			});
+		}
+	},
+
+	/* Apply the maximum length for the date format. */
+	_autoSize: function(inst) {
+		if (this._get(inst, "autoSize") && !inst.inline) {
+			var findMax, max, maxI, i,
+				date = new Date(2009, 12 - 1, 20), // Ensure double digits
+				dateFormat = this._get(inst, "dateFormat");
+
+			if (dateFormat.match(/[DM]/)) {
+				findMax = function(names) {
+					max = 0;
+					maxI = 0;
+					for (i = 0; i < names.length; i++) {
+						if (names[i].length > max) {
+							max = names[i].length;
+							maxI = i;
+						}
+					}
+					return maxI;
+				};
+				date.setMonth(findMax(this._get(inst, (dateFormat.match(/MM/) ?
+					"monthNames" : "monthNamesShort"))));
+				date.setDate(findMax(this._get(inst, (dateFormat.match(/DD/) ?
+					"dayNames" : "dayNamesShort"))) + 20 - date.getDay());
+			}
+			inst.input.attr("size", this._formatDate(inst, date).length);
+		}
+	},
+
+	/* Attach an inline date picker to a div. */
+	_inlineDatepicker: function(target, inst) {
+		var divSpan = $(target);
+		if (divSpan.hasClass(this.markerClassName)) {
+			return;
+		}
+		divSpan.addClass(this.markerClassName).append(inst.dpDiv);
+		$.data(target, PROP_NAME, inst);
+		this._setDate(inst, this._getDefaultDate(inst), true);
+		this._updateDatepicker(inst);
+		this._updateAlternate(inst);
+		//If disabled option is true, disable the datepicker before showing it (see ticket #5665)
+		if( inst.settings.disabled ) {
+			this._disableDatepicker( target );
+		}
+		// Set display:block in place of inst.dpDiv.show() which won't work on disconnected elements
+		// http://bugs.jqueryui.com/ticket/7552 - A Datepicker created on a detached div has zero height
+		inst.dpDiv.css( "display", "block" );
+	},
+
+	/* Pop-up the date picker in a "dialog" box.
+	 * @param  input element - ignored
+	 * @param  date	string or Date - the initial date to display
+	 * @param  onSelect  function - the function to call when a date is selected
+	 * @param  settings  object - update the dialog date picker instance's settings (anonymous object)
+	 * @param  pos int[2] - coordinates for the dialog's position within the screen or
+	 *					event - with x/y coordinates or
+	 *					leave empty for default (screen centre)
+	 * @return the manager object
+	 */
+	_dialogDatepicker: function(input, date, onSelect, settings, pos) {
+		var id, browserWidth, browserHeight, scrollX, scrollY,
+			inst = this._dialogInst; // internal instance
+
+		if (!inst) {
+			this.uuid += 1;
+			id = "dp" + this.uuid;
+			this._dialogInput = $("<input type='text' id='" + id +
+				"' style='position: absolute; top: -100px; width: 0px;'/>");
+			this._dialogInput.keydown(this._doKeyDown);
+			$("body").append(this._dialogInput);
+			inst = this._dialogInst = this._newInst(this._dialogInput, false);
+			inst.settings = {};
+			$.data(this._dialogInput[0], PROP_NAME, inst);
+		}
+		extendRemove(inst.settings, settings || {});
+		date = (date && date.constructor === Date ? this._formatDate(inst, date) : date);
+		this._dialogInput.val(date);
+
+		this._pos = (pos ? (pos.length ? pos : [pos.pageX, pos.pageY]) : null);
+		if (!this._pos) {
+			browserWidth = document.documentElement.clientWidth;
+			browserHeight = document.documentElement.clientHeight;
+			scrollX = document.documentElement.scrollLeft || document.body.scrollLeft;
+			scrollY = document.documentElement.scrollTop || document.body.scrollTop;
+			this._pos = // should use actual width/height below
+				[(browserWidth / 2) - 100 + scrollX, (browserHeight / 2) - 150 + scrollY];
+		}
+
+		// move input on screen for focus, but hidden behind dialog
+		this._dialogInput.css("left", (this._pos[0] + 20) + "px").css("top", this._pos[1] + "px");
+		inst.settings.onSelect = onSelect;
+		this._inDialog = true;
+		this.dpDiv.addClass(this._dialogClass);
+		this._showDatepicker(this._dialogInput[0]);
+		if ($.blockUI) {
+			$.blockUI(this.dpDiv);
+		}
+		$.data(this._dialogInput[0], PROP_NAME, inst);
+		return this;
+	},
+
+	/* Detach a datepicker from its control.
+	 * @param  target	element - the target input field or division or span
+	 */
+	_destroyDatepicker: function(target) {
+		var nodeName,
+			$target = $(target),
+			inst = $.data(target, PROP_NAME);
+
+		if (!$target.hasClass(this.markerClassName)) {
+			return;
+		}
+
+		nodeName = target.nodeName.toLowerCase();
+		$.removeData(target, PROP_NAME);
+		if (nodeName === "input") {
+			inst.append.remove();
+			inst.trigger.remove();
+			$target.removeClass(this.markerClassName).
+				unbind("focus", this._showDatepicker).
+				unbind("keydown", this._doKeyDown).
+				unbind("keypress", this._doKeyPress).
+				unbind("keyup", this._doKeyUp);
+		} else if (nodeName === "div" || nodeName === "span") {
+			$target.removeClass(this.markerClassName).empty();
+		}
+	},
+
+	/* Enable the date picker to a jQuery selection.
+	 * @param  target	element - the target input field or division or span
+	 */
+	_enableDatepicker: function(target) {
+		var nodeName, inline,
+			$target = $(target),
+			inst = $.data(target, PROP_NAME);
+
+		if (!$target.hasClass(this.markerClassName)) {
+			return;
+		}
+
+		nodeName = target.nodeName.toLowerCase();
+		if (nodeName === "input") {
+			target.disabled = false;
+			inst.trigger.filter("button").
+				each(function() { this.disabled = false; }).end().
+				filter("img").css({opacity: "1.0", cursor: ""});
+		} else if (nodeName === "div" || nodeName === "span") {
+			inline = $target.children("." + this._inlineClass);
+			inline.children().removeClass("ui-state-disabled");
+			inline.find("select.ui-datepicker-month, select.ui-datepicker-year").
+				prop("disabled", false);
+		}
+		this._disabledInputs = $.map(this._disabledInputs,
+			function(value) { return (value === target ? null : value); }); // delete entry
+	},
+
+	/* Disable the date picker to a jQuery selection.
+	 * @param  target	element - the target input field or division or span
+	 */
+	_disableDatepicker: function(target) {
+		var nodeName, inline,
+			$target = $(target),
+			inst = $.data(target, PROP_NAME);
+
+		if (!$target.hasClass(this.markerClassName)) {
+			return;
+		}
+
+		nodeName = target.nodeName.toLowerCase();
+		if (nodeName === "input") {
+			target.disabled = true;
+			inst.trigger.filter("button").
+				each(function() { this.disabled = true; }).end().
+				filter("img").css({opacity: "0.5", cursor: "default"});
+		} else if (nodeName === "div" || nodeName === "span") {
+			inline = $target.children("." + this._inlineClass);
+			inline.children().addClass("ui-state-disabled");
+			inline.find("select.ui-datepicker-month, select.ui-datepicker-year").
+				prop("disabled", true);
+		}
+		this._disabledInputs = $.map(this._disabledInputs,
+			function(value) { return (value === target ? null : value); }); // delete entry
+		this._disabledInputs[this._disabledInputs.length] = target;
+	},
+
+	/* Is the first field in a jQuery collection disabled as a datepicker?
+	 * @param  target	element - the target input field or division or span
+	 * @return boolean - true if disabled, false if enabled
+	 */
+	_isDisabledDatepicker: function(target) {
+		if (!target) {
+			return false;
+		}
+		for (var i = 0; i < this._disabledInputs.length; i++) {
+			if (this._disabledInputs[i] === target) {
+				return true;
+			}
+		}
+		return false;
+	},
+
+	/* Retrieve the instance data for the target control.
+	 * @param  target  element - the target input field or division or span
+	 * @return  object - the associated instance data
+	 * @throws  error if a jQuery problem getting data
+	 */
+	_getInst: function(target) {
+		try {
+			return $.data(target, PROP_NAME);
+		}
+		catch (err) {
+			throw "Missing instance data for this datepicker";
+		}
+	},
+
+	/* Update or retrieve the settings for a date picker attached to an input field or division.
+	 * @param  target  element - the target input field or division or span
+	 * @param  name	object - the new settings to update or
+	 *				string - the name of the setting to change or retrieve,
+	 *				when retrieving also "all" for all instance settings or
+	 *				"defaults" for all global defaults
+	 * @param  value   any - the new value for the setting
+	 *				(omit if above is an object or to retrieve a value)
+	 */
+	_optionDatepicker: function(target, name, value) {
+		var settings, date, minDate, maxDate,
+			inst = this._getInst(target);
+
+		if (arguments.length === 2 && typeof name === "string") {
+			return (name === "defaults" ? $.extend({}, $.datepicker._defaults) :
+				(inst ? (name === "all" ? $.extend({}, inst.settings) :
+				this._get(inst, name)) : null));
+		}
+
+		settings = name || {};
+		if (typeof name === "string") {
+			settings = {};
+			settings[name] = value;
+		}
+
+		if (inst) {
+			if (this._curInst === inst) {
+				this._hideDatepicker();
+			}
+
+			date = this._getDateDatepicker(target, true);
+			minDate = this._getMinMaxDate(inst, "min");
+			maxDate = this._getMinMaxDate(inst, "max");
+			extendRemove(inst.settings, settings);
+			// reformat the old minDate/maxDate values if dateFormat changes and a new minDate/maxDate isn't provided
+			if (minDate !== null && settings.dateFormat !== undefined && settings.minDate === undefined) {
+				inst.settings.minDate = this._formatDate(inst, minDate);
+			}
+			if (maxDate !== null && settings.dateFormat !== undefined && settings.maxDate === undefined) {
+				inst.settings.maxDate = this._formatDate(inst, maxDate);
+			}
+			if ( "disabled" in settings ) {
+				if ( settings.disabled ) {
+					this._disableDatepicker(target);
+				} else {
+					this._enableDatepicker(target);
+				}
+			}
+			this._attachments($(target), inst);
+			this._autoSize(inst);
+			this._setDate(inst, date);
+			this._updateAlternate(inst);
+			this._updateDatepicker(inst);
+		}
+	},
+
+	// change method deprecated
+	_changeDatepicker: function(target, name, value) {
+		this._optionDatepicker(target, name, value);
+	},
+
+	/* Redraw the date picker attached to an input field or division.
+	 * @param  target  element - the target input field or division or span
+	 */
+	_refreshDatepicker: function(target) {
+		var inst = this._getInst(target);
+		if (inst) {
+			this._updateDatepicker(inst);
+		}
+	},
+
+	/* Set the dates for a jQuery selection.
+	 * @param  target element - the target input field or division or span
+	 * @param  date	Date - the new date
+	 */
+	_setDateDatepicker: function(target, date) {
+		var inst = this._getInst(target);
+		if (inst) {
+			this._setDate(inst, date);
+			this._updateDatepicker(inst);
+			this._updateAlternate(inst);
+		}
+	},
+
+	/* Get the date(s) for the first entry in a jQuery selection.
+	 * @param  target element - the target input field or division or span
+	 * @param  noDefault boolean - true if no default date is to be used
+	 * @return Date - the current date
+	 */
+	_getDateDatepicker: function(target, noDefault) {
+		var inst = this._getInst(target);
+		if (inst && !inst.inline) {
+			this._setDateFromField(inst, noDefault);
+		}
+		return (inst ? this._getDate(inst) : null);
+	},
+
+	/* Handle keystrokes. */
+	_doKeyDown: function(event) {
+		var onSelect, dateStr, sel,
+			inst = $.datepicker._getInst(event.target),
+			handled = true,
+			isRTL = inst.dpDiv.is(".ui-datepicker-rtl");
+
+		inst._keyEvent = true;
+		if ($.datepicker._datepickerShowing) {
+			switch (event.keyCode) {
+				case 9: $.datepicker._hideDatepicker();
+						handled = false;
+						break; // hide on tab out
+				case 13: sel = $("td." + $.datepicker._dayOverClass + ":not(." +
+									$.datepicker._currentClass + ")", inst.dpDiv);
+						if (sel[0]) {
+							$.datepicker._selectDay(event.target, inst.selectedMonth, inst.selectedYear, sel[0]);
+						}
+
+						onSelect = $.datepicker._get(inst, "onSelect");
+						if (onSelect) {
+							dateStr = $.datepicker._formatDate(inst);
+
+							// trigger custom callback
+							onSelect.apply((inst.input ? inst.input[0] : null), [dateStr, inst]);
+						} else {
+							$.datepicker._hideDatepicker();
+						}
+
+						return false; // don't submit the form
+				case 27: $.datepicker._hideDatepicker();
+						break; // hide on escape
+				case 33: $.datepicker._adjustDate(event.target, (event.ctrlKey ?
+							-$.datepicker._get(inst, "stepBigMonths") :
+							-$.datepicker._get(inst, "stepMonths")), "M");
+						break; // previous month/year on page up/+ ctrl
+				case 34: $.datepicker._adjustDate(event.target, (event.ctrlKey ?
+							+$.datepicker._get(inst, "stepBigMonths") :
+							+$.datepicker._get(inst, "stepMonths")), "M");
+						break; // next month/year on page down/+ ctrl
+				case 35: if (event.ctrlKey || event.metaKey) {
+							$.datepicker._clearDate(event.target);
+						}
+						handled = event.ctrlKey || event.metaKey;
+						break; // clear on ctrl or command +end
+				case 36: if (event.ctrlKey || event.metaKey) {
+							$.datepicker._gotoToday(event.target);
+						}
+						handled = event.ctrlKey || event.metaKey;
+						break; // current on ctrl or command +home
+				case 37: if (event.ctrlKey || event.metaKey) {
+							$.datepicker._adjustDate(event.target, (isRTL ? +1 : -1), "D");
+						}
+						handled = event.ctrlKey || event.metaKey;
+						// -1 day on ctrl or command +left
+						if (event.originalEvent.altKey) {
+							$.datepicker._adjustDate(event.target, (event.ctrlKey ?
+								-$.datepicker._get(inst, "stepBigMonths") :
+								-$.datepicker._get(inst, "stepMonths")), "M");
+						}
+						// next month/year on alt +left on Mac
+						break;
+				case 38: if (event.ctrlKey || event.metaKey) {
+							$.datepicker._adjustDate(event.target, -7, "D");
+						}
+						handled = event.ctrlKey || event.metaKey;
+						break; // -1 week on ctrl or command +up
+				case 39: if (event.ctrlKey || event.metaKey) {
+							$.datepicker._adjustDate(event.target, (isRTL ? -1 : +1), "D");
+						}
+						handled = event.ctrlKey || event.metaKey;
+						// +1 day on ctrl or command +right
+						if (event.originalEvent.altKey) {
+							$.datepicker._adjustDate(event.target, (event.ctrlKey ?
+								+$.datepicker._get(inst, "stepBigMonths") :
+								+$.datepicker._get(inst, "stepMonths")), "M");
+						}
+						// next month/year on alt +right
+						break;
+				case 40: if (event.ctrlKey || event.metaKey) {
+							$.datepicker._adjustDate(event.target, +7, "D");
+						}
+						handled = event.ctrlKey || event.metaKey;
+						break; // +1 week on ctrl or command +down
+				default: handled = false;
+			}
+		} else if (event.keyCode === 36 && event.ctrlKey) { // display the date picker on ctrl+home
+			$.datepicker._showDatepicker(this);
+		} else {
+			handled = false;
+		}
+
+		if (handled) {
+			event.preventDefault();
+			event.stopPropagation();
+		}
+	},
+
+	/* Filter entered characters - based on date format. */
+	_doKeyPress: function(event) {
+		var chars, chr,
+			inst = $.datepicker._getInst(event.target);
+
+		if ($.datepicker._get(inst, "constrainInput")) {
+			chars = $.datepicker._possibleChars($.datepicker._get(inst, "dateFormat"));
+			chr = String.fromCharCode(event.charCode == null ? event.keyCode : event.charCode);
+			return event.ctrlKey || event.metaKey || (chr < " " || !chars || chars.indexOf(chr) > -1);
+		}
+	},
+
+	/* Synchronise manual entry and field/alternate field. */
+	_doKeyUp: function(event) {
+		var date,
+			inst = $.datepicker._getInst(event.target);
+
+		if (inst.input.val() !== inst.lastVal) {
+			try {
+				date = $.datepicker.parseDate($.datepicker._get(inst, "dateFormat"),
+					(inst.input ? inst.input.val() : null),
+					$.datepicker._getFormatConfig(inst));
+
+				if (date) { // only if valid
+					$.datepicker._setDateFromField(inst);
+					$.datepicker._updateAlternate(inst);
+					$.datepicker._updateDatepicker(inst);
+				}
+			}
+			catch (err) {
+			}
+		}
+		return true;
+	},
+
+	/* Pop-up the date picker for a given input field.
+	 * If false returned from beforeShow event handler do not show.
+	 * @param  input  element - the input field attached to the date picker or
+	 *					event - if triggered by focus
+	 */
+	_showDatepicker: function(input) {
+		input = input.target || input;
+		if (input.nodeName.toLowerCase() !== "input") { // find from button/image trigger
+			input = $("input", input.parentNode)[0];
+		}
+
+		if ($.datepicker._isDisabledDatepicker(input) || $.datepicker._lastInput === input) { // already here
+			return;
+		}
+
+		var inst, beforeShow, beforeShowSettings, isFixed,
+			offset, showAnim, duration;
+
+		inst = $.datepicker._getInst(input);
+		if ($.datepicker._curInst && $.datepicker._curInst !== inst) {
+			$.datepicker._curInst.dpDiv.stop(true, true);
+			if ( inst && $.datepicker._datepickerShowing ) {
+				$.datepicker._hideDatepicker( $.datepicker._curInst.input[0] );
+			}
+		}
+
+		beforeShow = $.datepicker._get(inst, "beforeShow");
+		beforeShowSettings = beforeShow ? beforeShow.apply(input, [input, inst]) : {};
+		if(beforeShowSettings === false){
+			return;
+		}
+		extendRemove(inst.settings, beforeShowSettings);
+
+		inst.lastVal = null;
+		$.datepicker._lastInput = input;
+		$.datepicker._setDateFromField(inst);
+
+		if ($.datepicker._inDialog) { // hide cursor
+			input.value = "";
+		}
+		if (!$.datepicker._pos) { // position below input
+			$.datepicker._pos = $.datepicker._findPos(input);
+			$.datepicker._pos[1] += input.offsetHeight; // add the height
+		}
+
+		isFixed = false;
+		$(input).parents().each(function() {
+			isFixed |= $(this).css("position") === "fixed";
+			return !isFixed;
+		});
+
+		offset = {left: $.datepicker._pos[0], top: $.datepicker._pos[1]};
+		$.datepicker._pos = null;
+		//to avoid flashes on Firefox
+		inst.dpDiv.empty();
+		// determine sizing offscreen
+		inst.dpDiv.css({position: "absolute", display: "block", top: "-1000px"});
+		$.datepicker._updateDatepicker(inst);
+		// fix width for dynamic number of date pickers
+		// and adjust position before showing
+		offset = $.datepicker._checkOffset(inst, offset, isFixed);
+		inst.dpDiv.css({position: ($.datepicker._inDialog && $.blockUI ?
+			"static" : (isFixed ? "fixed" : "absolute")), display: "none",
+			left: offset.left + "px", top: offset.top + "px"});
+
+		if (!inst.inline) {
+			showAnim = $.datepicker._get(inst, "showAnim");
+			duration = $.datepicker._get(inst, "duration");
+			inst.dpDiv.zIndex($(input).zIndex()+1);
+			$.datepicker._datepickerShowing = true;
+
+			if ( $.effects && $.effects.effect[ showAnim ] ) {
+				inst.dpDiv.show(showAnim, $.datepicker._get(inst, "showOptions"), duration);
+			} else {
+				inst.dpDiv[showAnim || "show"](showAnim ? duration : null);
+			}
+
+			if ( $.datepicker._shouldFocusInput( inst ) ) {
+				inst.input.focus();
+			}
+
+			$.datepicker._curInst = inst;
+		}
+	},
+
+	/* Generate the date picker content. */
+	_updateDatepicker: function(inst) {
+		this.maxRows = 4; //Reset the max number of rows being displayed (see #7043)
+		instActive = inst; // for delegate hover events
+		inst.dpDiv.empty().append(this._generateHTML(inst));
+		this._attachHandlers(inst);
+		inst.dpDiv.find("." + this._dayOverClass + " a").mouseover();
+
+		var origyearshtml,
+			numMonths = this._getNumberOfMonths(inst),
+			cols = numMonths[1],
+			width = 17;
+
+		inst.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width("");
+		if (cols > 1) {
+			inst.dpDiv.addClass("ui-datepicker-multi-" + cols).css("width", (width * cols) + "em");
+		}
+		inst.dpDiv[(numMonths[0] !== 1 || numMonths[1] !== 1 ? "add" : "remove") +
+			"Class"]("ui-datepicker-multi");
+		inst.dpDiv[(this._get(inst, "isRTL") ? "add" : "remove") +
+			"Class"]("ui-datepicker-rtl");
+
+		if (inst === $.datepicker._curInst && $.datepicker._datepickerShowing && $.datepicker._shouldFocusInput( inst ) ) {
+			inst.input.focus();
+		}
+
+		// deffered render of the years select (to avoid flashes on Firefox)
+		if( inst.yearshtml ){
+			origyearshtml = inst.yearshtml;
+			setTimeout(function(){
+				//assure that inst.yearshtml didn't change.
+				if( origyearshtml === inst.yearshtml && inst.yearshtml ){
+					inst.dpDiv.find("select.ui-datepicker-year:first").replaceWith(inst.yearshtml);
+				}
+				origyearshtml = inst.yearshtml = null;
+			}, 0);
+		}
+	},
+
+	// #6694 - don't focus the input if it's already focused
+	// this breaks the change event in IE
+	// Support: IE and jQuery <1.9
+	_shouldFocusInput: function( inst ) {
+		return inst.input && inst.input.is( ":visible" ) && !inst.input.is( ":disabled" ) && !inst.input.is( ":focus" );
+	},
+
+	/* Check positioning to remain on screen. */
+	_checkOffset: function(inst, offset, isFixed) {
+		var dpWidth = inst.dpDiv.outerWidth(),
+			dpHeight = inst.dpDiv.outerHeight(),
+			inputWidth = inst.input ? inst.input.outerWidth() : 0,
+			inputHeight = inst.input ? inst.input.outerHeight() : 0,
+			viewWidth = document.documentElement.clientWidth + (isFixed ? 0 : $(document).scrollLeft()),
+			viewHeight = document.documentElement.clientHeight + (isFixed ? 0 : $(document).scrollTop());
+
+		offset.left -= (this._get(inst, "isRTL") ? (dpWidth - inputWidth) : 0);
+		offset.left -= (isFixed && offset.left === inst.input.offset().left) ? $(document).scrollLeft() : 0;
+		offset.top -= (isFixed && offset.top === (inst.input.offset().top + inputHeight)) ? $(document).scrollTop() : 0;
+
+		// now check if datepicker is showing outside window viewport - move to a better place if so.
+		offset.left -= Math.min(offset.left, (offset.left + dpWidth > viewWidth && viewWidth > dpWidth) ?
+			Math.abs(offset.left + dpWidth - viewWidth) : 0);
+		offset.top -= Math.min(offset.top, (offset.top + dpHeight > viewHeight && viewHeight > dpHeight) ?
+			Math.abs(dpHeight + inputHeight) : 0);
+
+		return offset;
+	},
+
+	/* Find an object's position on the screen. */
+	_findPos: function(obj) {
+		var position,
+			inst = this._getInst(obj),
+			isRTL = this._get(inst, "isRTL");
+
+		while (obj && (obj.type === "hidden" || obj.nodeType !== 1 || $.expr.filters.hidden(obj))) {
+			obj = obj[isRTL ? "previousSibling" : "nextSibling"];
+		}
+
+		position = $(obj).offset();
+		return [position.left, position.top];
+	},
+
+	/* Hide the date picker from view.
+	 * @param  input  element - the input field attached to the date picker
+	 */
+	_hideDatepicker: function(input) {
+		var showAnim, duration, postProcess, onClose,
+			inst = this._curInst;
+
+		if (!inst || (input && inst !== $.data(input, PROP_NAME))) {
+			return;
+		}
+
+		if (this._datepickerShowing) {
+			showAnim = this._get(inst, "showAnim");
+			duration = this._get(inst, "duration");
+			postProcess = function() {
+				$.datepicker._tidyDialog(inst);
+			};
+
+			// DEPRECATED: after BC for 1.8.x $.effects[ showAnim ] is not needed
+			if ( $.effects && ( $.effects.effect[ showAnim ] || $.effects[ showAnim ] ) ) {
+				inst.dpDiv.hide(showAnim, $.datepicker._get(inst, "showOptions"), duration, postProcess);
+			} else {
+				inst.dpDiv[(showAnim === "slideDown" ? "slideUp" :
+					(showAnim === "fadeIn" ? "fadeOut" : "hide"))]((showAnim ? duration : null), postProcess);
+			}
+
+			if (!showAnim) {
+				postProcess();
+			}
+			this._datepickerShowing = false;
+
+			onClose = this._get(inst, "onClose");
+			if (onClose) {
+				onClose.apply((inst.input ? inst.input[0] : null), [(inst.input ? inst.input.val() : ""), inst]);
+			}
+
+			this._lastInput = null;
+			if (this._inDialog) {
+				this._dialogInput.css({ position: "absolute", left: "0", top: "-100px" });
+				if ($.blockUI) {
+					$.unblockUI();
+					$("body").append(this.dpDiv);
+				}
+			}
+			this._inDialog = false;
+		}
+	},
+
+	/* Tidy up after a dialog display. */
+	_tidyDialog: function(inst) {
+		inst.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar");
+	},
+
+	/* Close date picker if clicked elsewhere. */
+	_checkExternalClick: function(event) {
+		if (!$.datepicker._curInst) {
+			return;
+		}
+
+		var $target = $(event.target),
+			inst = $.datepicker._getInst($target[0]);
+
+		if ( ( ( $target[0].id !== $.datepicker._mainDivId &&
+				$target.parents("#" + $.datepicker._mainDivId).length === 0 &&
+				!$target.hasClass($.datepicker.markerClassName) &&
+				!$target.closest("." + $.datepicker._triggerClass).length &&
+				$.datepicker._datepickerShowing && !($.datepicker._inDialog && $.blockUI) ) ) ||
+			( $target.hasClass($.datepicker.markerClassName) && $.datepicker._curInst !== inst ) ) {
+				$.datepicker._hideDatepicker();
+		}
+	},
+
+	/* Adjust one of the date sub-fields. */
+	_adjustDate: function(id, offset, period) {
+		var target = $(id),
+			inst = this._getInst(target[0]);
+
+		if (this._isDisabledDatepicker(target[0])) {
+			return;
+		}
+		this._adjustInstDate(inst, offset +
+			(period === "M" ? this._get(inst, "showCurrentAtPos") : 0), // undo positioning
+			period);
+		this._updateDatepicker(inst);
+	},
+
+	/* Action for current link. */
+	_gotoToday: function(id) {
+		var date,
+			target = $(id),
+			inst = this._getInst(target[0]);
+
+		if (this._get(inst, "gotoCurrent") && inst.currentDay) {
+			inst.selectedDay = inst.currentDay;
+			inst.drawMonth = inst.selectedMonth = inst.currentMonth;
+			inst.drawYear = inst.selectedYear = inst.currentYear;
+		} else {
+			date = new Date();
+			inst.selectedDay = date.getDate();
+			inst.drawMonth = inst.selectedMonth = date.getMonth();
+			inst.drawYear = inst.selectedYear = date.getFullYear();
+		}
+		this._notifyChange(inst);
+		this._adjustDate(target);
+	},
+
+	/* Action for selecting a new month/year. */
+	_selectMonthYear: function(id, select, period) {
+		var target = $(id),
+			inst = this._getInst(target[0]);
+
+		inst["selected" + (period === "M" ? "Month" : "Year")] =
+		inst["draw" + (period === "M" ? "Month" : "Year")] =
+			parseInt(select.options[select.selectedIndex].value,10);
+
+		this._notifyChange(inst);
+		this._adjustDate(target);
+	},
+
+	/* Action for selecting a day. */
+	_selectDay: function(id, month, year, td) {
+		var inst,
+			target = $(id);
+
+		if ($(td).hasClass(this._unselectableClass) || this._isDisabledDatepicker(target[0])) {
+			return;
+		}
+
+		inst = this._getInst(target[0]);
+		inst.selectedDay = inst.currentDay = $("a", td).html();
+		inst.selectedMonth = inst.currentMonth = month;
+		inst.selectedYear = inst.currentYear = year;
+		this._selectDate(id, this._formatDate(inst,
+			inst.currentDay, inst.currentMonth, inst.currentYear));
+	},
+
+	/* Erase the input field and hide the date picker. */
+	_clearDate: function(id) {
+		var target = $(id);
+		this._selectDate(target, "");
+	},
+
+	/* Update the input field with the selected date. */
+	_selectDate: function(id, dateStr) {
+		var onSelect,
+			target = $(id),
+			inst = this._getInst(target[0]);
+
+		dateStr = (dateStr != null ? dateStr : this._formatDate(inst));
+		if (inst.input) {
+			inst.input.val(dateStr);
+		}
+		this._updateAlternate(inst);
+
+		onSelect = this._get(inst, "onSelect");
+		if (onSelect) {
+			onSelect.apply((inst.input ? inst.input[0] : null), [dateStr, inst]);  // trigger custom callback
+		} else if (inst.input) {
+			inst.input.trigger("change"); // fire the change event
+		}
+
+		if (inst.inline){
+			this._updateDatepicker(inst);
+		} else {
+			this._hideDatepicker();
+			this._lastInput = inst.input[0];
+			if (typeof(inst.input[0]) !== "object") {
+				inst.input.focus(); // restore focus
+			}
+			this._lastInput = null;
+		}
+	},
+
+	/* Update any alternate field to synchronise with the main field. */
+	_updateAlternate: function(inst) {
+		var altFormat, date, dateStr,
+			altField = this._get(inst, "altField");
+
+		if (altField) { // update alternate field too
+			altFormat = this._get(inst, "altFormat") || this._get(inst, "dateFormat");
+			date = this._getDate(inst);
+			dateStr = this.formatDate(altFormat, date, this._getFormatConfig(inst));
+			$(altField).each(function() { $(this).val(dateStr); });
+		}
+	},
+
+	/* Set as beforeShowDay function to prevent selection of weekends.
+	 * @param  date  Date - the date to customise
+	 * @return [boolean, string] - is this date selectable?, what is its CSS class?
+	 */
+	noWeekends: function(date) {
+		var day = date.getDay();
+		return [(day > 0 && day < 6), ""];
+	},
+
+	/* Set as calculateWeek to determine the week of the year based on the ISO 8601 definition.
+	 * @param  date  Date - the date to get the week for
+	 * @return  number - the number of the week within the year that contains this date
+	 */
+	iso8601Week: function(date) {
+		var time,
+			checkDate = new Date(date.getTime());
+
+		// Find Thursday of this week starting on Monday
+		checkDate.setDate(checkDate.getDate() + 4 - (checkDate.getDay() || 7));
+
+		time = checkDate.getTime();
+		checkDate.setMonth(0); // Compare with Jan 1
+		checkDate.setDate(1);
+		return Math.floor(Math.round((time - checkDate) / 86400000) / 7) + 1;
+	},
+
+	/* Parse a string value into a date object.
+	 * See formatDate below for the possible formats.
+	 *
+	 * @param  format string - the expected format of the date
+	 * @param  value string - the date in the above format
+	 * @param  settings Object - attributes include:
+	 *					shortYearCutoff  number - the cutoff year for determining the century (optional)
+	 *					dayNamesShort	string[7] - abbreviated names of the days from Sunday (optional)
+	 *					dayNames		string[7] - names of the days from Sunday (optional)
+	 *					monthNamesShort string[12] - abbreviated names of the months (optional)
+	 *					monthNames		string[12] - names of the months (optional)
+	 * @return  Date - the extracted date value or null if value is blank
+	 */
+	parseDate: function (format, value, settings) {
+		if (format == null || value == null) {
+			throw "Invalid arguments";
+		}
+
+		value = (typeof value === "object" ? value.toString() : value + "");
+		if (value === "") {
+			return null;
+		}
+
+		var iFormat, dim, extra,
+			iValue = 0,
+			shortYearCutoffTemp = (settings ? settings.shortYearCutoff : null) || this._defaults.shortYearCutoff,
+			shortYearCutoff = (typeof shortYearCutoffTemp !== "string" ? shortYearCutoffTemp :
+				new Date().getFullYear() % 100 + parseInt(shortYearCutoffTemp, 10)),
+			dayNamesShort = (settings ? settings.dayNamesShort : null) || this._defaults.dayNamesShort,
+			dayNames = (settings ? settings.dayNames : null) || this._defaults.dayNames,
+			monthNamesShort = (settings ? settings.monthNamesShort : null) || this._defaults.monthNamesShort,
+			monthNames = (settings ? settings.monthNames : null) || this._defaults.monthNames,
+			year = -1,
+			month = -1,
+			day = -1,
+			doy = -1,
+			literal = false,
+			date,
+			// Check whether a format character is doubled
+			lookAhead = function(match) {
+				var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) === match);
+				if (matches) {
+					iFormat++;
+				}
+				return matches;
+			},
+			// Extract a number from the string value
+			getNumber = function(match) {
+				var isDoubled = lookAhead(match),
+					size = (match === "@" ? 14 : (match === "!" ? 20 :
+					(match === "y" && isDoubled ? 4 : (match === "o" ? 3 : 2)))),
+					digits = new RegExp("^\\d{1," + size + "}"),
+					num = value.substring(iValue).match(digits);
+				if (!num) {
+					throw "Missing number at position " + iValue;
+				}
+				iValue += num[0].length;
+				return parseInt(num[0], 10);
+			},
+			// Extract a name from the string value and convert to an index
+			getName = function(match, shortNames, longNames) {
+				var index = -1,
+					names = $.map(lookAhead(match) ? longNames : shortNames, function (v, k) {
+						return [ [k, v] ];
+					}).sort(function (a, b) {
+						return -(a[1].length - b[1].length);
+					});
+
+				$.each(names, function (i, pair) {
+					var name = pair[1];
+					if (value.substr(iValue, name.length).toLowerCase() === name.toLowerCase()) {
+						index = pair[0];
+						iValue += name.length;
+						return false;
+					}
+				});
+				if (index !== -1) {
+					return index + 1;
+				} else {
+					throw "Unknown name at position " + iValue;
+				}
+			},
+			// Confirm that a literal character matches the string value
+			checkLiteral = function() {
+				if (value.charAt(iValue) !== format.charAt(iFormat)) {
+					throw "Unexpected literal at position " + iValue;
+				}
+				iValue++;
+			};
+
+		for (iFormat = 0; iFormat < format.length; iFormat++) {
+			if (literal) {
+				if (format.charAt(iFormat) === "'" && !lookAhead("'")) {
+					literal = false;
+				} else {
+					checkLiteral();
+				}
+			} else {
+				switch (format.charAt(iFormat)) {
+					case "d":
+						day = getNumber("d");
+						break;
+					case "D":
+						getName("D", dayNamesShort, dayNames);
+						break;
+					case "o":
+						doy = getNumber("o");
+						break;
+					case "m":
+						month = getNumber("m");
+						break;
+					case "M":
+						month = getName("M", monthNamesShort, monthNames);
+						break;
+					case "y":
+						year = getNumber("y");
+						break;
+					case "@":
+						date = new Date(getNumber("@"));
+						year = date.getFullYear();
+						month = date.getMonth() + 1;
+						day = date.getDate();
+						break;
+					case "!":
+						date = new Date((getNumber("!") - this._ticksTo1970) / 10000);
+						year = date.getFullYear();
+						month = date.getMonth() + 1;
+						day = date.getDate();
+						break;
+					case "'":
+						if (lookAhead("'")){
+							checkLiteral();
+						} else {
+							literal = true;
+						}
+						break;
+					default:
+						checkLiteral();
+				}
+			}
+		}
+
+		if (iValue < value.length){
+			extra = value.substr(iValue);
+			if (!/^\s+/.test(extra)) {
+				throw "Extra/unparsed characters found in date: " + extra;
+			}
+		}
+
+		if (year === -1) {
+			year = new Date().getFullYear();
+		} else if (year < 100) {
+			year += new Date().getFullYear() - new Date().getFullYear() % 100 +
+				(year <= shortYearCutoff ? 0 : -100);
+		}
+
+		if (doy > -1) {
+			month = 1;
+			day = doy;
+			do {
+				dim = this._getDaysInMonth(year, month - 1);
+				if (day <= dim) {
+					break;
+				}
+				month++;
+				day -= dim;
+			} while (true);
+		}
+
+		date = this._daylightSavingAdjust(new Date(year, month - 1, day));
+		if (date.getFullYear() !== year || date.getMonth() + 1 !== month || date.getDate() !== day) {
+			throw "Invalid date"; // E.g. 31/02/00
+		}
+		return date;
+	},
+
+	/* Standard date formats. */
+	ATOM: "yy-mm-dd", // RFC 3339 (ISO 8601)
+	COOKIE: "D, dd M yy",
+	ISO_8601: "yy-mm-dd",
+	RFC_822: "D, d M y",
+	RFC_850: "DD, dd-M-y",
+	RFC_1036: "D, d M y",
+	RFC_1123: "D, d M yy",
+	RFC_2822: "D, d M yy",
+	RSS: "D, d M y", // RFC 822
+	TICKS: "!",
+	TIMESTAMP: "@",
+	W3C: "yy-mm-dd", // ISO 8601
+
+	_ticksTo1970: (((1970 - 1) * 365 + Math.floor(1970 / 4) - Math.floor(1970 / 100) +
+		Math.floor(1970 / 400)) * 24 * 60 * 60 * 10000000),
+
+	/* Format a date object into a string value.
+	 * The format can be combinations of the following:
+	 * d  - day of month (no leading zero)
+	 * dd - day of month (two digit)
+	 * o  - day of year (no leading zeros)
+	 * oo - day of year (three digit)
+	 * D  - day name short
+	 * DD - day name long
+	 * m  - month of year (no leading zero)
+	 * mm - month of year (two digit)
+	 * M  - month name short
+	 * MM - month name long
+	 * y  - year (two digit)
+	 * yy - year (four digit)
+	 * @ - Unix timestamp (ms since 01/01/1970)
+	 * ! - Windows ticks (100ns since 01/01/0001)
+	 * "..." - literal text
+	 * '' - single quote
+	 *
+	 * @param  format string - the desired format of the date
+	 * @param  date Date - the date value to format
+	 * @param  settings Object - attributes include:
+	 *					dayNamesShort	string[7] - abbreviated names of the days from Sunday (optional)
+	 *					dayNames		string[7] - names of the days from Sunday (optional)
+	 *					monthNamesShort string[12] - abbreviated names of the months (optional)
+	 *					monthNames		string[12] - names of the months (optional)
+	 * @return  string - the date in the above format
+	 */
+	formatDate: function (format, date, settings) {
+		if (!date) {
+			return "";
+		}
+
+		var iFormat,
+			dayNamesShort = (settings ? settings.dayNamesShort : null) || this._defaults.dayNamesShort,
+			dayNames = (settings ? settings.dayNames : null) || this._defaults.dayNames,
+			monthNamesShort = (settings ? settings.monthNamesShort : null) || this._defaults.monthNamesShort,
+			monthNames = (settings ? settings.monthNames : null) || this._defaults.monthNames,
+			// Check whether a format character is doubled
+			lookAhead = function(match) {
+				var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) === match);
+				if (matches) {
+					iFormat++;
+				}
+				return matches;
+			},
+			// Format a number, with leading zero if necessary
+			formatNumber = function(match, value, len) {
+				var num = "" + value;
+				if (lookAhead(match)) {
+					while (num.length < len) {
+						num = "0" + num;
+					}
+				}
+				return num;
+			},
+			// Format a name, short or long as requested
+			formatName = function(match, value, shortNames, longNames) {
+				return (lookAhead(match) ? longNames[value] : shortNames[value]);
+			},
+			output = "",
+			literal = false;
+
+		if (date) {
+			for (iFormat = 0; iFormat < format.length; iFormat++) {
+				if (literal) {
+					if (format.charAt(iFormat) === "'" && !lookAhead("'")) {
+						literal = false;
+					} else {
+						output += format.charAt(iFormat);
+					}
+				} else {
+					switch (format.charAt(iFormat)) {
+						case "d":
+							output += formatNumber("d", date.getDate(), 2);
+							break;
+						case "D":
+							output += formatName("D", date.getDay(), dayNamesShort, dayNames);
+							break;
+						case "o":
+							output += formatNumber("o",
+								Math.round((new Date(date.getFullYear(), date.getMonth(), date.getDate()).getTime() - new Date(date.getFullYear(), 0, 0).getTime()) / 86400000), 3);
+							break;
+						case "m":
+							output += formatNumber("m", date.getMonth() + 1, 2);
+							break;
+						case "M":
+							output += formatName("M", date.getMonth(), monthNamesShort, monthNames);
+							break;
+						case "y":
+							output += (lookAhead("y") ? date.getFullYear() :
+								(date.getYear() % 100 < 10 ? "0" : "") + date.getYear() % 100);
+							break;
+						case "@":
+							output += date.getTime();
+							break;
+						case "!":
+							output += date.getTime() * 10000 + this._ticksTo1970;
+							break;
+						case "'":
+							if (lookAhead("'")) {
+								output += "'";
+							} else {
+								literal = true;
+							}
+							break;
+						default:
+							output += format.charAt(iFormat);
+					}
+				}
+			}
+		}
+		return output;
+	},
+
+	/* Extract all possible characters from the date format. */
+	_possibleChars: function (format) {
+		var iFormat,
+			chars = "",
+			literal = false,
+			// Check whether a format character is doubled
+			lookAhead = function(match) {
+				var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) === match);
+				if (matches) {
+					iFormat++;
+				}
+				return matches;
+			};
+
+		for (iFormat = 0; iFormat < format.length; iFormat++) {
+			if (literal) {
+				if (format.charAt(iFormat) === "'" && !lookAhead("'")) {
+					literal = false;
+				} else {
+					chars += format.charAt(iFormat);
+				}
+			} else {
+				switch (format.charAt(iFormat)) {
+					case "d": case "m": case "y": case "@":
+						chars += "0123456789";
+						break;
+					case "D": case "M":
+						return null; // Accept anything
+					case "'":
+						if (lookAhead("'")) {
+							chars += "'";
+						} else {
+							literal = true;
+						}
+						break;
+					default:
+						chars += format.charAt(iFormat);
+				}
+			}
+		}
+		return chars;
+	},
+
+	/* Get a setting value, defaulting if necessary. */
+	_get: function(inst, name) {
+		return inst.settings[name] !== undefined ?
+			inst.settings[name] : this._defaults[name];
+	},
+
+	/* Parse existing date and initialise date picker. */
+	_setDateFromField: function(inst, noDefault) {
+		if (inst.input.val() === inst.lastVal) {
+			return;
+		}
+
+		var dateFormat = this._get(inst, "dateFormat"),
+			dates = inst.lastVal = inst.input ? inst.input.val() : null,
+			defaultDate = this._getDefaultDate(inst),
+			date = defaultDate,
+			settings = this._getFormatConfig(inst);
+
+		try {
+			date = this.parseDate(dateFormat, dates, settings) || defaultDate;
+		} catch (event) {
+			dates = (noDefault ? "" : dates);
+		}
+		inst.selectedDay = date.getDate();
+		inst.drawMonth = inst.selectedMonth = date.getMonth();
+		inst.drawYear = inst.selectedYear = date.getFullYear();
+		inst.currentDay = (dates ? date.getDate() : 0);
+		inst.currentMonth = (dates ? date.getMonth() : 0);
+		inst.currentYear = (dates ? date.getFullYear() : 0);
+		this._adjustInstDate(inst);
+	},
+
+	/* Retrieve the default date shown on opening. */
+	_getDefaultDate: function(inst) {
+		return this._restrictMinMax(inst,
+			this._determineDate(inst, this._get(inst, "defaultDate"), new Date()));
+	},
+
+	/* A date may be specified as an exact value or a relative one. */
+	_determineDate: function(inst, date, defaultDate) {
+		var offsetNumeric = function(offset) {
+				var date = new Date();
+				date.setDate(date.getDate() + offset);
+				return date;
+			},
+			offsetString = function(offset) {
+				try {
+					return $.datepicker.parseDate($.datepicker._get(inst, "dateFormat"),
+						offset, $.datepicker._getFormatConfig(inst));
+				}
+				catch (e) {
+					// Ignore
+				}
+
+				var date = (offset.toLowerCase().match(/^c/) ?
+					$.datepicker._getDate(inst) : null) || new Date(),
+					year = date.getFullYear(),
+					month = date.getMonth(),
+					day = date.getDate(),
+					pattern = /([+\-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,
+					matches = pattern.exec(offset);
+
+				while (matches) {
+					switch (matches[2] || "d") {
+						case "d" : case "D" :
+							day += parseInt(matches[1],10); break;
+						case "w" : case "W" :
+							day += parseInt(matches[1],10) * 7; break;
+						case "m" : case "M" :
+							month += parseInt(matches[1],10);
+							day = Math.min(day, $.datepicker._getDaysInMonth(year, month));
+							break;
+						case "y": case "Y" :
+							year += parseInt(matches[1],10);
+							day = Math.min(day, $.datepicker._getDaysInMonth(year, month));
+							break;
+					}
+					matches = pattern.exec(offset);
+				}
+				return new Date(year, month, day);
+			},
+			newDate = (date == null || date === "" ? defaultDate : (typeof date === "string" ? offsetString(date) :
+				(typeof date === "number" ? (isNaN(date) ? defaultDate : offsetNumeric(date)) : new Date(date.getTime()))));
+
+		newDate = (newDate && newDate.toString() === "Invalid Date" ? defaultDate : newDate);
+		if (newDate) {
+			newDate.setHours(0);
+			newDate.setMinutes(0);
+			newDate.setSeconds(0);
+			newDate.setMilliseconds(0);
+		}
+		return this._daylightSavingAdjust(newDate);
+	},
+
+	/* Handle switch to/from daylight saving.
+	 * Hours may be non-zero on daylight saving cut-over:
+	 * > 12 when midnight changeover, but then cannot generate
+	 * midnight datetime, so jump to 1AM, otherwise reset.
+	 * @param  date  (Date) the date to check
+	 * @return  (Date) the corrected date
+	 */
+	_daylightSavingAdjust: function(date) {
+		if (!date) {
+			return null;
+		}
+		date.setHours(date.getHours() > 12 ? date.getHours() + 2 : 0);
+		return date;
+	},
+
+	/* Set the date(s) directly. */
+	_setDate: function(inst, date, noChange) {
+		var clear = !date,
+			origMonth = inst.selectedMonth,
+			origYear = inst.selectedYear,
+			newDate = this._restrictMinMax(inst, this._determineDate(inst, date, new Date()));
+
+		inst.selectedDay = inst.currentDay = newDate.getDate();
+		inst.drawMonth = inst.selectedMonth = inst.currentMonth = newDate.getMonth();
+		inst.drawYear = inst.selectedYear = inst.currentYear = newDate.getFullYear();
+		if ((origMonth !== inst.selectedMonth || origYear !== inst.selectedYear) && !noChange) {
+			this._notifyChange(inst);
+		}
+		this._adjustInstDate(inst);
+		if (inst.input) {
+			inst.input.val(clear ? "" : this._formatDate(inst));
+		}
+	},
+
+	/* Retrieve the date(s) directly. */
+	_getDate: function(inst) {
+		var startDate = (!inst.currentYear || (inst.input && inst.input.val() === "") ? null :
+			this._daylightSavingAdjust(new Date(
+			inst.currentYear, inst.currentMonth, inst.currentDay)));
+			return startDate;
+	},
+
+	/* Attach the onxxx handlers.  These are declared statically so
+	 * they work with static code transformers like Caja.
+	 */
+	_attachHandlers: function(inst) {
+		var stepMonths = this._get(inst, "stepMonths"),
+			id = "#" + inst.id.replace( /\\\\/g, "\\" );
+		inst.dpDiv.find("[data-handler]").map(function () {
+			var handler = {
+				prev: function () {
+					$.datepicker._adjustDate(id, -stepMonths, "M");
+				},
+				next: function () {
+					$.datepicker._adjustDate(id, +stepMonths, "M");
+				},
+				hide: function () {
+					$.datepicker._hideDatepicker();
+				},
+				today: function () {
+					$.datepicker._gotoToday(id);
+				},
+				selectDay: function () {
+					$.datepicker._selectDay(id, +this.getAttribute("data-month"), +this.getAttribute("data-year"), this);
+					return false;
+				},
+				selectMonth: function () {
+					$.datepicker._selectMonthYear(id, this, "M");
+					return false;
+				},
+				selectYear: function () {
+					$.datepicker._selectMonthYear(id, this, "Y");
+					return false;
+				}
+			};
+			$(this).bind(this.getAttribute("data-event"), handler[this.getAttribute("data-handler")]);
+		});
+	},
+
+	/* Generate the HTML for the current state of the date picker. */
+	_generateHTML: function(inst) {
+		var maxDraw, prevText, prev, nextText, next, currentText, gotoDate,
+			controls, buttonPanel, firstDay, showWeek, dayNames, dayNamesMin,
+			monthNames, monthNamesShort, beforeShowDay, showOtherMonths,
+			selectOtherMonths, defaultDate, html, dow, row, group, col, selectedDate,
+			cornerClass, calender, thead, day, daysInMonth, leadDays, curRows, numRows,
+			printDate, dRow, tbody, daySettings, otherMonth, unselectable,
+			tempDate = new Date(),
+			today = this._daylightSavingAdjust(
+				new Date(tempDate.getFullYear(), tempDate.getMonth(), tempDate.getDate())), // clear time
+			isRTL = this._get(inst, "isRTL"),
+			showButtonPanel = this._get(inst, "showButtonPanel"),
+			hideIfNoPrevNext = this._get(inst, "hideIfNoPrevNext"),
+			navigationAsDateFormat = this._get(inst, "navigationAsDateFormat"),
+			numMonths = this._getNumberOfMonths(inst),
+			showCurrentAtPos = this._get(inst, "showCurrentAtPos"),
+			stepMonths = this._get(inst, "stepMonths"),
+			isMultiMonth = (numMonths[0] !== 1 || numMonths[1] !== 1),
+			currentDate = this._daylightSavingAdjust((!inst.currentDay ? new Date(9999, 9, 9) :
+				new Date(inst.currentYear, inst.currentMonth, inst.currentDay))),
+			minDate = this._getMinMaxDate(inst, "min"),
+			maxDate = this._getMinMaxDate(inst, "max"),
+			drawMonth = inst.drawMonth - showCurrentAtPos,
+			drawYear = inst.drawYear;
+
+		if (drawMonth < 0) {
+			drawMonth += 12;
+			drawYear--;
+		}
+		if (maxDate) {
+			maxDraw = this._daylightSavingAdjust(new Date(maxDate.getFullYear(),
+				maxDate.getMonth() - (numMonths[0] * numMonths[1]) + 1, maxDate.getDate()));
+			maxDraw = (minDate && maxDraw < minDate ? minDate : maxDraw);
+			while (this._daylightSavingAdjust(new Date(drawYear, drawMonth, 1)) > maxDraw) {
+				drawMonth--;
+				if (drawMonth < 0) {
+					drawMonth = 11;
+					drawYear--;
+				}
+			}
+		}
+		inst.drawMonth = drawMonth;
+		inst.drawYear = drawYear;
+
+		prevText = this._get(inst, "prevText");
+		prevText = (!navigationAsDateFormat ? prevText : this.formatDate(prevText,
+			this._daylightSavingAdjust(new Date(drawYear, drawMonth - stepMonths, 1)),
+			this._getFormatConfig(inst)));
+
+		prev = (this._canAdjustMonth(inst, -1, drawYear, drawMonth) ?
+			"<a class='ui-datepicker-prev ui-corner-all' data-handler='prev' data-event='click'" +
+			" title='" + prevText + "'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "e" : "w") + "'>" + prevText + "</span></a>" :
+			(hideIfNoPrevNext ? "" : "<a class='ui-datepicker-prev ui-corner-all ui-state-disabled' title='"+ prevText +"'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "e" : "w") + "'>" + prevText + "</span></a>"));
+
+		nextText = this._get(inst, "nextText");
+		nextText = (!navigationAsDateFormat ? nextText : this.formatDate(nextText,
+			this._daylightSavingAdjust(new Date(drawYear, drawMonth + stepMonths, 1)),
+			this._getFormatConfig(inst)));
+
+		next = (this._canAdjustMonth(inst, +1, drawYear, drawMonth) ?
+			"<a class='ui-datepicker-next ui-corner-all' data-handler='next' data-event='click'" +
+			" title='" + nextText + "'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "w" : "e") + "'>" + nextText + "</span></a>" :
+			(hideIfNoPrevNext ? "" : "<a class='ui-datepicker-next ui-corner-all ui-state-disabled' title='"+ nextText + "'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "w" : "e") + "'>" + nextText + "</span></a>"));
+
+		currentText = this._get(inst, "currentText");
+		gotoDate = (this._get(inst, "gotoCurrent") && inst.currentDay ? currentDate : today);
+		currentText = (!navigationAsDateFormat ? currentText :
+			this.formatDate(currentText, gotoDate, this._getFormatConfig(inst)));
+
+		controls = (!inst.inline ? "<button type='button' class='ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all' data-handler='hide' data-event='click'>" +
+			this._get(inst, "closeText") + "</button>" : "");
+
+		buttonPanel = (showButtonPanel) ? "<div class='ui-datepicker-buttonpane ui-widget-content'>" + (isRTL ? controls : "") +
+			(this._isInRange(inst, gotoDate) ? "<button type='button' class='ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all' data-handler='today' data-event='click'" +
+			">" + currentText + "</button>" : "") + (isRTL ? "" : controls) + "</div>" : "";
+
+		firstDay = parseInt(this._get(inst, "firstDay"),10);
+		firstDay = (isNaN(firstDay) ? 0 : firstDay);
+
+		showWeek = this._get(inst, "showWeek");
+		dayNames = this._get(inst, "dayNames");
+		dayNamesMin = this._get(inst, "dayNamesMin");
+		monthNames = this._get(inst, "monthNames");
+		monthNamesShort = this._get(inst, "monthNamesShort");
+		beforeShowDay = this._get(inst, "beforeShowDay");
+		showOtherMonths = this._get(inst, "showOtherMonths");
+		selectOtherMonths = this._get(inst, "selectOtherMonths");
+		defaultDate = this._getDefaultDate(inst);
+		html = "";
+		dow;
+		for (row = 0; row < numMonths[0]; row++) {
+			group = "";
+			this.maxRows = 4;
+			for (col = 0; col < numMonths[1]; col++) {
+				selectedDate = this._daylightSavingAdjust(new Date(drawYear, drawMonth, inst.selectedDay));
+				cornerClass = " ui-corner-all";
+				calender = "";
+				if (isMultiMonth) {
+					calender += "<div class='ui-datepicker-group";
+					if (numMonths[1] > 1) {
+						switch (col) {
+							case 0: calender += " ui-datepicker-group-first";
+								cornerClass = " ui-corner-" + (isRTL ? "right" : "left"); break;
+							case numMonths[1]-1: calender += " ui-datepicker-group-last";
+								cornerClass = " ui-corner-" + (isRTL ? "left" : "right"); break;
+							default: calender += " ui-datepicker-group-middle"; cornerClass = ""; break;
+						}
+					}
+					calender += "'>";
+				}
+				calender += "<div class='ui-datepicker-header ui-widget-header ui-helper-clearfix" + cornerClass + "'>" +
+					(/all|left/.test(cornerClass) && row === 0 ? (isRTL ? next : prev) : "") +
+					(/all|right/.test(cornerClass) && row === 0 ? (isRTL ? prev : next) : "") +
+					this._generateMonthYearHeader(inst, drawMonth, drawYear, minDate, maxDate,
+					row > 0 || col > 0, monthNames, monthNamesShort) + // draw month headers
+					"</div><table class='ui-datepicker-calendar'><thead>" +
+					"<tr>";
+				thead = (showWeek ? "<th class='ui-datepicker-week-col'>" + this._get(inst, "weekHeader") + "</th>" : "");
+				for (dow = 0; dow < 7; dow++) { // days of the week
+					day = (dow + firstDay) % 7;
+					thead += "<th" + ((dow + firstDay + 6) % 7 >= 5 ? " class='ui-datepicker-week-end'" : "") + ">" +
+						"<span title='" + dayNames[day] + "'>" + dayNamesMin[day] + "</span></th>";
+				}
+				calender += thead + "</tr></thead><tbody>";
+				daysInMonth = this._getDaysInMonth(drawYear, drawMonth);
+				if (drawYear === inst.selectedYear && drawMonth === inst.selectedMonth) {
+					inst.selectedDay = Math.min(inst.selectedDay, daysInMonth);
+				}
+				leadDays = (this._getFirstDayOfMonth(drawYear, drawMonth) - firstDay + 7) % 7;
+				curRows = Math.ceil((leadDays + daysInMonth) / 7); // calculate the number of rows to generate
+				numRows = (isMultiMonth ? this.maxRows > curRows ? this.maxRows : curRows : curRows); //If multiple months, use the higher number of rows (see #7043)
+				this.maxRows = numRows;
+				printDate = this._daylightSavingAdjust(new Date(drawYear, drawMonth, 1 - leadDays));
+				for (dRow = 0; dRow < numRows; dRow++) { // create date picker rows
+					calender += "<tr>";
+					tbody = (!showWeek ? "" : "<td class='ui-datepicker-week-col'>" +
+						this._get(inst, "calculateWeek")(printDate) + "</td>");
+					for (dow = 0; dow < 7; dow++) { // create date picker days
+						daySettings = (beforeShowDay ?
+							beforeShowDay.apply((inst.input ? inst.input[0] : null), [printDate]) : [true, ""]);
+						otherMonth = (printDate.getMonth() !== drawMonth);
+						unselectable = (otherMonth && !selectOtherMonths) || !daySettings[0] ||
+							(minDate && printDate < minDate) || (maxDate && printDate > maxDate);
+						tbody += "<td class='" +
+							((dow + firstDay + 6) % 7 >= 5 ? " ui-datepicker-week-end" : "") + // highlight weekends
+							(otherMonth ? " ui-datepicker-other-month" : "") + // highlight days from other months
+							((printDate.getTime() === selectedDate.getTime() && drawMonth === inst.selectedMonth && inst._keyEvent) || // user pressed key
+							(defaultDate.getTime() === printDate.getTime() && defaultDate.getTime() === selectedDate.getTime()) ?
+							// or defaultDate is current printedDate and defaultDate is selectedDate
+							" " + this._dayOverClass : "") + // highlight selected day
+							(unselectable ? " " + this._unselectableClass + " ui-state-disabled": "") +  // highlight unselectable days
+							(otherMonth && !showOtherMonths ? "" : " " + daySettings[1] + // highlight custom dates
+							(printDate.getTime() === currentDate.getTime() ? " " + this._currentClass : "") + // highlight selected day
+							(printDate.getTime() === today.getTime() ? " ui-datepicker-today" : "")) + "'" + // highlight today (if different)
+							((!otherMonth || showOtherMonths) && daySettings[2] ? " title='" + daySettings[2].replace(/'/g, "&#39;") + "'" : "") + // cell title
+							(unselectable ? "" : " data-handler='selectDay' data-event='click' data-month='" + printDate.getMonth() + "' data-year='" + printDate.getFullYear() + "'") + ">" + // actions
+							(otherMonth && !showOtherMonths ? "&#xa0;" : // display for other months
+							(unselectable ? "<span class='ui-state-default'>" + printDate.getDate() + "</span>" : "<a class='ui-state-default" +
+							(printDate.getTime() === today.getTime() ? " ui-state-highlight" : "") +
+							(printDate.getTime() === currentDate.getTime() ? " ui-state-active" : "") + // highlight selected day
+							(otherMonth ? " ui-priority-secondary" : "") + // distinguish dates from other months
+							"' href='#'>" + printDate.getDate() + "</a>")) + "</td>"; // display selectable date
+						printDate.setDate(printDate.getDate() + 1);
+						printDate = this._daylightSavingAdjust(printDate);
+					}
+					calender += tbody + "</tr>";
+				}
+				drawMonth++;
+				if (drawMonth > 11) {
+					drawMonth = 0;
+					drawYear++;
+				}
+				calender += "</tbody></table>" + (isMultiMonth ? "</div>" +
+							((numMonths[0] > 0 && col === numMonths[1]-1) ? "<div class='ui-datepicker-row-break'></div>" : "") : "");
+				group += calender;
+			}
+			html += group;
+		}
+		html += buttonPanel;
+		inst._keyEvent = false;
+		return html;
+	},
+
+	/* Generate the month and year header. */
+	_generateMonthYearHeader: function(inst, drawMonth, drawYear, minDate, maxDate,
+			secondary, monthNames, monthNamesShort) {
+
+		var inMinYear, inMaxYear, month, years, thisYear, determineYear, year, endYear,
+			changeMonth = this._get(inst, "changeMonth"),
+			changeYear = this._get(inst, "changeYear"),
+			showMonthAfterYear = this._get(inst, "showMonthAfterYear"),
+			html = "<div class='ui-datepicker-title'>",
+			monthHtml = "";
+
+		// month selection
+		if (secondary || !changeMonth) {
+			monthHtml += "<span class='ui-datepicker-month'>" + monthNames[drawMonth] + "</span>";
+		} else {
+			inMinYear = (minDate && minDate.getFullYear() === drawYear);
+			inMaxYear = (maxDate && maxDate.getFullYear() === drawYear);
+			monthHtml += "<select class='ui-datepicker-month' data-handler='selectMonth' data-event='change'>";
+			for ( month = 0; month < 12; month++) {
+				if ((!inMinYear || month >= minDate.getMonth()) && (!inMaxYear || month <= maxDate.getMonth())) {
+					monthHtml += "<option value='" + month + "'" +
+						(month === drawMonth ? " selected='selected'" : "") +
+						">" + monthNamesShort[month] + "</option>";
+				}
+			}
+			monthHtml += "</select>";
+		}
+
+		if (!showMonthAfterYear) {
+			html += monthHtml + (secondary || !(changeMonth && changeYear) ? "&#xa0;" : "");
+		}
+
+		// year selection
+		if ( !inst.yearshtml ) {
+			inst.yearshtml = "";
+			if (secondary || !changeYear) {
+				html += "<span class='ui-datepicker-year'>" + drawYear + "</span>";
+			} else {
+				// determine range of years to display
+				years = this._get(inst, "yearRange").split(":");
+				thisYear = new Date().getFullYear();
+				determineYear = function(value) {
+					var year = (value.match(/c[+\-].*/) ? drawYear + parseInt(value.substring(1), 10) :
+						(value.match(/[+\-].*/) ? thisYear + parseInt(value, 10) :
+						parseInt(value, 10)));
+					return (isNaN(year) ? thisYear : year);
+				};
+				year = determineYear(years[0]);
+				endYear = Math.max(year, determineYear(years[1] || ""));
+				year = (minDate ? Math.max(year, minDate.getFullYear()) : year);
+				endYear = (maxDate ? Math.min(endYear, maxDate.getFullYear()) : endYear);
+				inst.yearshtml += "<select class='ui-datepicker-year' data-handler='selectYear' data-event='change'>";
+				for (; year <= endYear; year++) {
+					inst.yearshtml += "<option value='" + year + "'" +
+						(year === drawYear ? " selected='selected'" : "") +
+						">" + year + "</option>";
+				}
+				inst.yearshtml += "</select>";
+
+				html += inst.yearshtml;
+				inst.yearshtml = null;
+			}
+		}
+
+		html += this._get(inst, "yearSuffix");
+		if (showMonthAfterYear) {
+			html += (secondary || !(changeMonth && changeYear) ? "&#xa0;" : "") + monthHtml;
+		}
+		html += "</div>"; // Close datepicker_header
+		return html;
+	},
+
+	/* Adjust one of the date sub-fields. */
+	_adjustInstDate: function(inst, offset, period) {
+		var year = inst.drawYear + (period === "Y" ? offset : 0),
+			month = inst.drawMonth + (period === "M" ? offset : 0),
+			day = Math.min(inst.selectedDay, this._getDaysInMonth(year, month)) + (period === "D" ? offset : 0),
+			date = this._restrictMinMax(inst, this._daylightSavingAdjust(new Date(year, month, day)));
+
+		inst.selectedDay = date.getDate();
+		inst.drawMonth = inst.selectedMonth = date.getMonth();
+		inst.drawYear = inst.selectedYear = date.getFullYear();
+		if (period === "M" || period === "Y") {
+			this._notifyChange(inst);
+		}
+	},
+
+	/* Ensure a date is within any min/max bounds. */
+	_restrictMinMax: function(inst, date) {
+		var minDate = this._getMinMaxDate(inst, "min"),
+			maxDate = this._getMinMaxDate(inst, "max"),
+			newDate = (minDate && date < minDate ? minDate : date);
+		return (maxDate && newDate > maxDate ? maxDate : newDate);
+	},
+
+	/* Notify change of month/year. */
+	_notifyChange: function(inst) {
+		var onChange = this._get(inst, "onChangeMonthYear");
+		if (onChange) {
+			onChange.apply((inst.input ? inst.input[0] : null),
+				[inst.selectedYear, inst.selectedMonth + 1, inst]);
+		}
+	},
+
+	/* Determine the number of months to show. */
+	_getNumberOfMonths: function(inst) {
+		var numMonths = this._get(inst, "numberOfMonths");
+		return (numMonths == null ? [1, 1] : (typeof numMonths === "number" ? [1, numMonths] : numMonths));
+	},
+
+	/* Determine the current maximum date - ensure no time components are set. */
+	_getMinMaxDate: function(inst, minMax) {
+		return this._determineDate(inst, this._get(inst, minMax + "Date"), null);
+	},
+
+	/* Find the number of days in a given month. */
+	_getDaysInMonth: function(year, month) {
+		return 32 - this._daylightSavingAdjust(new Date(year, month, 32)).getDate();
+	},
+
+	/* Find the day of the week of the first of a month. */
+	_getFirstDayOfMonth: function(year, month) {
+		return new Date(year, month, 1).getDay();
+	},
+
+	/* Determines if we should allow a "next/prev" month display change. */
+	_canAdjustMonth: function(inst, offset, curYear, curMonth) {
+		var numMonths = this._getNumberOfMonths(inst),
+			date = this._daylightSavingAdjust(new Date(curYear,
+			curMonth + (offset < 0 ? offset : numMonths[0] * numMonths[1]), 1));
+
+		if (offset < 0) {
+			date.setDate(this._getDaysInMonth(date.getFullYear(), date.getMonth()));
+		}
+		return this._isInRange(inst, date);
+	},
+
+	/* Is the given date in the accepted range? */
+	_isInRange: function(inst, date) {
+		var yearSplit, currentYear,
+			minDate = this._getMinMaxDate(inst, "min"),
+			maxDate = this._getMinMaxDate(inst, "max"),
+			minYear = null,
+			maxYear = null,
+			years = this._get(inst, "yearRange");
+			if (years){
+				yearSplit = years.split(":");
+				currentYear = new Date().getFullYear();
+				minYear = parseInt(yearSplit[0], 10);
+				maxYear = parseInt(yearSplit[1], 10);
+				if ( yearSplit[0].match(/[+\-].*/) ) {
+					minYear += currentYear;
+				}
+				if ( yearSplit[1].match(/[+\-].*/) ) {
+					maxYear += currentYear;
+				}
+			}
+
+		return ((!minDate || date.getTime() >= minDate.getTime()) &&
+			(!maxDate || date.getTime() <= maxDate.getTime()) &&
+			(!minYear || date.getFullYear() >= minYear) &&
+			(!maxYear || date.getFullYear() <= maxYear));
+	},
+
+	/* Provide the configuration settings for formatting/parsing. */
+	_getFormatConfig: function(inst) {
+		var shortYearCutoff = this._get(inst, "shortYearCutoff");
+		shortYearCutoff = (typeof shortYearCutoff !== "string" ? shortYearCutoff :
+			new Date().getFullYear() % 100 + parseInt(shortYearCutoff, 10));
+		return {shortYearCutoff: shortYearCutoff,
+			dayNamesShort: this._get(inst, "dayNamesShort"), dayNames: this._get(inst, "dayNames"),
+			monthNamesShort: this._get(inst, "monthNamesShort"), monthNames: this._get(inst, "monthNames")};
+	},
+
+	/* Format the given date for display. */
+	_formatDate: function(inst, day, month, year) {
+		if (!day) {
+			inst.currentDay = inst.selectedDay;
+			inst.currentMonth = inst.selectedMonth;
+			inst.currentYear = inst.selectedYear;
+		}
+		var date = (day ? (typeof day === "object" ? day :
+			this._daylightSavingAdjust(new Date(year, month, day))) :
+			this._daylightSavingAdjust(new Date(inst.currentYear, inst.currentMonth, inst.currentDay)));
+		return this.formatDate(this._get(inst, "dateFormat"), date, this._getFormatConfig(inst));
+	}
+});
+
+/*
+ * Bind hover events for datepicker elements.
+ * Done via delegate so the binding only occurs once in the lifetime of the parent div.
+ * Global instActive, set by _updateDatepicker allows the handlers to find their way back to the active picker.
+ */
+function bindHover(dpDiv) {
+	var selector = "button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a";
+	return dpDiv.delegate(selector, "mouseout", function() {
+			$(this).removeClass("ui-state-hover");
+			if (this.className.indexOf("ui-datepicker-prev") !== -1) {
+				$(this).removeClass("ui-datepicker-prev-hover");
+			}
+			if (this.className.indexOf("ui-datepicker-next") !== -1) {
+				$(this).removeClass("ui-datepicker-next-hover");
+			}
+		})
+		.delegate(selector, "mouseover", function(){
+			if (!$.datepicker._isDisabledDatepicker( instActive.inline ? dpDiv.parent()[0] : instActive.input[0])) {
+				$(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover");
+				$(this).addClass("ui-state-hover");
+				if (this.className.indexOf("ui-datepicker-prev") !== -1) {
+					$(this).addClass("ui-datepicker-prev-hover");
+				}
+				if (this.className.indexOf("ui-datepicker-next") !== -1) {
+					$(this).addClass("ui-datepicker-next-hover");
+				}
+			}
+		});
+}
+
+/* jQuery extend now ignores nulls! */
+function extendRemove(target, props) {
+	$.extend(target, props);
+	for (var name in props) {
+		if (props[name] == null) {
+			target[name] = props[name];
+		}
+	}
+	return target;
+}
+
+/* Invoke the datepicker functionality.
+   @param  options  string - a command, optionally followed by additional parameters or
+					Object - settings for attaching new datepicker functionality
+   @return  jQuery object */
+$.fn.datepicker = function(options){
+
+	/* Verify an empty collection wasn't passed - Fixes #6976 */
+	if ( !this.length ) {
+		return this;
+	}
+
+	/* Initialise the date picker. */
+	if (!$.datepicker.initialized) {
+		$(document).mousedown($.datepicker._checkExternalClick);
+		$.datepicker.initialized = true;
+	}
+
+	/* Append datepicker main container to body if not exist. */
+	if ($("#"+$.datepicker._mainDivId).length === 0) {
+		$("body").append($.datepicker.dpDiv);
+	}
+
+	var otherArgs = Array.prototype.slice.call(arguments, 1);
+	if (typeof options === "string" && (options === "isDisabled" || options === "getDate" || options === "widget")) {
+		return $.datepicker["_" + options + "Datepicker"].
+			apply($.datepicker, [this[0]].concat(otherArgs));
+	}
+	if (options === "option" && arguments.length === 2 && typeof arguments[1] === "string") {
+		return $.datepicker["_" + options + "Datepicker"].
+			apply($.datepicker, [this[0]].concat(otherArgs));
+	}
+	return this.each(function() {
+		typeof options === "string" ?
+			$.datepicker["_" + options + "Datepicker"].
+				apply($.datepicker, [this].concat(otherArgs)) :
+			$.datepicker._attachDatepicker(this, options);
+	});
+};
+
+$.datepicker = new Datepicker(); // singleton instance
+$.datepicker.initialized = false;
+$.datepicker.uuid = new Date().getTime();
+$.datepicker.version = "1.10.3";
+
+})(jQuery);
+
+(function( $, undefined ) {
+
+var sizeRelatedOptions = {
+		buttons: true,
+		height: true,
+		maxHeight: true,
+		maxWidth: true,
+		minHeight: true,
+		minWidth: true,
+		width: true
+	},
+	resizableRelatedOptions = {
+		maxHeight: true,
+		maxWidth: true,
+		minHeight: true,
+		minWidth: true
+	};
+
+$.widget( "ui.dialog", {
+	version: "1.10.3",
+	options: {
+		appendTo: "body",
+		autoOpen: true,
+		buttons: [],
+		closeOnEscape: true,
+		closeText: "close",
+		dialogClass: "",
+		draggable: true,
+		hide: null,
+		height: "auto",
+		maxHeight: null,
+		maxWidth: null,
+		minHeight: 150,
+		minWidth: 150,
+		modal: false,
+		position: {
+			my: "center",
+			at: "center",
+			of: window,
+			collision: "fit",
+			// Ensure the titlebar is always visible
+			using: function( pos ) {
+				var topOffset = $( this ).css( pos ).offset().top;
+				if ( topOffset < 0 ) {
+					$( this ).css( "top", pos.top - topOffset );
+				}
+			}
+		},
+		resizable: true,
+		show: null,
+		title: null,
+		width: 300,
+
+		// callbacks
+		beforeClose: null,
+		close: null,
+		drag: null,
+		dragStart: null,
+		dragStop: null,
+		focus: null,
+		open: null,
+		resize: null,
+		resizeStart: null,
+		resizeStop: null
+	},
+
+	_create: function() {
+		this.originalCss = {
+			display: this.element[0].style.display,
+			width: this.element[0].style.width,
+			minHeight: this.element[0].style.minHeight,
+			maxHeight: this.element[0].style.maxHeight,
+			height: this.element[0].style.height
+		};
+		this.originalPosition = {
+			parent: this.element.parent(),
+			index: this.element.parent().children().index( this.element )
+		};
+		this.originalTitle = this.element.attr("title");
+		this.options.title = this.options.title || this.originalTitle;
+
+		this._createWrapper();
+
+		this.element
+			.show()
+			.removeAttr("title")
+			.addClass("ui-dialog-content ui-widget-content")
+			.appendTo( this.uiDialog );
+
+		this._createTitlebar();
+		this._createButtonPane();
+
+		if ( this.options.draggable && $.fn.draggable ) {
+			this._makeDraggable();
+		}
+		if ( this.options.resizable && $.fn.resizable ) {
+			this._makeResizable();
+		}
+
+		this._isOpen = false;
+	},
+
+	_init: function() {
+		if ( this.options.autoOpen ) {
+			this.open();
+		}
+	},
+
+	_appendTo: function() {
+		var element = this.options.appendTo;
+		if ( element && (element.jquery || element.nodeType) ) {
+			return $( element );
+		}
+		return this.document.find( element || "body" ).eq( 0 );
+	},
+
+	_destroy: function() {
+		var next,
+			originalPosition = this.originalPosition;
+
+		this._destroyOverlay();
+
+		this.element
+			.removeUniqueId()
+			.removeClass("ui-dialog-content ui-widget-content")
+			.css( this.originalCss )
+			// Without detaching first, the following becomes really slow
+			.detach();
+
+		this.uiDialog.stop( true, true ).remove();
+
+		if ( this.originalTitle ) {
+			this.element.attr( "title", this.originalTitle );
+		}
+
+		next = originalPosition.parent.children().eq( originalPosition.index );
+		// Don't try to place the dialog next to itself (#8613)
+		if ( next.length && next[0] !== this.element[0] ) {
+			next.before( this.element );
+		} else {
+			originalPosition.parent.append( this.element );
+		}
+	},
+
+	widget: function() {
+		return this.uiDialog;
+	},
+
+	disable: $.noop,
+	enable: $.noop,
+
+	close: function( event ) {
+		var that = this;
+
+		if ( !this._isOpen || this._trigger( "beforeClose", event ) === false ) {
+			return;
+		}
+
+		this._isOpen = false;
+		this._destroyOverlay();
+
+		if ( !this.opener.filter(":focusable").focus().length ) {
+			// Hiding a focused element doesn't trigger blur in WebKit
+			// so in case we have nothing to focus on, explicitly blur the active element
+			// https://bugs.webkit.org/show_bug.cgi?id=47182
+			$( this.document[0].activeElement ).blur();
+		}
+
+		this._hide( this.uiDialog, this.options.hide, function() {
+			that._trigger( "close", event );
+		});
+	},
+
+	isOpen: function() {
+		return this._isOpen;
+	},
+
+	moveToTop: function() {
+		this._moveToTop();
+	},
+
+	_moveToTop: function( event, silent ) {
+		var moved = !!this.uiDialog.nextAll(":visible").insertBefore( this.uiDialog ).length;
+		if ( moved && !silent ) {
+			this._trigger( "focus", event );
+		}
+		return moved;
+	},
+
+	open: function() {
+		var that = this;
+		if ( this._isOpen ) {
+			if ( this._moveToTop() ) {
+				this._focusTabbable();
+			}
+			return;
+		}
+
+		this._isOpen = true;
+		this.opener = $( this.document[0].activeElement );
+
+		this._size();
+		this._position();
+		this._createOverlay();
+		this._moveToTop( null, true );
+		this._show( this.uiDialog, this.options.show, function() {
+			that._focusTabbable();
+			that._trigger("focus");
+		});
+
+		this._trigger("open");
+	},
+
+	_focusTabbable: function() {
+		// Set focus to the first match:
+		// 1. First element inside the dialog matching [autofocus]
+		// 2. Tabbable element inside the content element
+		// 3. Tabbable element inside the buttonpane
+		// 4. The close button
+		// 5. The dialog itself
+		var hasFocus = this.element.find("[autofocus]");
+		if ( !hasFocus.length ) {
+			hasFocus = this.element.find(":tabbable");
+		}
+		if ( !hasFocus.length ) {
+			hasFocus = this.uiDialogButtonPane.find(":tabbable");
+		}
+		if ( !hasFocus.length ) {
+			hasFocus = this.uiDialogTitlebarClose.filter(":tabbable");
+		}
+		if ( !hasFocus.length ) {
+			hasFocus = this.uiDialog;
+		}
+		hasFocus.eq( 0 ).focus();
+	},
+
+	_keepFocus: function( event ) {
+		function checkFocus() {
+			var activeElement = this.document[0].activeElement,
+				isActive = this.uiDialog[0] === activeElement ||
+					$.contains( this.uiDialog[0], activeElement );
+			if ( !isActive ) {
+				this._focusTabbable();
+			}
+		}
+		event.preventDefault();
+		checkFocus.call( this );
+		// support: IE
+		// IE <= 8 doesn't prevent moving focus even with event.preventDefault()
+		// so we check again later
+		this._delay( checkFocus );
+	},
+
+	_createWrapper: function() {
+		this.uiDialog = $("<div>")
+			.addClass( "ui-dialog ui-widget ui-widget-content ui-corner-all ui-front " +
+				this.options.dialogClass )
+			.hide()
+			.attr({
+				// Setting tabIndex makes the div focusable
+				tabIndex: -1,
+				role: "dialog"
+			})
+			.appendTo( this._appendTo() );
+
+		this._on( this.uiDialog, {
+			keydown: function( event ) {
+				if ( this.options.closeOnEscape && !event.isDefaultPrevented() && event.keyCode &&
+						event.keyCode === $.ui.keyCode.ESCAPE ) {
+					event.preventDefault();
+					this.close( event );
+					return;
+				}
+
+				// prevent tabbing out of dialogs
+				if ( event.keyCode !== $.ui.keyCode.TAB ) {
+					return;
+				}
+				var tabbables = this.uiDialog.find(":tabbable"),
+					first = tabbables.filter(":first"),
+					last  = tabbables.filter(":last");
+
+				if ( ( event.target === last[0] || event.target === this.uiDialog[0] ) && !event.shiftKey ) {
+					first.focus( 1 );
+					event.preventDefault();
+				} else if ( ( event.target === first[0] || event.target === this.uiDialog[0] ) && event.shiftKey ) {
+					last.focus( 1 );
+					event.preventDefault();
+				}
+			},
+			mousedown: function( event ) {
+				if ( this._moveToTop( event ) ) {
+					this._focusTabbable();
+				}
+			}
+		});
+
+		// We assume that any existing aria-describedby attribute means
+		// that the dialog content is marked up properly
+		// otherwise we brute force the content as the description
+		if ( !this.element.find("[aria-describedby]").length ) {
+			this.uiDialog.attr({
+				"aria-describedby": this.element.uniqueId().attr("id")
+			});
+		}
+	},
+
+	_createTitlebar: function() {
+		var uiDialogTitle;
+
+		this.uiDialogTitlebar = $("<div>")
+			.addClass("ui-dialog-titlebar ui-widget-header ui-corner-all ui-helper-clearfix")
+			.prependTo( this.uiDialog );
+		this._on( this.uiDialogTitlebar, {
+			mousedown: function( event ) {
+				// Don't prevent click on close button (#8838)
+				// Focusing a dialog that is partially scrolled out of view
+				// causes the browser to scroll it into view, preventing the click event
+				if ( !$( event.target ).closest(".ui-dialog-titlebar-close") ) {
+					// Dialog isn't getting focus when dragging (#8063)
+					this.uiDialog.focus();
+				}
+			}
+		});
+
+		this.uiDialogTitlebarClose = $("<button></button>")
+			.button({
+				label: this.options.closeText,
+				icons: {
+					primary: "ui-icon-closethick"
+				},
+				text: false
+			})
+			.addClass("ui-dialog-titlebar-close")
+			.appendTo( this.uiDialogTitlebar );
+		this._on( this.uiDialogTitlebarClose, {
+			click: function( event ) {
+				event.preventDefault();
+				this.close( event );
+			}
+		});
+
+		uiDialogTitle = $("<span>")
+			.uniqueId()
+			.addClass("ui-dialog-title")
+			.prependTo( this.uiDialogTitlebar );
+		this._title( uiDialogTitle );
+
+		this.uiDialog.attr({
+			"aria-labelledby": uiDialogTitle.attr("id")
+		});
+	},
+
+	_title: function( title ) {
+		if ( !this.options.title ) {
+			title.html("&#160;");
+		}
+		title.text( this.options.title );
+	},
+
+	_createButtonPane: function() {
+		this.uiDialogButtonPane = $("<div>")
+			.addClass("ui-dialog-buttonpane ui-widget-content ui-helper-clearfix");
+
+		this.uiButtonSet = $("<div>")
+			.addClass("ui-dialog-buttonset")
+			.appendTo( this.uiDialogButtonPane );
+
+		this._createButtons();
+	},
+
+	_createButtons: function() {
+		var that = this,
+			buttons = this.options.buttons;
+
+		// if we already have a button pane, remove it
+		this.uiDialogButtonPane.remove();
+		this.uiButtonSet.empty();
+
+		if ( $.isEmptyObject( buttons ) || ($.isArray( buttons ) && !buttons.length) ) {
+			this.uiDialog.removeClass("ui-dialog-buttons");
+			return;
+		}
+
+		$.each( buttons, function( name, props ) {
+			var click, buttonOptions;
+			props = $.isFunction( props ) ?
+				{ click: props, text: name } :
+				props;
+			// Default to a non-submitting button
+			props = $.extend( { type: "button" }, props );
+			// Change the context for the click callback to be the main element
+			click = props.click;
+			props.click = function() {
+				click.apply( that.element[0], arguments );
+			};
+			buttonOptions = {
+				icons: props.icons,
+				text: props.showText
+			};
+			delete props.icons;
+			delete props.showText;
+			$( "<button></button>", props )
+				.button( buttonOptions )
+				.appendTo( that.uiButtonSet );
+		});
+		this.uiDialog.addClass("ui-dialog-buttons");
+		this.uiDialogButtonPane.appendTo( this.uiDialog );
+	},
+
+	_makeDraggable: function() {
+		var that = this,
+			options = this.options;
+
+		function filteredUi( ui ) {
+			return {
+				position: ui.position,
+				offset: ui.offset
+			};
+		}
+
+		this.uiDialog.draggable({
+			cancel: ".ui-dialog-content, .ui-dialog-titlebar-close",
+			handle: ".ui-dialog-titlebar",
+			containment: "document",
+			start: function( event, ui ) {
+				$( this ).addClass("ui-dialog-dragging");
+				that._blockFrames();
+				that._trigger( "dragStart", event, filteredUi( ui ) );
+			},
+			drag: function( event, ui ) {
+				that._trigger( "drag", event, filteredUi( ui ) );
+			},
+			stop: function( event, ui ) {
+				options.position = [
+					ui.position.left - that.document.scrollLeft(),
+					ui.position.top - that.document.scrollTop()
+				];
+				$( this ).removeClass("ui-dialog-dragging");
+				that._unblockFrames();
+				that._trigger( "dragStop", event, filteredUi( ui ) );
+			}
+		});
+	},
+
+	_makeResizable: function() {
+		var that = this,
+			options = this.options,
+			handles = options.resizable,
+			// .ui-resizable has position: relative defined in the stylesheet
+			// but dialogs have to use absolute or fixed positioning
+			position = this.uiDialog.css("position"),
+			resizeHandles = typeof handles === "string" ?
+				handles	:
+				"n,e,s,w,se,sw,ne,nw";
+
+		function filteredUi( ui ) {
+			return {
+				originalPosition: ui.originalPosition,
+				originalSize: ui.originalSize,
+				position: ui.position,
+				size: ui.size
+			};
+		}
+
+		this.uiDialog.resizable({
+			cancel: ".ui-dialog-content",
+			containment: "document",
+			alsoResize: this.element,
+			maxWidth: options.maxWidth,
+			maxHeight: options.maxHeight,
+			minWidth: options.minWidth,
+			minHeight: this._minHeight(),
+			handles: resizeHandles,
+			start: function( event, ui ) {
+				$( this ).addClass("ui-dialog-resizing");
+				that._blockFrames();
+				that._trigger( "resizeStart", event, filteredUi( ui ) );
+			},
+			resize: function( event, ui ) {
+				that._trigger( "resize", event, filteredUi( ui ) );
+			},
+			stop: function( event, ui ) {
+				options.height = $( this ).height();
+				options.width = $( this ).width();
+				$( this ).removeClass("ui-dialog-resizing");
+				that._unblockFrames();
+				that._trigger( "resizeStop", event, filteredUi( ui ) );
+			}
+		})
+		.css( "position", position );
+	},
+
+	_minHeight: function() {
+		var options = this.options;
+
+		return options.height === "auto" ?
+			options.minHeight :
+			Math.min( options.minHeight, options.height );
+	},
+
+	_position: function() {
+		// Need to show the dialog to get the actual offset in the position plugin
+		var isVisible = this.uiDialog.is(":visible");
+		if ( !isVisible ) {
+			this.uiDialog.show();
+		}
+		this.uiDialog.position( this.options.position );
+		if ( !isVisible ) {
+			this.uiDialog.hide();
+		}
+	},
+
+	_setOptions: function( options ) {
+		var that = this,
+			resize = false,
+			resizableOptions = {};
+
+		$.each( options, function( key, value ) {
+			that._setOption( key, value );
+
+			if ( key in sizeRelatedOptions ) {
+				resize = true;
+			}
+			if ( key in resizableRelatedOptions ) {
+				resizableOptions[ key ] = value;
+			}
+		});
+
+		if ( resize ) {
+			this._size();
+			this._position();
+		}
+		if ( this.uiDialog.is(":data(ui-resizable)") ) {
+			this.uiDialog.resizable( "option", resizableOptions );
+		}
+	},
+
+	_setOption: function( key, value ) {
+		/*jshint maxcomplexity:15*/
+		var isDraggable, isResizable,
+			uiDialog = this.uiDialog;
+
+		if ( key === "dialogClass" ) {
+			uiDialog
+				.removeClass( this.options.dialogClass )
+				.addClass( value );
+		}
+
+		if ( key === "disabled" ) {
+			return;
+		}
+
+		this._super( key, value );
+
+		if ( key === "appendTo" ) {
+			this.uiDialog.appendTo( this._appendTo() );
+		}
+
+		if ( key === "buttons" ) {
+			this._createButtons();
+		}
+
+		if ( key === "closeText" ) {
+			this.uiDialogTitlebarClose.button({
+				// Ensure that we always pass a string
+				label: "" + value
+			});
+		}
+
+		if ( key === "draggable" ) {
+			isDraggable = uiDialog.is(":data(ui-draggable)");
+			if ( isDraggable && !value ) {
+				uiDialog.draggable("destroy");
+			}
+
+			if ( !isDraggable && value ) {
+				this._makeDraggable();
+			}
+		}
+
+		if ( key === "position" ) {
+			this._position();
+		}
+
+		if ( key === "resizable" ) {
+			// currently resizable, becoming non-resizable
+			isResizable = uiDialog.is(":data(ui-resizable)");
+			if ( isResizable && !value ) {
+				uiDialog.resizable("destroy");
+			}
+
+			// currently resizable, changing handles
+			if ( isResizable && typeof value === "string" ) {
+				uiDialog.resizable( "option", "handles", value );
+			}
+
+			// currently non-resizable, becoming resizable
+			if ( !isResizable && value !== false ) {
+				this._makeResizable();
+			}
+		}
+
+		if ( key === "title" ) {
+			this._title( this.uiDialogTitlebar.find(".ui-dialog-title") );
+		}
+	},
+
+	_size: function() {
+		// If the user has resized the dialog, the .ui-dialog and .ui-dialog-content
+		// divs will both have width and height set, so we need to reset them
+		var nonContentHeight, minContentHeight, maxContentHeight,
+			options = this.options;
+
+		// Reset content sizing
+		this.element.show().css({
+			width: "auto",
+			minHeight: 0,
+			maxHeight: "none",
+			height: 0
+		});
+
+		if ( options.minWidth > options.width ) {
+			options.width = options.minWidth;
+		}
+
+		// reset wrapper sizing
+		// determine the height of all the non-content elements
+		nonContentHeight = this.uiDialog.css({
+				height: "auto",
+				width: options.width
+			})
+			.outerHeight();
+		minContentHeight = Math.max( 0, options.minHeight - nonContentHeight );
+		maxContentHeight = typeof options.maxHeight === "number" ?
+			Math.max( 0, options.maxHeight - nonContentHeight ) :
+			"none";
+
+		if ( options.height === "auto" ) {
+			this.element.css({
+				minHeight: minContentHeight,
+				maxHeight: maxContentHeight,
+				height: "auto"
+			});
+		} else {
+			this.element.height( Math.max( 0, options.height - nonContentHeight ) );
+		}
+
+		if (this.uiDialog.is(":data(ui-resizable)") ) {
+			this.uiDialog.resizable( "option", "minHeight", this._minHeight() );
+		}
+	},
+
+	_blockFrames: function() {
+		this.iframeBlocks = this.document.find( "iframe" ).map(function() {
+			var iframe = $( this );
+
+			return $( "<div>" )
+				.css({
+					position: "absolute",
+					width: iframe.outerWidth(),
+					height: iframe.outerHeight()
+				})
+				.appendTo( iframe.parent() )
+				.offset( iframe.offset() )[0];
+		});
+	},
+
+	_unblockFrames: function() {
+		if ( this.iframeBlocks ) {
+			this.iframeBlocks.remove();
+			delete this.iframeBlocks;
+		}
+	},
+
+	_allowInteraction: function( event ) {
+		if ( $( event.target ).closest(".ui-dialog").length ) {
+			return true;
+		}
+
+		// TODO: Remove hack when datepicker implements
+		// the .ui-front logic (#8989)
+		return !!$( event.target ).closest(".ui-datepicker").length;
+	},
+
+	_createOverlay: function() {
+		if ( !this.options.modal ) {
+			return;
+		}
+
+		var that = this,
+			widgetFullName = this.widgetFullName;
+		if ( !$.ui.dialog.overlayInstances ) {
+			// Prevent use of anchors and inputs.
+			// We use a delay in case the overlay is created from an
+			// event that we're going to be cancelling. (#2804)
+			this._delay(function() {
+				// Handle .dialog().dialog("close") (#4065)
+				if ( $.ui.dialog.overlayInstances ) {
+					this.document.bind( "focusin.dialog", function( event ) {
+						if ( !that._allowInteraction( event ) ) {
+							event.preventDefault();
+							$(".ui-dialog:visible:last .ui-dialog-content")
+								.data( widgetFullName )._focusTabbable();
+						}
+					});
+				}
+			});
+		}
+
+		this.overlay = $("<div>")
+			.addClass("ui-widget-overlay ui-front")
+			.appendTo( this._appendTo() );
+		this._on( this.overlay, {
+			mousedown: "_keepFocus"
+		});
+		$.ui.dialog.overlayInstances++;
+	},
+
+	_destroyOverlay: function() {
+		if ( !this.options.modal ) {
+			return;
+		}
+
+		if ( this.overlay ) {
+			$.ui.dialog.overlayInstances--;
+
+			if ( !$.ui.dialog.overlayInstances ) {
+				this.document.unbind( "focusin.dialog" );
+			}
+			this.overlay.remove();
+			this.overlay = null;
+		}
+	}
+});
+
+$.ui.dialog.overlayInstances = 0;
+
+// DEPRECATED
+if ( $.uiBackCompat !== false ) {
+	// position option with array notation
+	// just override with old implementation
+	$.widget( "ui.dialog", $.ui.dialog, {
+		_position: function() {
+			var position = this.options.position,
+				myAt = [],
+				offset = [ 0, 0 ],
+				isVisible;
+
+			if ( position ) {
+				if ( typeof position === "string" || (typeof position === "object" && "0" in position ) ) {
+					myAt = position.split ? position.split(" ") : [ position[0], position[1] ];
+					if ( myAt.length === 1 ) {
+						myAt[1] = myAt[0];
+					}
+
+					$.each( [ "left", "top" ], function( i, offsetPosition ) {
+						if ( +myAt[ i ] === myAt[ i ] ) {
+							offset[ i ] = myAt[ i ];
+							myAt[ i ] = offsetPosition;
+						}
+					});
+
+					position = {
+						my: myAt[0] + (offset[0] < 0 ? offset[0] : "+" + offset[0]) + " " +
+							myAt[1] + (offset[1] < 0 ? offset[1] : "+" + offset[1]),
+						at: myAt.join(" ")
+					};
+				}
+
+				position = $.extend( {}, $.ui.dialog.prototype.options.position, position );
+			} else {
+				position = $.ui.dialog.prototype.options.position;
+			}
+
+			// need to show the dialog to get the actual offset in the position plugin
+			isVisible = this.uiDialog.is(":visible");
+			if ( !isVisible ) {
+				this.uiDialog.show();
+			}
+			this.uiDialog.position( position );
+			if ( !isVisible ) {
+				this.uiDialog.hide();
+			}
+		}
+	});
+}
+
+}( jQuery ) );
+
+(function( $, undefined ) {
+
+var rvertical = /up|down|vertical/,
+	rpositivemotion = /up|left|vertical|horizontal/;
+
+$.effects.effect.blind = function( o, done ) {
+	// Create element
+	var el = $( this ),
+		props = [ "position", "top", "bottom", "left", "right", "height", "width" ],
+		mode = $.effects.setMode( el, o.mode || "hide" ),
+		direction = o.direction || "up",
+		vertical = rvertical.test( direction ),
+		ref = vertical ? "height" : "width",
+		ref2 = vertical ? "top" : "left",
+		motion = rpositivemotion.test( direction ),
+		animation = {},
+		show = mode === "show",
+		wrapper, distance, margin;
+
+	// if already wrapped, the wrapper's properties are my property. #6245
+	if ( el.parent().is( ".ui-effects-wrapper" ) ) {
+		$.effects.save( el.parent(), props );
+	} else {
+		$.effects.save( el, props );
+	}
+	el.show();
+	wrapper = $.effects.createWrapper( el ).css({
+		overflow: "hidden"
+	});
+
+	distance = wrapper[ ref ]();
+	margin = parseFloat( wrapper.css( ref2 ) ) || 0;
+
+	animation[ ref ] = show ? distance : 0;
+	if ( !motion ) {
+		el
+			.css( vertical ? "bottom" : "right", 0 )
+			.css( vertical ? "top" : "left", "auto" )
+			.css({ position: "absolute" });
+
+		animation[ ref2 ] = show ? margin : distance + margin;
+	}
+
+	// start at 0 if we are showing
+	if ( show ) {
+		wrapper.css( ref, 0 );
+		if ( ! motion ) {
+			wrapper.css( ref2, margin + distance );
+		}
+	}
+
+	// Animate
+	wrapper.animate( animation, {
+		duration: o.duration,
+		easing: o.easing,
+		queue: false,
+		complete: function() {
+			if ( mode === "hide" ) {
+				el.hide();
+			}
+			$.effects.restore( el, props );
+			$.effects.removeWrapper( el );
+			done();
+		}
+	});
+
+};
+
+})(jQuery);
+
+(function( $, undefined ) {
+
+$.effects.effect.bounce = function( o, done ) {
+	var el = $( this ),
+		props = [ "position", "top", "bottom", "left", "right", "height", "width" ],
+
+		// defaults:
+		mode = $.effects.setMode( el, o.mode || "effect" ),
+		hide = mode === "hide",
+		show = mode === "show",
+		direction = o.direction || "up",
+		distance = o.distance,
+		times = o.times || 5,
+
+		// number of internal animations
+		anims = times * 2 + ( show || hide ? 1 : 0 ),
+		speed = o.duration / anims,
+		easing = o.easing,
+
+		// utility:
+		ref = ( direction === "up" || direction === "down" ) ? "top" : "left",
+		motion = ( direction === "up" || direction === "left" ),
+		i,
+		upAnim,
+		downAnim,
+
+		// we will need to re-assemble the queue to stack our animations in place
+		queue = el.queue(),
+		queuelen = queue.length;
+
+	// Avoid touching opacity to prevent clearType and PNG issues in IE
+	if ( show || hide ) {
+		props.push( "opacity" );
+	}
+
+	$.effects.save( el, props );
+	el.show();
+	$.effects.createWrapper( el ); // Create Wrapper
+
+	// default distance for the BIGGEST bounce is the outer Distance / 3
+	if ( !distance ) {
+		distance = el[ ref === "top" ? "outerHeight" : "outerWidth" ]() / 3;
+	}
+
+	if ( show ) {
+		downAnim = { opacity: 1 };
+		downAnim[ ref ] = 0;
+
+		// if we are showing, force opacity 0 and set the initial position
+		// then do the "first" animation
+		el.css( "opacity", 0 )
+			.css( ref, motion ? -distance * 2 : distance * 2 )
+			.animate( downAnim, speed, easing );
+	}
+
+	// start at the smallest distance if we are hiding
+	if ( hide ) {
+		distance = distance / Math.pow( 2, times - 1 );
+	}
+
+	downAnim = {};
+	downAnim[ ref ] = 0;
+	// Bounces up/down/left/right then back to 0 -- times * 2 animations happen here
+	for ( i = 0; i < times; i++ ) {
+		upAnim = {};
+		upAnim[ ref ] = ( motion ? "-=" : "+=" ) + distance;
+
+		el.animate( upAnim, speed, easing )
+			.animate( downAnim, speed, easing );
+
+		distance = hide ? distance * 2 : distance / 2;
+	}
+
+	// Last Bounce when Hiding
+	if ( hide ) {
+		upAnim = { opacity: 0 };
+		upAnim[ ref ] = ( motion ? "-=" : "+=" ) + distance;
+
+		el.animate( upAnim, speed, easing );
+	}
+
+	el.queue(function() {
+		if ( hide ) {
+			el.hide();
+		}
+		$.effects.restore( el, props );
+		$.effects.removeWrapper( el );
+		done();
+	});
+
+	// inject all the animations we just queued to be first in line (after "inprogress")
+	if ( queuelen > 1) {
+		queue.splice.apply( queue,
+			[ 1, 0 ].concat( queue.splice( queuelen, anims + 1 ) ) );
+	}
+	el.dequeue();
+
+};
+
+})(jQuery);
+
+(function( $, undefined ) {
+
+$.effects.effect.clip = function( o, done ) {
+	// Create element
+	var el = $( this ),
+		props = [ "position", "top", "bottom", "left", "right", "height", "width" ],
+		mode = $.effects.setMode( el, o.mode || "hide" ),
+		show = mode === "show",
+		direction = o.direction || "vertical",
+		vert = direction === "vertical",
+		size = vert ? "height" : "width",
+		position = vert ? "top" : "left",
+		animation = {},
+		wrapper, animate, distance;
+
+	// Save & Show
+	$.effects.save( el, props );
+	el.show();
+
+	// Create Wrapper
+	wrapper = $.effects.createWrapper( el ).css({
+		overflow: "hidden"
+	});
+	animate = ( el[0].tagName === "IMG" ) ? wrapper : el;
+	distance = animate[ size ]();
+
+	// Shift
+	if ( show ) {
+		animate.css( size, 0 );
+		animate.css( position, distance / 2 );
+	}
+
+	// Create Animation Object:
+	animation[ size ] = show ? distance : 0;
+	animation[ position ] = show ? 0 : distance / 2;
+
+	// Animate
+	animate.animate( animation, {
+		queue: false,
+		duration: o.duration,
+		easing: o.easing,
+		complete: function() {
+			if ( !show ) {
+				el.hide();
+			}
+			$.effects.restore( el, props );
+			$.effects.removeWrapper( el );
+			done();
+		}
+	});
+
+};
+
+})(jQuery);
+
+(function( $, undefined ) {
+
+$.effects.effect.drop = function( o, done ) {
+
+	var el = $( this ),
+		props = [ "position", "top", "bottom", "left", "right", "opacity", "height", "width" ],
+		mode = $.effects.setMode( el, o.mode || "hide" ),
+		show = mode === "show",
+		direction = o.direction || "left",
+		ref = ( direction === "up" || direction === "down" ) ? "top" : "left",
+		motion = ( direction === "up" || direction === "left" ) ? "pos" : "neg",
+		animation = {
+			opacity: show ? 1 : 0
+		},
+		distance;
+
+	// Adjust
+	$.effects.save( el, props );
+	el.show();
+	$.effects.createWrapper( el );
+
+	distance = o.distance || el[ ref === "top" ? "outerHeight": "outerWidth" ]( true ) / 2;
+
+	if ( show ) {
+		el
+			.css( "opacity", 0 )
+			.css( ref, motion === "pos" ? -distance : distance );
+	}
+
+	// Animation
+	animation[ ref ] = ( show ?
+		( motion === "pos" ? "+=" : "-=" ) :
+		( motion === "pos" ? "-=" : "+=" ) ) +
+		distance;
+
+	// Animate
+	el.animate( animation, {
+		queue: false,
+		duration: o.duration,
+		easing: o.easing,
+		complete: function() {
+			if ( mode === "hide" ) {
+				el.hide();
+			}
+			$.effects.restore( el, props );
+			$.effects.removeWrapper( el );
+			done();
+		}
+	});
+};
+
+})(jQuery);
+
+(function( $, undefined ) {
+
+$.effects.effect.explode = function( o, done ) {
+
+	var rows = o.pieces ? Math.round( Math.sqrt( o.pieces ) ) : 3,
+		cells = rows,
+		el = $( this ),
+		mode = $.effects.setMode( el, o.mode || "hide" ),
+		show = mode === "show",
+
+		// show and then visibility:hidden the element before calculating offset
+		offset = el.show().css( "visibility", "hidden" ).offset(),
+
+		// width and height of a piece
+		width = Math.ceil( el.outerWidth() / cells ),
+		height = Math.ceil( el.outerHeight() / rows ),
+		pieces = [],
+
+		// loop
+		i, j, left, top, mx, my;
+
+	// children animate complete:
+	function childComplete() {
+		pieces.push( this );
+		if ( pieces.length === rows * cells ) {
+			animComplete();
+		}
+	}
+
+	// clone the element for each row and cell.
+	for( i = 0; i < rows ; i++ ) { // ===>
+		top = offset.top + i * height;
+		my = i - ( rows - 1 ) / 2 ;
+
+		for( j = 0; j < cells ; j++ ) { // |||
+			left = offset.left + j * width;
+			mx = j - ( cells - 1 ) / 2 ;
+
+			// Create a clone of the now hidden main element that will be absolute positioned
+			// within a wrapper div off the -left and -top equal to size of our pieces
+			el
+				.clone()
+				.appendTo( "body" )
+				.wrap( "<div></div>" )
+				.css({
+					position: "absolute",
+					visibility: "visible",
+					left: -j * width,
+					top: -i * height
+				})
+
+			// select the wrapper - make it overflow: hidden and absolute positioned based on
+			// where the original was located +left and +top equal to the size of pieces
+				.parent()
+				.addClass( "ui-effects-explode" )
+				.css({
+					position: "absolute",
+					overflow: "hidden",
+					width: width,
+					height: height,
+					left: left + ( show ? mx * width : 0 ),
+					top: top + ( show ? my * height : 0 ),
+					opacity: show ? 0 : 1
+				}).animate({
+					left: left + ( show ? 0 : mx * width ),
+					top: top + ( show ? 0 : my * height ),
+					opacity: show ? 1 : 0
+				}, o.duration || 500, o.easing, childComplete );
+		}
+	}
+
+	function animComplete() {
+		el.css({
+			visibility: "visible"
+		});
+		$( pieces ).remove();
+		if ( !show ) {
+			el.hide();
+		}
+		done();
+	}
+};
+
+})(jQuery);
+
+(function( $, undefined ) {
+
+$.effects.effect.fade = function( o, done ) {
+	var el = $( this ),
+		mode = $.effects.setMode( el, o.mode || "toggle" );
+
+	el.animate({
+		opacity: mode
+	}, {
+		queue: false,
+		duration: o.duration,
+		easing: o.easing,
+		complete: done
+	});
+};
+
+})( jQuery );
+
+(function( $, undefined ) {
+
+$.effects.effect.fold = function( o, done ) {
+
+	// Create element
+	var el = $( this ),
+		props = [ "position", "top", "bottom", "left", "right", "height", "width" ],
+		mode = $.effects.setMode( el, o.mode || "hide" ),
+		show = mode === "show",
+		hide = mode === "hide",
+		size = o.size || 15,
+		percent = /([0-9]+)%/.exec( size ),
+		horizFirst = !!o.horizFirst,
+		widthFirst = show !== horizFirst,
+		ref = widthFirst ? [ "width", "height" ] : [ "height", "width" ],
+		duration = o.duration / 2,
+		wrapper, distance,
+		animation1 = {},
+		animation2 = {};
+
+	$.effects.save( el, props );
+	el.show();
+
+	// Create Wrapper
+	wrapper = $.effects.createWrapper( el ).css({
+		overflow: "hidden"
+	});
+	distance = widthFirst ?
+		[ wrapper.width(), wrapper.height() ] :
+		[ wrapper.height(), wrapper.width() ];
+
+	if ( percent ) {
+		size = parseInt( percent[ 1 ], 10 ) / 100 * distance[ hide ? 0 : 1 ];
+	}
+	if ( show ) {
+		wrapper.css( horizFirst ? {
+			height: 0,
+			width: size
+		} : {
+			height: size,
+			width: 0
+		});
+	}
+
+	// Animation
+	animation1[ ref[ 0 ] ] = show ? distance[ 0 ] : size;
+	animation2[ ref[ 1 ] ] = show ? distance[ 1 ] : 0;
+
+	// Animate
+	wrapper
+		.animate( animation1, duration, o.easing )
+		.animate( animation2, duration, o.easing, function() {
+			if ( hide ) {
+				el.hide();
+			}
+			$.effects.restore( el, props );
+			$.effects.removeWrapper( el );
+			done();
+		});
+
+};
+
+})(jQuery);
+
+(function( $, undefined ) {
+
+$.effects.effect.highlight = function( o, done ) {
+	var elem = $( this ),
+		props = [ "backgroundImage", "backgroundColor", "opacity" ],
+		mode = $.effects.setMode( elem, o.mode || "show" ),
+		animation = {
+			backgroundColor: elem.css( "backgroundColor" )
+		};
+
+	if (mode === "hide") {
+		animation.opacity = 0;
+	}
+
+	$.effects.save( elem, props );
+
+	elem
+		.show()
+		.css({
+			backgroundImage: "none",
+			backgroundColor: o.color || "#ffff99"
+		})
+		.animate( animation, {
+			queue: false,
+			duration: o.duration,
+			easing: o.easing,
+			complete: function() {
+				if ( mode === "hide" ) {
+					elem.hide();
+				}
+				$.effects.restore( elem, props );
+				done();
+			}
+		});
+};
+
+})(jQuery);
+
+(function( $, undefined ) {
+
+$.effects.effect.pulsate = function( o, done ) {
+	var elem = $( this ),
+		mode = $.effects.setMode( elem, o.mode || "show" ),
+		show = mode === "show",
+		hide = mode === "hide",
+		showhide = ( show || mode === "hide" ),
+
+		// showing or hiding leaves of the "last" animation
+		anims = ( ( o.times || 5 ) * 2 ) + ( showhide ? 1 : 0 ),
+		duration = o.duration / anims,
+		animateTo = 0,
+		queue = elem.queue(),
+		queuelen = queue.length,
+		i;
+
+	if ( show || !elem.is(":visible")) {
+		elem.css( "opacity", 0 ).show();
+		animateTo = 1;
+	}
+
+	// anims - 1 opacity "toggles"
+	for ( i = 1; i < anims; i++ ) {
+		elem.animate({
+			opacity: animateTo
+		}, duration, o.easing );
+		animateTo = 1 - animateTo;
+	}
+
+	elem.animate({
+		opacity: animateTo
+	}, duration, o.easing);
+
+	elem.queue(function() {
+		if ( hide ) {
+			elem.hide();
+		}
+		done();
+	});
+
+	// We just queued up "anims" animations, we need to put them next in the queue
+	if ( queuelen > 1 ) {
+		queue.splice.apply( queue,
+			[ 1, 0 ].concat( queue.splice( queuelen, anims + 1 ) ) );
+	}
+	elem.dequeue();
+};
+
+})(jQuery);
+
+(function( $, undefined ) {
+
+$.effects.effect.puff = function( o, done ) {
+	var elem = $( this ),
+		mode = $.effects.setMode( elem, o.mode || "hide" ),
+		hide = mode === "hide",
+		percent = parseInt( o.percent, 10 ) || 150,
+		factor = percent / 100,
+		original = {
+			height: elem.height(),
+			width: elem.width(),
+			outerHeight: elem.outerHeight(),
+			outerWidth: elem.outerWidth()
+		};
+
+	$.extend( o, {
+		effect: "scale",
+		queue: false,
+		fade: true,
+		mode: mode,
+		complete: done,
+		percent: hide ? percent : 100,
+		from: hide ?
+			original :
+			{
+				height: original.height * factor,
+				width: original.width * factor,
+				outerHeight: original.outerHeight * factor,
+				outerWidth: original.outerWidth * factor
+			}
+	});
+
+	elem.effect( o );
+};
+
+$.effects.effect.scale = function( o, done ) {
+
+	// Create element
+	var el = $( this ),
+		options = $.extend( true, {}, o ),
+		mode = $.effects.setMode( el, o.mode || "effect" ),
+		percent = parseInt( o.percent, 10 ) ||
+			( parseInt( o.percent, 10 ) === 0 ? 0 : ( mode === "hide" ? 0 : 100 ) ),
+		direction = o.direction || "both",
+		origin = o.origin,
+		original = {
+			height: el.height(),
+			width: el.width(),
+			outerHeight: el.outerHeight(),
+			outerWidth: el.outerWidth()
+		},
+		factor = {
+			y: direction !== "horizontal" ? (percent / 100) : 1,
+			x: direction !== "vertical" ? (percent / 100) : 1
+		};
+
+	// We are going to pass this effect to the size effect:
+	options.effect = "size";
+	options.queue = false;
+	options.complete = done;
+
+	// Set default origin and restore for show/hide
+	if ( mode !== "effect" ) {
+		options.origin = origin || ["middle","center"];
+		options.restore = true;
+	}
+
+	options.from = o.from || ( mode === "show" ? {
+		height: 0,
+		width: 0,
+		outerHeight: 0,
+		outerWidth: 0
+	} : original );
+	options.to = {
+		height: original.height * factor.y,
+		width: original.width * factor.x,
+		outerHeight: original.outerHeight * factor.y,
+		outerWidth: original.outerWidth * factor.x
+	};
+
+	// Fade option to support puff
+	if ( options.fade ) {
+		if ( mode === "show" ) {
+			options.from.opacity = 0;
+			options.to.opacity = 1;
+		}
+		if ( mode === "hide" ) {
+			options.from.opacity = 1;
+			options.to.opacity = 0;
+		}
+	}
+
+	// Animate
+	el.effect( options );
+
+};
+
+$.effects.effect.size = function( o, done ) {
+
+	// Create element
+	var original, baseline, factor,
+		el = $( this ),
+		props0 = [ "position", "top", "bottom", "left", "right", "width", "height", "overflow", "opacity" ],
+
+		// Always restore
+		props1 = [ "position", "top", "bottom", "left", "right", "overflow", "opacity" ],
+
+		// Copy for children
+		props2 = [ "width", "height", "overflow" ],
+		cProps = [ "fontSize" ],
+		vProps = [ "borderTopWidth", "borderBottomWidth", "paddingTop", "paddingBottom" ],
+		hProps = [ "borderLeftWidth", "borderRightWidth", "paddingLeft", "paddingRight" ],
+
+		// Set options
+		mode = $.effects.setMode( el, o.mode || "effect" ),
+		restore = o.restore || mode !== "effect",
+		scale = o.scale || "both",
+		origin = o.origin || [ "middle", "center" ],
+		position = el.css( "position" ),
+		props = restore ? props0 : props1,
+		zero = {
+			height: 0,
+			width: 0,
+			outerHeight: 0,
+			outerWidth: 0
+		};
+
+	if ( mode === "show" ) {
+		el.show();
+	}
+	original = {
+		height: el.height(),
+		width: el.width(),
+		outerHeight: el.outerHeight(),
+		outerWidth: el.outerWidth()
+	};
+
+	if ( o.mode === "toggle" && mode === "show" ) {
+		el.from = o.to || zero;
+		el.to = o.from || original;
+	} else {
+		el.from = o.from || ( mode === "show" ? zero : original );
+		el.to = o.to || ( mode === "hide" ? zero : original );
+	}
+
+	// Set scaling factor
+	factor = {
+		from: {
+			y: el.from.height / original.height,
+			x: el.from.width / original.width
+		},
+		to: {
+			y: el.to.height / original.height,
+			x: el.to.width / original.width
+		}
+	};
+
+	// Scale the css box
+	if ( scale === "box" || scale === "both" ) {
+
+		// Vertical props scaling
+		if ( factor.from.y !== factor.to.y ) {
+			props = props.concat( vProps );
+			el.from = $.effects.setTransition( el, vProps, factor.from.y, el.from );
+			el.to = $.effects.setTransition( el, vProps, factor.to.y, el.to );
+		}
+
+		// Horizontal props scaling
+		if ( factor.from.x !== factor.to.x ) {
+			props = props.concat( hProps );
+			el.from = $.effects.setTransition( el, hProps, factor.from.x, el.from );
+			el.to = $.effects.setTransition( el, hProps, factor.to.x, el.to );
+		}
+	}
+
+	// Scale the content
+	if ( scale === "content" || scale === "both" ) {
+
+		// Vertical props scaling
+		if ( factor.from.y !== factor.to.y ) {
+			props = props.concat( cProps ).concat( props2 );
+			el.from = $.effects.setTransition( el, cProps, factor.from.y, el.from );
+			el.to = $.effects.setTransition( el, cProps, factor.to.y, el.to );
+		}
+	}
+
+	$.effects.save( el, props );
+	el.show();
+	$.effects.createWrapper( el );
+	el.css( "overflow", "hidden" ).css( el.from );
+
+	// Adjust
+	if (origin) { // Calculate baseline shifts
+		baseline = $.effects.getBaseline( origin, original );
+		el.from.top = ( original.outerHeight - el.outerHeight() ) * baseline.y;
+		el.from.left = ( original.outerWidth - el.outerWidth() ) * baseline.x;
+		el.to.top = ( original.outerHeight - el.to.outerHeight ) * baseline.y;
+		el.to.left = ( original.outerWidth - el.to.outerWidth ) * baseline.x;
+	}
+	el.css( el.from ); // set top & left
+
+	// Animate
+	if ( scale === "content" || scale === "both" ) { // Scale the children
+
+		// Add margins/font-size
+		vProps = vProps.concat([ "marginTop", "marginBottom" ]).concat(cProps);
+		hProps = hProps.concat([ "marginLeft", "marginRight" ]);
+		props2 = props0.concat(vProps).concat(hProps);
+
+		el.find( "*[width]" ).each( function(){
+			var child = $( this ),
+				c_original = {
+					height: child.height(),
+					width: child.width(),
+					outerHeight: child.outerHeight(),
+					outerWidth: child.outerWidth()
+				};
+			if (restore) {
+				$.effects.save(child, props2);
+			}
+
+			child.from = {
+				height: c_original.height * factor.from.y,
+				width: c_original.width * factor.from.x,
+				outerHeight: c_original.outerHeight * factor.from.y,
+				outerWidth: c_original.outerWidth * factor.from.x
+			};
+			child.to = {
+				height: c_original.height * factor.to.y,
+				width: c_original.width * factor.to.x,
+				outerHeight: c_original.height * factor.to.y,
+				outerWidth: c_original.width * factor.to.x
+			};
+
+			// Vertical props scaling
+			if ( factor.from.y !== factor.to.y ) {
+				child.from = $.effects.setTransition( child, vProps, factor.from.y, child.from );
+				child.to = $.effects.setTransition( child, vProps, factor.to.y, child.to );
+			}
+
+			// Horizontal props scaling
+			if ( factor.from.x !== factor.to.x ) {
+				child.from = $.effects.setTransition( child, hProps, factor.from.x, child.from );
+				child.to = $.effects.setTransition( child, hProps, factor.to.x, child.to );
+			}
+
+			// Animate children
+			child.css( child.from );
+			child.animate( child.to, o.duration, o.easing, function() {
+
+				// Restore children
+				if ( restore ) {
+					$.effects.restore( child, props2 );
+				}
+			});
+		});
+	}
+
+	// Animate
+	el.animate( el.to, {
+		queue: false,
+		duration: o.duration,
+		easing: o.easing,
+		complete: function() {
+			if ( el.to.opacity === 0 ) {
+				el.css( "opacity", el.from.opacity );
+			}
+			if( mode === "hide" ) {
+				el.hide();
+			}
+			$.effects.restore( el, props );
+			if ( !restore ) {
+
+				// we need to calculate our new positioning based on the scaling
+				if ( position === "static" ) {
+					el.css({
+						position: "relative",
+						top: el.to.top,
+						left: el.to.left
+					});
+				} else {
+					$.each([ "top", "left" ], function( idx, pos ) {
+						el.css( pos, function( _, str ) {
+							var val = parseInt( str, 10 ),
+								toRef = idx ? el.to.left : el.to.top;
+
+							// if original was "auto", recalculate the new value from wrapper
+							if ( str === "auto" ) {
+								return toRef + "px";
+							}
+
+							return val + toRef + "px";
+						});
+					});
+				}
+			}
+
+			$.effects.removeWrapper( el );
+			done();
+		}
+	});
+
+};
+
+})(jQuery);
+
+(function( $, undefined ) {
+
+$.effects.effect.shake = function( o, done ) {
+
+	var el = $( this ),
+		props = [ "position", "top", "bottom", "left", "right", "height", "width" ],
+		mode = $.effects.setMode( el, o.mode || "effect" ),
+		direction = o.direction || "left",
+		distance = o.distance || 20,
+		times = o.times || 3,
+		anims = times * 2 + 1,
+		speed = Math.round(o.duration/anims),
+		ref = (direction === "up" || direction === "down") ? "top" : "left",
+		positiveMotion = (direction === "up" || direction === "left"),
+		animation = {},
+		animation1 = {},
+		animation2 = {},
+		i,
+
+		// we will need to re-assemble the queue to stack our animations in place
+		queue = el.queue(),
+		queuelen = queue.length;
+
+	$.effects.save( el, props );
+	el.show();
+	$.effects.createWrapper( el );
+
+	// Animation
+	animation[ ref ] = ( positiveMotion ? "-=" : "+=" ) + distance;
+	animation1[ ref ] = ( positiveMotion ? "+=" : "-=" ) + distance * 2;
+	animation2[ ref ] = ( positiveMotion ? "-=" : "+=" ) + distance * 2;
+
+	// Animate
+	el.animate( animation, speed, o.easing );
+
+	// Shakes
+	for ( i = 1; i < times; i++ ) {
+		el.animate( animation1, speed, o.easing ).animate( animation2, speed, o.easing );
+	}
+	el
+		.animate( animation1, speed, o.easing )
+		.animate( animation, speed / 2, o.easing )
+		.queue(function() {
+			if ( mode === "hide" ) {
+				el.hide();
+			}
+			$.effects.restore( el, props );
+			$.effects.removeWrapper( el );
+			done();
+		});
+
+	// inject all the animations we just queued to be first in line (after "inprogress")
+	if ( queuelen > 1) {
+		queue.splice.apply( queue,
+			[ 1, 0 ].concat( queue.splice( queuelen, anims + 1 ) ) );
+	}
+	el.dequeue();
+
+};
+
+})(jQuery);
+
+(function( $, undefined ) {
+
+$.effects.effect.slide = function( o, done ) {
+
+	// Create element
+	var el = $( this ),
+		props = [ "position", "top", "bottom", "left", "right", "width", "height" ],
+		mode = $.effects.setMode( el, o.mode || "show" ),
+		show = mode === "show",
+		direction = o.direction || "left",
+		ref = (direction === "up" || direction === "down") ? "top" : "left",
+		positiveMotion = (direction === "up" || direction === "left"),
+		distance,
+		animation = {};
+
+	// Adjust
+	$.effects.save( el, props );
+	el.show();
+	distance = o.distance || el[ ref === "top" ? "outerHeight" : "outerWidth" ]( true );
+
+	$.effects.createWrapper( el ).css({
+		overflow: "hidden"
+	});
+
+	if ( show ) {
+		el.css( ref, positiveMotion ? (isNaN(distance) ? "-" + distance : -distance) : distance );
+	}
+
+	// Animation
+	animation[ ref ] = ( show ?
+		( positiveMotion ? "+=" : "-=") :
+		( positiveMotion ? "-=" : "+=")) +
+		distance;
+
+	// Animate
+	el.animate( animation, {
+		queue: false,
+		duration: o.duration,
+		easing: o.easing,
+		complete: function() {
+			if ( mode === "hide" ) {
+				el.hide();
+			}
+			$.effects.restore( el, props );
+			$.effects.removeWrapper( el );
+			done();
+		}
+	});
+};
+
+})(jQuery);
+
+(function( $, undefined ) {
+
+$.effects.effect.transfer = function( o, done ) {
+	var elem = $( this ),
+		target = $( o.to ),
+		targetFixed = target.css( "position" ) === "fixed",
+		body = $("body"),
+		fixTop = targetFixed ? body.scrollTop() : 0,
+		fixLeft = targetFixed ? body.scrollLeft() : 0,
+		endPosition = target.offset(),
+		animation = {
+			top: endPosition.top - fixTop ,
+			left: endPosition.left - fixLeft ,
+			height: target.innerHeight(),
+			width: target.innerWidth()
+		},
+		startPosition = elem.offset(),
+		transfer = $( "<div class='ui-effects-transfer'></div>" )
+			.appendTo( document.body )
+			.addClass( o.className )
+			.css({
+				top: startPosition.top - fixTop ,
+				left: startPosition.left - fixLeft ,
+				height: elem.innerHeight(),
+				width: elem.innerWidth(),
+				position: targetFixed ? "fixed" : "absolute"
+			})
+			.animate( animation, o.duration, o.easing, function() {
+				transfer.remove();
+				done();
+			});
+};
+
+})(jQuery);
+
+(function( $, undefined ) {
+
+$.widget( "ui.menu", {
+	version: "1.10.3",
+	defaultElement: "<ul>",
+	delay: 300,
+	options: {
+		icons: {
+			submenu: "ui-icon-carat-1-e"
+		},
+		menus: "ul",
+		position: {
+			my: "left top",
+			at: "right top"
+		},
+		role: "menu",
+
+		// callbacks
+		blur: null,
+		focus: null,
+		select: null
+	},
+
+	_create: function() {
+		this.activeMenu = this.element;
+		// flag used to prevent firing of the click handler
+		// as the event bubbles up through nested menus
+		this.mouseHandled = false;
+		this.element
+			.uniqueId()
+			.addClass( "ui-menu ui-widget ui-widget-content ui-corner-all" )
+			.toggleClass( "ui-menu-icons", !!this.element.find( ".ui-icon" ).length )
+			.attr({
+				role: this.options.role,
+				tabIndex: 0
+			})
+			// need to catch all clicks on disabled menu
+			// not possible through _on
+			.bind( "click" + this.eventNamespace, $.proxy(function( event ) {
+				if ( this.options.disabled ) {
+					event.preventDefault();
+				}
+			}, this ));
+
+		if ( this.options.disabled ) {
+			this.element
+				.addClass( "ui-state-disabled" )
+				.attr( "aria-disabled", "true" );
+		}
+
+		this._on({
+			// Prevent focus from sticking to links inside menu after clicking
+			// them (focus should always stay on UL during navigation).
+			"mousedown .ui-menu-item > a": function( event ) {
+				event.preventDefault();
+			},
+			"click .ui-state-disabled > a": function( event ) {
+				event.preventDefault();
+			},
+			"click .ui-menu-item:has(a)": function( event ) {
+				var target = $( event.target ).closest( ".ui-menu-item" );
+				if ( !this.mouseHandled && target.not( ".ui-state-disabled" ).length ) {
+					this.mouseHandled = true;
+
+					this.select( event );
+					// Open submenu on click
+					if ( target.has( ".ui-menu" ).length ) {
+						this.expand( event );
+					} else if ( !this.element.is( ":focus" ) ) {
+						// Redirect focus to the menu
+						this.element.trigger( "focus", [ true ] );
+
+						// If the active item is on the top level, let it stay active.
+						// Otherwise, blur the active item since it is no longer visible.
+						if ( this.active && this.active.parents( ".ui-menu" ).length === 1 ) {
+							clearTimeout( this.timer );
+						}
+					}
+				}
+			},
+			"mouseenter .ui-menu-item": function( event ) {
+				var target = $( event.currentTarget );
+				// Remove ui-state-active class from siblings of the newly focused menu item
+				// to avoid a jump caused by adjacent elements both having a class with a border
+				target.siblings().children( ".ui-state-active" ).removeClass( "ui-state-active" );
+				this.focus( event, target );
+			},
+			mouseleave: "collapseAll",
+			"mouseleave .ui-menu": "collapseAll",
+			focus: function( event, keepActiveItem ) {
+				// If there's already an active item, keep it active
+				// If not, activate the first item
+				var item = this.active || this.element.children( ".ui-menu-item" ).eq( 0 );
+
+				if ( !keepActiveItem ) {
+					this.focus( event, item );
+				}
+			},
+			blur: function( event ) {
+				this._delay(function() {
+					if ( !$.contains( this.element[0], this.document[0].activeElement ) ) {
+						this.collapseAll( event );
+					}
+				});
+			},
+			keydown: "_keydown"
+		});
+
+		this.refresh();
+
+		// Clicks outside of a menu collapse any open menus
+		this._on( this.document, {
+			click: function( event ) {
+				if ( !$( event.target ).closest( ".ui-menu" ).length ) {
+					this.collapseAll( event );
+				}
+
+				// Reset the mouseHandled flag
+				this.mouseHandled = false;
+			}
+		});
+	},
+
+	_destroy: function() {
+		// Destroy (sub)menus
+		this.element
+			.removeAttr( "aria-activedescendant" )
+			.find( ".ui-menu" ).addBack()
+				.removeClass( "ui-menu ui-widget ui-widget-content ui-corner-all ui-menu-icons" )
+				.removeAttr( "role" )
+				.removeAttr( "tabIndex" )
+				.removeAttr( "aria-labelledby" )
+				.removeAttr( "aria-expanded" )
+				.removeAttr( "aria-hidden" )
+				.removeAttr( "aria-disabled" )
+				.removeUniqueId()
+				.show();
+
+		// Destroy menu items
+		this.element.find( ".ui-menu-item" )
+			.removeClass( "ui-menu-item" )
+			.removeAttr( "role" )
+			.removeAttr( "aria-disabled" )
+			.children( "a" )
+				.removeUniqueId()
+				.removeClass( "ui-corner-all ui-state-hover" )
+				.removeAttr( "tabIndex" )
+				.removeAttr( "role" )
+				.removeAttr( "aria-haspopup" )
+				.children().each( function() {
+					var elem = $( this );
+					if ( elem.data( "ui-menu-submenu-carat" ) ) {
+						elem.remove();
+					}
+				});
+
+		// Destroy menu dividers
+		this.element.find( ".ui-menu-divider" ).removeClass( "ui-menu-divider ui-widget-content" );
+	},
+
+	_keydown: function( event ) {
+		/*jshint maxcomplexity:20*/
+		var match, prev, character, skip, regex,
+			preventDefault = true;
+
+		function escape( value ) {
+			return value.replace( /[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&" );
+		}
+
+		switch ( event.keyCode ) {
+		case $.ui.keyCode.PAGE_UP:
+			this.previousPage( event );
+			break;
+		case $.ui.keyCode.PAGE_DOWN:
+			this.nextPage( event );
+			break;
+		case $.ui.keyCode.HOME:
+			this._move( "first", "first", event );
+			break;
+		case $.ui.keyCode.END:
+			this._move( "last", "last", event );
+			break;
+		case $.ui.keyCode.UP:
+			this.previous( event );
+			break;
+		case $.ui.keyCode.DOWN:
+			this.next( event );
+			break;
+		case $.ui.keyCode.LEFT:
+			this.collapse( event );
+			break;
+		case $.ui.keyCode.RIGHT:
+			if ( this.active && !this.active.is( ".ui-state-disabled" ) ) {
+				this.expand( event );
+			}
+			break;
+		case $.ui.keyCode.ENTER:
+		case $.ui.keyCode.SPACE:
+			this._activate( event );
+			break;
+		case $.ui.keyCode.ESCAPE:
+			this.collapse( event );
+			break;
+		default:
+			preventDefault = false;
+			prev = this.previousFilter || "";
+			character = String.fromCharCode( event.keyCode );
+			skip = false;
+
+			clearTimeout( this.filterTimer );
+
+			if ( character === prev ) {
+				skip = true;
+			} else {
+				character = prev + character;
+			}
+
+			regex = new RegExp( "^" + escape( character ), "i" );
+			match = this.activeMenu.children( ".ui-menu-item" ).filter(function() {
+				return regex.test( $( this ).children( "a" ).text() );
+			});
+			match = skip && match.index( this.active.next() ) !== -1 ?
+				this.active.nextAll( ".ui-menu-item" ) :
+				match;
+
+			// If no matches on the current filter, reset to the last character pressed
+			// to move down the menu to the first item that starts with that character
+			if ( !match.length ) {
+				character = String.fromCharCode( event.keyCode );
+				regex = new RegExp( "^" + escape( character ), "i" );
+				match = this.activeMenu.children( ".ui-menu-item" ).filter(function() {
+					return regex.test( $( this ).children( "a" ).text() );
+				});
+			}
+
+			if ( match.length ) {
+				this.focus( event, match );
+				if ( match.length > 1 ) {
+					this.previousFilter = character;
+					this.filterTimer = this._delay(function() {
+						delete this.previousFilter;
+					}, 1000 );
+				} else {
+					delete this.previousFilter;
+				}
+			} else {
+				delete this.previousFilter;
+			}
+		}
+
+		if ( preventDefault ) {
+			event.preventDefault();
+		}
+	},
+
+	_activate: function( event ) {
+		if ( !this.active.is( ".ui-state-disabled" ) ) {
+			if ( this.active.children( "a[aria-haspopup='true']" ).length ) {
+				this.expand( event );
+			} else {
+				this.select( event );
+			}
+		}
+	},
+
+	refresh: function() {
+		var menus,
+			icon = this.options.icons.submenu,
+			submenus = this.element.find( this.options.menus );
+
+		// Initialize nested menus
+		submenus.filter( ":not(.ui-menu)" )
+			.addClass( "ui-menu ui-widget ui-widget-content ui-corner-all" )
+			.hide()
+			.attr({
+				role: this.options.role,
+				"aria-hidden": "true",
+				"aria-expanded": "false"
+			})
+			.each(function() {
+				var menu = $( this ),
+					item = menu.prev( "a" ),
+					submenuCarat = $( "<span>" )
+						.addClass( "ui-menu-icon ui-icon " + icon )
+						.data( "ui-menu-submenu-carat", true );
+
+				item
+					.attr( "aria-haspopup", "true" )
+					.prepend( submenuCarat );
+				menu.attr( "aria-labelledby", item.attr( "id" ) );
+			});
+
+		menus = submenus.add( this.element );
+
+		// Don't refresh list items that are already adapted
+		menus.children( ":not(.ui-menu-item):has(a)" )
+			.addClass( "ui-menu-item" )
+			.attr( "role", "presentation" )
+			.children( "a" )
+				.uniqueId()
+				.addClass( "ui-corner-all" )
+				.attr({
+					tabIndex: -1,
+					role: this._itemRole()
+				});
+
+		// Initialize unlinked menu-items containing spaces and/or dashes only as dividers
+		menus.children( ":not(.ui-menu-item)" ).each(function() {
+			var item = $( this );
+			// hyphen, em dash, en dash
+			if ( !/[^\-\u2014\u2013\s]/.test( item.text() ) ) {
+				item.addClass( "ui-widget-content ui-menu-divider" );
+			}
+		});
+
+		// Add aria-disabled attribute to any disabled menu item
+		menus.children( ".ui-state-disabled" ).attr( "aria-disabled", "true" );
+
+		// If the active item has been removed, blur the menu
+		if ( this.active && !$.contains( this.element[ 0 ], this.active[ 0 ] ) ) {
+			this.blur();
+		}
+	},
+
+	_itemRole: function() {
+		return {
+			menu: "menuitem",
+			listbox: "option"
+		}[ this.options.role ];
+	},
+
+	_setOption: function( key, value ) {
+		if ( key === "icons" ) {
+			this.element.find( ".ui-menu-icon" )
+				.removeClass( this.options.icons.submenu )
+				.addClass( value.submenu );
+		}
+		this._super( key, value );
+	},
+
+	focus: function( event, item ) {
+		var nested, focused;
+		this.blur( event, event && event.type === "focus" );
+
+		this._scrollIntoView( item );
+
+		this.active = item.first();
+		focused = this.active.children( "a" ).addClass( "ui-state-focus" );
+		// Only update aria-activedescendant if there's a role
+		// otherwise we assume focus is managed elsewhere
+		if ( this.options.role ) {
+			this.element.attr( "aria-activedescendant", focused.attr( "id" ) );
+		}
+
+		// Highlight active parent menu item, if any
+		this.active
+			.parent()
+			.closest( ".ui-menu-item" )
+			.children( "a:first" )
+			.addClass( "ui-state-active" );
+
+		if ( event && event.type === "keydown" ) {
+			this._close();
+		} else {
+			this.timer = this._delay(function() {
+				this._close();
+			}, this.delay );
+		}
+
+		nested = item.children( ".ui-menu" );
+		if ( nested.length && ( /^mouse/.test( event.type ) ) ) {
+			this._startOpening(nested);
+		}
+		this.activeMenu = item.parent();
+
+		this._trigger( "focus", event, { item: item } );
+	},
+
+	_scrollIntoView: function( item ) {
+		var borderTop, paddingTop, offset, scroll, elementHeight, itemHeight;
+		if ( this._hasScroll() ) {
+			borderTop = parseFloat( $.css( this.activeMenu[0], "borderTopWidth" ) ) || 0;
+			paddingTop = parseFloat( $.css( this.activeMenu[0], "paddingTop" ) ) || 0;
+			offset = item.offset().top - this.activeMenu.offset().top - borderTop - paddingTop;
+			scroll = this.activeMenu.scrollTop();
+			elementHeight = this.activeMenu.height();
+			itemHeight = item.height();
+
+			if ( offset < 0 ) {
+				this.activeMenu.scrollTop( scroll + offset );
+			} else if ( offset + itemHeight > elementHeight ) {
+				this.activeMenu.scrollTop( scroll + offset - elementHeight + itemHeight );
+			}
+		}
+	},
+
+	blur: function( event, fromFocus ) {
+		if ( !fromFocus ) {
+			clearTimeout( this.timer );
+		}
+
+		if ( !this.active ) {
+			return;
+		}
+
+		this.active.children( "a" ).removeClass( "ui-state-focus" );
+		this.active = null;
+
+		this._trigger( "blur", event, { item: this.active } );
+	},
+
+	_startOpening: function( submenu ) {
+		clearTimeout( this.timer );
+
+		// Don't open if already open fixes a Firefox bug that caused a .5 pixel
+		// shift in the submenu position when mousing over the carat icon
+		if ( submenu.attr( "aria-hidden" ) !== "true" ) {
+			return;
+		}
+
+		this.timer = this._delay(function() {
+			this._close();
+			this._open( submenu );
+		}, this.delay );
+	},
+
+	_open: function( submenu ) {
+		var position = $.extend({
+			of: this.active
+		}, this.options.position );
+
+		clearTimeout( this.timer );
+		this.element.find( ".ui-menu" ).not( submenu.parents( ".ui-menu" ) )
+			.hide()
+			.attr( "aria-hidden", "true" );
+
+		submenu
+			.show()
+			.removeAttr( "aria-hidden" )
+			.attr( "aria-expanded", "true" )
+			.position( position );
+	},
+
+	collapseAll: function( event, all ) {
+		clearTimeout( this.timer );
+		this.timer = this._delay(function() {
+			// If we were passed an event, look for the submenu that contains the event
+			var currentMenu = all ? this.element :
+				$( event && event.target ).closest( this.element.find( ".ui-menu" ) );
+
+			// If we found no valid submenu ancestor, use the main menu to close all sub menus anyway
+			if ( !currentMenu.length ) {
+				currentMenu = this.element;
+			}
+
+			this._close( currentMenu );
+
+			this.blur( event );
+			this.activeMenu = currentMenu;
+		}, this.delay );
+	},
+
+	// With no arguments, closes the currently active menu - if nothing is active
+	// it closes all menus.  If passed an argument, it will search for menus BELOW
+	_close: function( startMenu ) {
+		if ( !startMenu ) {
+			startMenu = this.active ? this.active.parent() : this.element;
+		}
+
+		startMenu
+			.find( ".ui-menu" )
+				.hide()
+				.attr( "aria-hidden", "true" )
+				.attr( "aria-expanded", "false" )
+			.end()
+			.find( "a.ui-state-active" )
+				.removeClass( "ui-state-active" );
+	},
+
+	collapse: function( event ) {
+		var newItem = this.active &&
+			this.active.parent().closest( ".ui-menu-item", this.element );
+		if ( newItem && newItem.length ) {
+			this._close();
+			this.focus( event, newItem );
+		}
+	},
+
+	expand: function( event ) {
+		var newItem = this.active &&
+			this.active
+				.children( ".ui-menu " )
+				.children( ".ui-menu-item" )
+				.first();
+
+		if ( newItem && newItem.length ) {
+			this._open( newItem.parent() );
+
+			// Delay so Firefox will not hide activedescendant change in expanding submenu from AT
+			this._delay(function() {
+				this.focus( event, newItem );
+			});
+		}
+	},
+
+	next: function( event ) {
+		this._move( "next", "first", event );
+	},
+
+	previous: function( event ) {
+		this._move( "prev", "last", event );
+	},
+
+	isFirstItem: function() {
+		return this.active && !this.active.prevAll( ".ui-menu-item" ).length;
+	},
+
+	isLastItem: function() {
+		return this.active && !this.active.nextAll( ".ui-menu-item" ).length;
+	},
+
+	_move: function( direction, filter, event ) {
+		var next;
+		if ( this.active ) {
+			if ( direction === "first" || direction === "last" ) {
+				next = this.active
+					[ direction === "first" ? "prevAll" : "nextAll" ]( ".ui-menu-item" )
+					.eq( -1 );
+			} else {
+				next = this.active
+					[ direction + "All" ]( ".ui-menu-item" )
+					.eq( 0 );
+			}
+		}
+		if ( !next || !next.length || !this.active ) {
+			next = this.activeMenu.children( ".ui-menu-item" )[ filter ]();
+		}
+
+		this.focus( event, next );
+	},
+
+	nextPage: function( event ) {
+		var item, base, height;
+
+		if ( !this.active ) {
+			this.next( event );
+			return;
+		}
+		if ( this.isLastItem() ) {
+			return;
+		}
+		if ( this._hasScroll() ) {
+			base = this.active.offset().top;
+			height = this.element.height();
+			this.active.nextAll( ".ui-menu-item" ).each(function() {
+				item = $( this );
+				return item.offset().top - base - height < 0;
+			});
+
+			this.focus( event, item );
+		} else {
+			this.focus( event, this.activeMenu.children( ".ui-menu-item" )
+				[ !this.active ? "first" : "last" ]() );
+		}
+	},
+
+	previousPage: function( event ) {
+		var item, base, height;
+		if ( !this.active ) {
+			this.next( event );
+			return;
+		}
+		if ( this.isFirstItem() ) {
+			return;
+		}
+		if ( this._hasScroll() ) {
+			base = this.active.offset().top;
+			height = this.element.height();
+			this.active.prevAll( ".ui-menu-item" ).each(function() {
+				item = $( this );
+				return item.offset().top - base + height > 0;
+			});
+
+			this.focus( event, item );
+		} else {
+			this.focus( event, this.activeMenu.children( ".ui-menu-item" ).first() );
+		}
+	},
+
+	_hasScroll: function() {
+		return this.element.outerHeight() < this.element.prop( "scrollHeight" );
+	},
+
+	select: function( event ) {
+		// TODO: It should never be possible to not have an active item at this
+		// point, but the tests don't trigger mouseenter before click.
+		this.active = this.active || $( event.target ).closest( ".ui-menu-item" );
+		var ui = { item: this.active };
+		if ( !this.active.has( ".ui-menu" ).length ) {
+			this.collapseAll( event, true );
+		}
+		this._trigger( "select", event, ui );
+	}
+});
+
+}( jQuery ));
+
+(function( $, undefined ) {
+
+$.ui = $.ui || {};
+
+var cachedScrollbarWidth,
+	max = Math.max,
+	abs = Math.abs,
+	round = Math.round,
+	rhorizontal = /left|center|right/,
+	rvertical = /top|center|bottom/,
+	roffset = /[\+\-]\d+(\.[\d]+)?%?/,
+	rposition = /^\w+/,
+	rpercent = /%$/,
+	_position = $.fn.position;
+
+function getOffsets( offsets, width, height ) {
+	return [
+		parseFloat( offsets[ 0 ] ) * ( rpercent.test( offsets[ 0 ] ) ? width / 100 : 1 ),
+		parseFloat( offsets[ 1 ] ) * ( rpercent.test( offsets[ 1 ] ) ? height / 100 : 1 )
+	];
+}
+
+function parseCss( element, property ) {
+	return parseInt( $.css( element, property ), 10 ) || 0;
+}
+
+function getDimensions( elem ) {
+	var raw = elem[0];
+	if ( raw.nodeType === 9 ) {
+		return {
+			width: elem.width(),
+			height: elem.height(),
+			offset: { top: 0, left: 0 }
+		};
+	}
+	if ( $.isWindow( raw ) ) {
+		return {
+			width: elem.width(),
+			height: elem.height(),
+			offset: { top: elem.scrollTop(), left: elem.scrollLeft() }
+		};
+	}
+	if ( raw.preventDefault ) {
+		return {
+			width: 0,
+			height: 0,
+			offset: { top: raw.pageY, left: raw.pageX }
+		};
+	}
+	return {
+		width: elem.outerWidth(),
+		height: elem.outerHeight(),
+		offset: elem.offset()
+	};
+}
+
+$.position = {
+	scrollbarWidth: function() {
+		if ( cachedScrollbarWidth !== undefined ) {
+			return cachedScrollbarWidth;
+		}
+		var w1, w2,
+			div = $( "<div style='display:block;width:50px;height:50px;overflow:hidden;'><div style='height:100px;width:auto;'></div></div>" ),
+			innerDiv = div.children()[0];
+
+		$( "body" ).append( div );
+		w1 = innerDiv.offsetWidth;
+		div.css( "overflow", "scroll" );
+
+		w2 = innerDiv.offsetWidth;
+
+		if ( w1 === w2 ) {
+			w2 = div[0].clientWidth;
+		}
+
+		div.remove();
+
+		return (cachedScrollbarWidth = w1 - w2);
+	},
+	getScrollInfo: function( within ) {
+		var overflowX = within.isWindow ? "" : within.element.css( "overflow-x" ),
+			overflowY = within.isWindow ? "" : within.element.css( "overflow-y" ),
+			hasOverflowX = overflowX === "scroll" ||
+				( overflowX === "auto" && within.width < within.element[0].scrollWidth ),
+			hasOverflowY = overflowY === "scroll" ||
+				( overflowY === "auto" && within.height < within.element[0].scrollHeight );
+		return {
+			width: hasOverflowY ? $.position.scrollbarWidth() : 0,
+			height: hasOverflowX ? $.position.scrollbarWidth() : 0
+		};
+	},
+	getWithinInfo: function( element ) {
+		var withinElement = $( element || window ),
+			isWindow = $.isWindow( withinElement[0] );
+		return {
+			element: withinElement,
+			isWindow: isWindow,
+			offset: withinElement.offset() || { left: 0, top: 0 },
+			scrollLeft: withinElement.scrollLeft(),
+			scrollTop: withinElement.scrollTop(),
+			width: isWindow ? withinElement.width() : withinElement.outerWidth(),
+			height: isWindow ? withinElement.height() : withinElement.outerHeight()
+		};
+	}
+};
+
+$.fn.position = function( options ) {
+	if ( !options || !options.of ) {
+		return _position.apply( this, arguments );
+	}
+
+	// make a copy, we don't want to modify arguments
+	options = $.extend( {}, options );
+
+	var atOffset, targetWidth, targetHeight, targetOffset, basePosition, dimensions,
+		target = $( options.of ),
+		within = $.position.getWithinInfo( options.within ),
+		scrollInfo = $.position.getScrollInfo( within ),
+		collision = ( options.collision || "flip" ).split( " " ),
+		offsets = {};
+
+	dimensions = getDimensions( target );
+	if ( target[0].preventDefault ) {
+		// force left top to allow flipping
+		options.at = "left top";
+	}
+	targetWidth = dimensions.width;
+	targetHeight = dimensions.height;
+	targetOffset = dimensions.offset;
+	// clone to reuse original targetOffset later
+	basePosition = $.extend( {}, targetOffset );
+
+	// force my and at to have valid horizontal and vertical positions
+	// if a value is missing or invalid, it will be converted to center
+	$.each( [ "my", "at" ], function() {
+		var pos = ( options[ this ] || "" ).split( " " ),
+			horizontalOffset,
+			verticalOffset;
+
+		if ( pos.length === 1) {
+			pos = rhorizontal.test( pos[ 0 ] ) ?
+				pos.concat( [ "center" ] ) :
+				rvertical.test( pos[ 0 ] ) ?
+					[ "center" ].concat( pos ) :
+					[ "center", "center" ];
+		}
+		pos[ 0 ] = rhorizontal.test( pos[ 0 ] ) ? pos[ 0 ] : "center";
+		pos[ 1 ] = rvertical.test( pos[ 1 ] ) ? pos[ 1 ] : "center";
+
+		// calculate offsets
+		horizontalOffset = roffset.exec( pos[ 0 ] );
+		verticalOffset = roffset.exec( pos[ 1 ] );
+		offsets[ this ] = [
+			horizontalOffset ? horizontalOffset[ 0 ] : 0,
+			verticalOffset ? verticalOffset[ 0 ] : 0
+		];
+
+		// reduce to just the positions without the offsets
+		options[ this ] = [
+			rposition.exec( pos[ 0 ] )[ 0 ],
+			rposition.exec( pos[ 1 ] )[ 0 ]
+		];
+	});
+
+	// normalize collision option
+	if ( collision.length === 1 ) {
+		collision[ 1 ] = collision[ 0 ];
+	}
+
+	if ( options.at[ 0 ] === "right" ) {
+		basePosition.left += targetWidth;
+	} else if ( options.at[ 0 ] === "center" ) {
+		basePosition.left += targetWidth / 2;
+	}
+
+	if ( options.at[ 1 ] === "bottom" ) {
+		basePosition.top += targetHeight;
+	} else if ( options.at[ 1 ] === "center" ) {
+		basePosition.top += targetHeight / 2;
+	}
+
+	atOffset = getOffsets( offsets.at, targetWidth, targetHeight );
+	basePosition.left += atOffset[ 0 ];
+	basePosition.top += atOffset[ 1 ];
+
+	return this.each(function() {
+		var collisionPosition, using,
+			elem = $( this ),
+			elemWidth = elem.outerWidth(),
+			elemHeight = elem.outerHeight(),
+			marginLeft = parseCss( this, "marginLeft" ),
+			marginTop = parseCss( this, "marginTop" ),
+			collisionWidth = elemWidth + marginLeft + parseCss( this, "marginRight" ) + scrollInfo.width,
+			collisionHeight = elemHeight + marginTop + parseCss( this, "marginBottom" ) + scrollInfo.height,
+			position = $.extend( {}, basePosition ),
+			myOffset = getOffsets( offsets.my, elem.outerWidth(), elem.outerHeight() );
+
+		if ( options.my[ 0 ] === "right" ) {
+			position.left -= elemWidth;
+		} else if ( options.my[ 0 ] === "center" ) {
+			position.left -= elemWidth / 2;
+		}
+
+		if ( options.my[ 1 ] === "bottom" ) {
+			position.top -= elemHeight;
+		} else if ( options.my[ 1 ] === "center" ) {
+			position.top -= elemHeight / 2;
+		}
+
+		position.left += myOffset[ 0 ];
+		position.top += myOffset[ 1 ];
+
+		// if the browser doesn't support fractions, then round for consistent results
+		if ( !$.support.offsetFractions ) {
+			position.left = round( position.left );
+			position.top = round( position.top );
+		}
+
+		collisionPosition = {
+			marginLeft: marginLeft,
+			marginTop: marginTop
+		};
+
+		$.each( [ "left", "top" ], function( i, dir ) {
+			if ( $.ui.position[ collision[ i ] ] ) {
+				$.ui.position[ collision[ i ] ][ dir ]( position, {
+					targetWidth: targetWidth,
+					targetHeight: targetHeight,
+					elemWidth: elemWidth,
+					elemHeight: elemHeight,
+					collisionPosition: collisionPosition,
+					collisionWidth: collisionWidth,
+					collisionHeight: collisionHeight,
+					offset: [ atOffset[ 0 ] + myOffset[ 0 ], atOffset [ 1 ] + myOffset[ 1 ] ],
+					my: options.my,
+					at: options.at,
+					within: within,
+					elem : elem
+				});
+			}
+		});
+
+		if ( options.using ) {
+			// adds feedback as second argument to using callback, if present
+			using = function( props ) {
+				var left = targetOffset.left - position.left,
+					right = left + targetWidth - elemWidth,
+					top = targetOffset.top - position.top,
+					bottom = top + targetHeight - elemHeight,
+					feedback = {
+						target: {
+							element: target,
+							left: targetOffset.left,
+							top: targetOffset.top,
+							width: targetWidth,
+							height: targetHeight
+						},
+						element: {
+							element: elem,
+							left: position.left,
+							top: position.top,
+							width: elemWidth,
+							height: elemHeight
+						},
+						horizontal: right < 0 ? "left" : left > 0 ? "right" : "center",
+						vertical: bottom < 0 ? "top" : top > 0 ? "bottom" : "middle"
+					};
+				if ( targetWidth < elemWidth && abs( left + right ) < targetWidth ) {
+					feedback.horizontal = "center";
+				}
+				if ( targetHeight < elemHeight && abs( top + bottom ) < targetHeight ) {
+					feedback.vertical = "middle";
+				}
+				if ( max( abs( left ), abs( right ) ) > max( abs( top ), abs( bottom ) ) ) {
+					feedback.important = "horizontal";
+				} else {
+					feedback.important = "vertical";
+				}
+				options.using.call( this, props, feedback );
+			};
+		}
+
+		elem.offset( $.extend( position, { using: using } ) );
+	});
+};
+
+$.ui.position = {
+	fit: {
+		left: function( position, data ) {
+			var within = data.within,
+				withinOffset = within.isWindow ? within.scrollLeft : within.offset.left,
+				outerWidth = within.width,
+				collisionPosLeft = position.left - data.collisionPosition.marginLeft,
+				overLeft = withinOffset - collisionPosLeft,
+				overRight = collisionPosLeft + data.collisionWidth - outerWidth - withinOffset,
+				newOverRight;
+
+			// element is wider than within
+			if ( data.collisionWidth > outerWidth ) {
+				// element is initially over the left side of within
+				if ( overLeft > 0 && overRight <= 0 ) {
+					newOverRight = position.left + overLeft + data.collisionWidth - outerWidth - withinOffset;
+					position.left += overLeft - newOverRight;
+				// element is initially over right side of within
+				} else if ( overRight > 0 && overLeft <= 0 ) {
+					position.left = withinOffset;
+				// element is initially over both left and right sides of within
+				} else {
+					if ( overLeft > overRight ) {
+						position.left = withinOffset + outerWidth - data.collisionWidth;
+					} else {
+						position.left = withinOffset;
+					}
+				}
+			// too far left -> align with left edge
+			} else if ( overLeft > 0 ) {
+				position.left += overLeft;
+			// too far right -> align with right edge
+			} else if ( overRight > 0 ) {
+				position.left -= overRight;
+			// adjust based on position and margin
+			} else {
+				position.left = max( position.left - collisionPosLeft, position.left );
+			}
+		},
+		top: function( position, data ) {
+			var within = data.within,
+				withinOffset = within.isWindow ? within.scrollTop : within.offset.top,
+				outerHeight = data.within.height,
+				collisionPosTop = position.top - data.collisionPosition.marginTop,
+				overTop = withinOffset - collisionPosTop,
+				overBottom = collisionPosTop + data.collisionHeight - outerHeight - withinOffset,
+				newOverBottom;
+
+			// element is taller than within
+			if ( data.collisionHeight > outerHeight ) {
+				// element is initially over the top of within
+				if ( overTop > 0 && overBottom <= 0 ) {
+					newOverBottom = position.top + overTop + data.collisionHeight - outerHeight - withinOffset;
+					position.top += overTop - newOverBottom;
+				// element is initially over bottom of within
+				} else if ( overBottom > 0 && overTop <= 0 ) {
+					position.top = withinOffset;
+				// element is initially over both top and bottom of within
+				} else {
+					if ( overTop > overBottom ) {
+						position.top = withinOffset + outerHeight - data.collisionHeight;
+					} else {
+						position.top = withinOffset;
+					}
+				}
+			// too far up -> align with top
+			} else if ( overTop > 0 ) {
+				position.top += overTop;
+			// too far down -> align with bottom edge
+			} else if ( overBottom > 0 ) {
+				position.top -= overBottom;
+			// adjust based on position and margin
+			} else {
+				position.top = max( position.top - collisionPosTop, position.top );
+			}
+		}
+	},
+	flip: {
+		left: function( position, data ) {
+			var within = data.within,
+				withinOffset = within.offset.left + within.scrollLeft,
+				outerWidth = within.width,
+				offsetLeft = within.isWindow ? within.scrollLeft : within.offset.left,
+				collisionPosLeft = position.left - data.collisionPosition.marginLeft,
+				overLeft = collisionPosLeft - offsetLeft,
+				overRight = collisionPosLeft + data.collisionWidth - outerWidth - offsetLeft,
+				myOffset = data.my[ 0 ] === "left" ?
+					-data.elemWidth :
+					data.my[ 0 ] === "right" ?
+						data.elemWidth :
+						0,
+				atOffset = data.at[ 0 ] === "left" ?
+					data.targetWidth :
+					data.at[ 0 ] === "right" ?
+						-data.targetWidth :
+						0,
+				offset = -2 * data.offset[ 0 ],
+				newOverRight,
+				newOverLeft;
+
+			if ( overLeft < 0 ) {
+				newOverRight = position.left + myOffset + atOffset + offset + data.collisionWidth - outerWidth - withinOffset;
+				if ( newOverRight < 0 || newOverRight < abs( overLeft ) ) {
+					position.left += myOffset + atOffset + offset;
+				}
+			}
+			else if ( overRight > 0 ) {
+				newOverLeft = position.left - data.collisionPosition.marginLeft + myOffset + atOffset + offset - offsetLeft;
+				if ( newOverLeft > 0 || abs( newOverLeft ) < overRight ) {
+					position.left += myOffset + atOffset + offset;
+				}
+			}
+		},
+		top: function( position, data ) {
+			var within = data.within,
+				withinOffset = within.offset.top + within.scrollTop,
+				outerHeight = within.height,
+				offsetTop = within.isWindow ? within.scrollTop : within.offset.top,
+				collisionPosTop = position.top - data.collisionPosition.marginTop,
+				overTop = collisionPosTop - offsetTop,
+				overBottom = collisionPosTop + data.collisionHeight - outerHeight - offsetTop,
+				top = data.my[ 1 ] === "top",
+				myOffset = top ?
+					-data.elemHeight :
+					data.my[ 1 ] === "bottom" ?
+						data.elemHeight :
+						0,
+				atOffset = data.at[ 1 ] === "top" ?
+					data.targetHeight :
+					data.at[ 1 ] === "bottom" ?
+						-data.targetHeight :
+						0,
+				offset = -2 * data.offset[ 1 ],
+				newOverTop,
+				newOverBottom;
+			if ( overTop < 0 ) {
+				newOverBottom = position.top + myOffset + atOffset + offset + data.collisionHeight - outerHeight - withinOffset;
+				if ( ( position.top + myOffset + atOffset + offset) > overTop && ( newOverBottom < 0 || newOverBottom < abs( overTop ) ) ) {
+					position.top += myOffset + atOffset + offset;
+				}
+			}
+			else if ( overBottom > 0 ) {
+				newOverTop = position.top -  data.collisionPosition.marginTop + myOffset + atOffset + offset - offsetTop;
+				if ( ( position.top + myOffset + atOffset + offset) > overBottom && ( newOverTop > 0 || abs( newOverTop ) < overBottom ) ) {
+					position.top += myOffset + atOffset + offset;
+				}
+			}
+		}
+	},
+	flipfit: {
+		left: function() {
+			$.ui.position.flip.left.apply( this, arguments );
+			$.ui.position.fit.left.apply( this, arguments );
+		},
+		top: function() {
+			$.ui.position.flip.top.apply( this, arguments );
+			$.ui.position.fit.top.apply( this, arguments );
+		}
+	}
+};
+
+// fraction support test
+(function () {
+	var testElement, testElementParent, testElementStyle, offsetLeft, i,
+		body = document.getElementsByTagName( "body" )[ 0 ],
+		div = document.createElement( "div" );
+
+	//Create a "fake body" for testing based on method used in jQuery.support
+	testElement = document.createElement( body ? "div" : "body" );
+	testElementStyle = {
+		visibility: "hidden",
+		width: 0,
+		height: 0,
+		border: 0,
+		margin: 0,
+		background: "none"
+	};
+	if ( body ) {
+		$.extend( testElementStyle, {
+			position: "absolute",
+			left: "-1000px",
+			top: "-1000px"
+		});
+	}
+	for ( i in testElementStyle ) {
+		testElement.style[ i ] = testElementStyle[ i ];
+	}
+	testElement.appendChild( div );
+	testElementParent = body || document.documentElement;
+	testElementParent.insertBefore( testElement, testElementParent.firstChild );
+
+	div.style.cssText = "position: absolute; left: 10.7432222px;";
+
+	offsetLeft = $( div ).offset().left;
+	$.support.offsetFractions = offsetLeft > 10 && offsetLeft < 11;
+
+	testElement.innerHTML = "";
+	testElementParent.removeChild( testElement );
+})();
+
+}( jQuery ) );
+
+(function( $, undefined ) {
+
+$.widget( "ui.progressbar", {
+	version: "1.10.3",
+	options: {
+		max: 100,
+		value: 0,
+
+		change: null,
+		complete: null
+	},
+
+	min: 0,
+
+	_create: function() {
+		// Constrain initial value
+		this.oldValue = this.options.value = this._constrainedValue();
+
+		this.element
+			.addClass( "ui-progressbar ui-widget ui-widget-content ui-corner-all" )
+			.attr({
+				// Only set static values, aria-valuenow and aria-valuemax are
+				// set inside _refreshValue()
+				role: "progressbar",
+				"aria-valuemin": this.min
+			});
+
+		this.valueDiv = $( "<div class='ui-progressbar-value ui-widget-header ui-corner-left'></div>" )
+			.appendTo( this.element );
+
+		this._refreshValue();
+	},
+
+	_destroy: function() {
+		this.element
+			.removeClass( "ui-progressbar ui-widget ui-widget-content ui-corner-all" )
+			.removeAttr( "role" )
+			.removeAttr( "aria-valuemin" )
+			.removeAttr( "aria-valuemax" )
+			.removeAttr( "aria-valuenow" );
+
+		this.valueDiv.remove();
+	},
+
+	value: function( newValue ) {
+		if ( newValue === undefined ) {
+			return this.options.value;
+		}
+
+		this.options.value = this._constrainedValue( newValue );
+		this._refreshValue();
+	},
+
+	_constrainedValue: function( newValue ) {
+		if ( newValue === undefined ) {
+			newValue = this.options.value;
+		}
+
+		this.indeterminate = newValue === false;
+
+		// sanitize value
+		if ( typeof newValue !== "number" ) {
+			newValue = 0;
+		}
+
+		return this.indeterminate ? false :
+			Math.min( this.options.max, Math.max( this.min, newValue ) );
+	},
+
+	_setOptions: function( options ) {
+		// Ensure "value" option is set after other values (like max)
+		var value = options.value;
+		delete options.value;
+
+		this._super( options );
+
+		this.options.value = this._constrainedValue( value );
+		this._refreshValue();
+	},
+
+	_setOption: function( key, value ) {
+		if ( key === "max" ) {
+			// Don't allow a max less than min
+			value = Math.max( this.min, value );
+		}
+
+		this._super( key, value );
+	},
+
+	_percentage: function() {
+		return this.indeterminate ? 100 : 100 * ( this.options.value - this.min ) / ( this.options.max - this.min );
+	},
+
+	_refreshValue: function() {
+		var value = this.options.value,
+			percentage = this._percentage();
+
+		this.valueDiv
+			.toggle( this.indeterminate || value > this.min )
+			.toggleClass( "ui-corner-right", value === this.options.max )
+			.width( percentage.toFixed(0) + "%" );
+
+		this.element.toggleClass( "ui-progressbar-indeterminate", this.indeterminate );
+
+		if ( this.indeterminate ) {
+			this.element.removeAttr( "aria-valuenow" );
+			if ( !this.overlayDiv ) {
+				this.overlayDiv = $( "<div class='ui-progressbar-overlay'></div>" ).appendTo( this.valueDiv );
+			}
+		} else {
+			this.element.attr({
+				"aria-valuemax": this.options.max,
+				"aria-valuenow": value
+			});
+			if ( this.overlayDiv ) {
+				this.overlayDiv.remove();
+				this.overlayDiv = null;
+			}
+		}
+
+		if ( this.oldValue !== value ) {
+			this.oldValue = value;
+			this._trigger( "change" );
+		}
+		if ( value === this.options.max ) {
+			this._trigger( "complete" );
+		}
+	}
+});
+
+})( jQuery );
+
+(function( $, undefined ) {
+
+// number of pages in a slider
+// (how many times can you page up/down to go through the whole range)
+var numPages = 5;
+
+$.widget( "ui.slider", $.ui.mouse, {
+	version: "1.10.3",
+	widgetEventPrefix: "slide",
+
+	options: {
+		animate: false,
+		distance: 0,
+		max: 100,
+		min: 0,
+		orientation: "horizontal",
+		range: false,
+		step: 1,
+		value: 0,
+		values: null,
+
+		// callbacks
+		change: null,
+		slide: null,
+		start: null,
+		stop: null
+	},
+
+	_create: function() {
+		this._keySliding = false;
+		this._mouseSliding = false;
+		this._animateOff = true;
+		this._handleIndex = null;
+		this._detectOrientation();
+		this._mouseInit();
+
+		this.element
+			.addClass( "ui-slider" +
+				" ui-slider-" + this.orientation +
+				" ui-widget" +
+				" ui-widget-content" +
+				" ui-corner-all");
+
+		this._refresh();
+		this._setOption( "disabled", this.options.disabled );
+
+		this._animateOff = false;
+	},
+
+	_refresh: function() {
+		this._createRange();
+		this._createHandles();
+		this._setupEvents();
+		this._refreshValue();
+	},
+
+	_createHandles: function() {
+		var i, handleCount,
+			options = this.options,
+			existingHandles = this.element.find( ".ui-slider-handle" ).addClass( "ui-state-default ui-corner-all" ),
+			handle = "<a class='ui-slider-handle ui-state-default ui-corner-all' href='#'></a>",
+			handles = [];
+
+		handleCount = ( options.values && options.values.length ) || 1;
+
+		if ( existingHandles.length > handleCount ) {
+			existingHandles.slice( handleCount ).remove();
+			existingHandles = existingHandles.slice( 0, handleCount );
+		}
+
+		for ( i = existingHandles.length; i < handleCount; i++ ) {
+			handles.push( handle );
+		}
+
+		this.handles = existingHandles.add( $( handles.join( "" ) ).appendTo( this.element ) );
+
+		this.handle = this.handles.eq( 0 );
+
+		this.handles.each(function( i ) {
+			$( this ).data( "ui-slider-handle-index", i );
+		});
+	},
+
+	_createRange: function() {
+		var options = this.options,
+			classes = "";
+
+		if ( options.range ) {
+			if ( options.range === true ) {
+				if ( !options.values ) {
+					options.values = [ this._valueMin(), this._valueMin() ];
+				} else if ( options.values.length && options.values.length !== 2 ) {
+					options.values = [ options.values[0], options.values[0] ];
+				} else if ( $.isArray( options.values ) ) {
+					options.values = options.values.slice(0);
+				}
+			}
+
+			if ( !this.range || !this.range.length ) {
+				this.range = $( "<div></div>" )
+					.appendTo( this.element );
+
+				classes = "ui-slider-range" +
+				// note: this isn't the most fittingly semantic framework class for this element,
+				// but worked best visually with a variety of themes
+				" ui-widget-header ui-corner-all";
+			} else {
+				this.range.removeClass( "ui-slider-range-min ui-slider-range-max" )
+					// Handle range switching from true to min/max
+					.css({
+						"left": "",
+						"bottom": ""
+					});
+			}
+
+			this.range.addClass( classes +
+				( ( options.range === "min" || options.range === "max" ) ? " ui-slider-range-" + options.range : "" ) );
+		} else {
+			this.range = $([]);
+		}
+	},
+
+	_setupEvents: function() {
+		var elements = this.handles.add( this.range ).filter( "a" );
+		this._off( elements );
+		this._on( elements, this._handleEvents );
+		this._hoverable( elements );
+		this._focusable( elements );
+	},
+
+	_destroy: function() {
+		this.handles.remove();
+		this.range.remove();
+
+		this.element
+			.removeClass( "ui-slider" +
+				" ui-slider-horizontal" +
+				" ui-slider-vertical" +
+				" ui-widget" +
+				" ui-widget-content" +
+				" ui-corner-all" );
+
+		this._mouseDestroy();
+	},
+
+	_mouseCapture: function( event ) {
+		var position, normValue, distance, closestHandle, index, allowed, offset, mouseOverHandle,
+			that = this,
+			o = this.options;
+
+		if ( o.disabled ) {
+			return false;
+		}
+
+		this.elementSize = {
+			width: this.element.outerWidth(),
+			height: this.element.outerHeight()
+		};
+		this.elementOffset = this.element.offset();
+
+		position = { x: event.pageX, y: event.pageY };
+		normValue = this._normValueFromMouse( position );
+		distance = this._valueMax() - this._valueMin() + 1;
+		this.handles.each(function( i ) {
+			var thisDistance = Math.abs( normValue - that.values(i) );
+			if (( distance > thisDistance ) ||
+				( distance === thisDistance &&
+					(i === that._lastChangedValue || that.values(i) === o.min ))) {
+				distance = thisDistance;
+				closestHandle = $( this );
+				index = i;
+			}
+		});
+
+		allowed = this._start( event, index );
+		if ( allowed === false ) {
+			return false;
+		}
+		this._mouseSliding = true;
+
+		this._handleIndex = index;
+
+		closestHandle
+			.addClass( "ui-state-active" )
+			.focus();
+
+		offset = closestHandle.offset();
+		mouseOverHandle = !$( event.target ).parents().addBack().is( ".ui-slider-handle" );
+		this._clickOffset = mouseOverHandle ? { left: 0, top: 0 } : {
+			left: event.pageX - offset.left - ( closestHandle.width() / 2 ),
+			top: event.pageY - offset.top -
+				( closestHandle.height() / 2 ) -
+				( parseInt( closestHandle.css("borderTopWidth"), 10 ) || 0 ) -
+				( parseInt( closestHandle.css("borderBottomWidth"), 10 ) || 0) +
+				( parseInt( closestHandle.css("marginTop"), 10 ) || 0)
+		};
+
+		if ( !this.handles.hasClass( "ui-state-hover" ) ) {
+			this._slide( event, index, normValue );
+		}
+		this._animateOff = true;
+		return true;
+	},
+
+	_mouseStart: function() {
+		return true;
+	},
+
+	_mouseDrag: function( event ) {
+		var position = { x: event.pageX, y: event.pageY },
+			normValue = this._normValueFromMouse( position );
+
+		this._slide( event, this._handleIndex, normValue );
+
+		return false;
+	},
+
+	_mouseStop: function( event ) {
+		this.handles.removeClass( "ui-state-active" );
+		this._mouseSliding = false;
+
+		this._stop( event, this._handleIndex );
+		this._change( event, this._handleIndex );
+
+		this._handleIndex = null;
+		this._clickOffset = null;
+		this._animateOff = false;
+
+		return false;
+	},
+
+	_detectOrientation: function() {
+		this.orientation = ( this.options.orientation === "vertical" ) ? "vertical" : "horizontal";
+	},
+
+	_normValueFromMouse: function( position ) {
+		var pixelTotal,
+			pixelMouse,
+			percentMouse,
+			valueTotal,
+			valueMouse;
+
+		if ( this.orientation === "horizontal" ) {
+			pixelTotal = this.elementSize.width;
+			pixelMouse = position.x - this.elementOffset.left - ( this._clickOffset ? this._clickOffset.left : 0 );
+		} else {
+			pixelTotal = this.elementSize.height;
+			pixelMouse = position.y - this.elementOffset.top - ( this._clickOffset ? this._clickOffset.top : 0 );
+		}
+
+		percentMouse = ( pixelMouse / pixelTotal );
+		if ( percentMouse > 1 ) {
+			percentMouse = 1;
+		}
+		if ( percentMouse < 0 ) {
+			percentMouse = 0;
+		}
+		if ( this.orientation === "vertical" ) {
+			percentMouse = 1 - percentMouse;
+		}
+
+		valueTotal = this._valueMax() - this._valueMin();
+		valueMouse = this._valueMin() + percentMouse * valueTotal;
+
+		return this._trimAlignValue( valueMouse );
+	},
+
+	_start: function( event, index ) {
+		var uiHash = {
+			handle: this.handles[ index ],
+			value: this.value()
+		};
+		if ( this.options.values && this.options.values.length ) {
+			uiHash.value = this.values( index );
+			uiHash.values = this.values();
+		}
+		return this._trigger( "start", event, uiHash );
+	},
+
+	_slide: function( event, index, newVal ) {
+		var otherVal,
+			newValues,
+			allowed;
+
+		if ( this.options.values && this.options.values.length ) {
+			otherVal = this.values( index ? 0 : 1 );
+
+			if ( ( this.options.values.length === 2 && this.options.range === true ) &&
+					( ( index === 0 && newVal > otherVal) || ( index === 1 && newVal < otherVal ) )
+				) {
+				newVal = otherVal;
+			}
+
+			if ( newVal !== this.values( index ) ) {
+				newValues = this.values();
+				newValues[ index ] = newVal;
+				// A slide can be canceled by returning false from the slide callback
+				allowed = this._trigger( "slide", event, {
+					handle: this.handles[ index ],
+					value: newVal,
+					values: newValues
+				} );
+				otherVal = this.values( index ? 0 : 1 );
+				if ( allowed !== false ) {
+					this.values( index, newVal, true );
+				}
+			}
+		} else {
+			if ( newVal !== this.value() ) {
+				// A slide can be canceled by returning false from the slide callback
+				allowed = this._trigger( "slide", event, {
+					handle: this.handles[ index ],
+					value: newVal
+				} );
+				if ( allowed !== false ) {
+					this.value( newVal );
+				}
+			}
+		}
+	},
+
+	_stop: function( event, index ) {
+		var uiHash = {
+			handle: this.handles[ index ],
+			value: this.value()
+		};
+		if ( this.options.values && this.options.values.length ) {
+			uiHash.value = this.values( index );
+			uiHash.values = this.values();
+		}
+
+		this._trigger( "stop", event, uiHash );
+	},
+
+	_change: function( event, index ) {
+		if ( !this._keySliding && !this._mouseSliding ) {
+			var uiHash = {
+				handle: this.handles[ index ],
+				value: this.value()
+			};
+			if ( this.options.values && this.options.values.length ) {
+				uiHash.value = this.values( index );
+				uiHash.values = this.values();
+			}
+
+			//store the last changed value index for reference when handles overlap
+			this._lastChangedValue = index;
+
+			this._trigger( "change", event, uiHash );
+		}
+	},
+
+	value: function( newValue ) {
+		if ( arguments.length ) {
+			this.options.value = this._trimAlignValue( newValue );
+			this._refreshValue();
+			this._change( null, 0 );
+			return;
+		}
+
+		return this._value();
+	},
+
+	values: function( index, newValue ) {
+		var vals,
+			newValues,
+			i;
+
+		if ( arguments.length > 1 ) {
+			this.options.values[ index ] = this._trimAlignValue( newValue );
+			this._refreshValue();
+			this._change( null, index );
+			return;
+		}
+
+		if ( arguments.length ) {
+			if ( $.isArray( arguments[ 0 ] ) ) {
+				vals = this.options.values;
+				newValues = arguments[ 0 ];
+				for ( i = 0; i < vals.length; i += 1 ) {
+					vals[ i ] = this._trimAlignValue( newValues[ i ] );
+					this._change( null, i );
+				}
+				this._refreshValue();
+			} else {
+				if ( this.options.values && this.options.values.length ) {
+					return this._values( index );
+				} else {
+					return this.value();
+				}
+			}
+		} else {
+			return this._values();
+		}
+	},
+
+	_setOption: function( key, value ) {
+		var i,
+			valsLength = 0;
+
+		if ( key === "range" && this.options.range === true ) {
+			if ( value === "min" ) {
+				this.options.value = this._values( 0 );
+				this.options.values = null;
+			} else if ( value === "max" ) {
+				this.options.value = this._values( this.options.values.length-1 );
+				this.options.values = null;
+			}
+		}
+
+		if ( $.isArray( this.options.values ) ) {
+			valsLength = this.options.values.length;
+		}
+
+		$.Widget.prototype._setOption.apply( this, arguments );
+
+		switch ( key ) {
+			case "orientation":
+				this._detectOrientation();
+				this.element
+					.removeClass( "ui-slider-horizontal ui-slider-vertical" )
+					.addClass( "ui-slider-" + this.orientation );
+				this._refreshValue();
+				break;
+			case "value":
+				this._animateOff = true;
+				this._refreshValue();
+				this._change( null, 0 );
+				this._animateOff = false;
+				break;
+			case "values":
+				this._animateOff = true;
+				this._refreshValue();
+				for ( i = 0; i < valsLength; i += 1 ) {
+					this._change( null, i );
+				}
+				this._animateOff = false;
+				break;
+			case "min":
+			case "max":
+				this._animateOff = true;
+				this._refreshValue();
+				this._animateOff = false;
+				break;
+			case "range":
+				this._animateOff = true;
+				this._refresh();
+				this._animateOff = false;
+				break;
+		}
+	},
+
+	//internal value getter
+	// _value() returns value trimmed by min and max, aligned by step
+	_value: function() {
+		var val = this.options.value;
+		val = this._trimAlignValue( val );
+
+		return val;
+	},
+
+	//internal values getter
+	// _values() returns array of values trimmed by min and max, aligned by step
+	// _values( index ) returns single value trimmed by min and max, aligned by step
+	_values: function( index ) {
+		var val,
+			vals,
+			i;
+
+		if ( arguments.length ) {
+			val = this.options.values[ index ];
+			val = this._trimAlignValue( val );
+
+			return val;
+		} else if ( this.options.values && this.options.values.length ) {
+			// .slice() creates a copy of the array
+			// this copy gets trimmed by min and max and then returned
+			vals = this.options.values.slice();
+			for ( i = 0; i < vals.length; i+= 1) {
+				vals[ i ] = this._trimAlignValue( vals[ i ] );
+			}
+
+			return vals;
+		} else {
+			return [];
+		}
+	},
+
+	// returns the step-aligned value that val is closest to, between (inclusive) min and max
+	_trimAlignValue: function( val ) {
+		if ( val <= this._valueMin() ) {
+			return this._valueMin();
+		}
+		if ( val >= this._valueMax() ) {
+			return this._valueMax();
+		}
+		var step = ( this.options.step > 0 ) ? this.options.step : 1,
+			valModStep = (val - this._valueMin()) % step,
+			alignValue = val - valModStep;
+
+		if ( Math.abs(valModStep) * 2 >= step ) {
+			alignValue += ( valModStep > 0 ) ? step : ( -step );
+		}
+
+		// Since JavaScript has problems with large floats, round
+		// the final value to 5 digits after the decimal point (see #4124)
+		return parseFloat( alignValue.toFixed(5) );
+	},
+
+	_valueMin: function() {
+		return this.options.min;
+	},
+
+	_valueMax: function() {
+		return this.options.max;
+	},
+
+	_refreshValue: function() {
+		var lastValPercent, valPercent, value, valueMin, valueMax,
+			oRange = this.options.range,
+			o = this.options,
+			that = this,
+			animate = ( !this._animateOff ) ? o.animate : false,
+			_set = {};
+
+		if ( this.options.values && this.options.values.length ) {
+			this.handles.each(function( i ) {
+				valPercent = ( that.values(i) - that._valueMin() ) / ( that._valueMax() - that._valueMin() ) * 100;
+				_set[ that.orientation === "horizontal" ? "left" : "bottom" ] = valPercent + "%";
+				$( this ).stop( 1, 1 )[ animate ? "animate" : "css" ]( _set, o.animate );
+				if ( that.options.range === true ) {
+					if ( that.orientation === "horizontal" ) {
+						if ( i === 0 ) {
+							that.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( { left: valPercent + "%" }, o.animate );
+						}
+						if ( i === 1 ) {
+							that.range[ animate ? "animate" : "css" ]( { width: ( valPercent - lastValPercent ) + "%" }, { queue: false, duration: o.animate } );
+						}
+					} else {
+						if ( i === 0 ) {
+							that.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( { bottom: ( valPercent ) + "%" }, o.animate );
+						}
+						if ( i === 1 ) {
+							that.range[ animate ? "animate" : "css" ]( { height: ( valPercent - lastValPercent ) + "%" }, { queue: false, duration: o.animate } );
+						}
+					}
+				}
+				lastValPercent = valPercent;
+			});
+		} else {
+			value = this.value();
+			valueMin = this._valueMin();
+			valueMax = this._valueMax();
+			valPercent = ( valueMax !== valueMin ) ?
+					( value - valueMin ) / ( valueMax - valueMin ) * 100 :
+					0;
+			_set[ this.orientation === "horizontal" ? "left" : "bottom" ] = valPercent + "%";
+			this.handle.stop( 1, 1 )[ animate ? "animate" : "css" ]( _set, o.animate );
+
+			if ( oRange === "min" && this.orientation === "horizontal" ) {
+				this.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( { width: valPercent + "%" }, o.animate );
+			}
+			if ( oRange === "max" && this.orientation === "horizontal" ) {
+				this.range[ animate ? "animate" : "css" ]( { width: ( 100 - valPercent ) + "%" }, { queue: false, duration: o.animate } );
+			}
+			if ( oRange === "min" && this.orientation === "vertical" ) {
+				this.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( { height: valPercent + "%" }, o.animate );
+			}
+			if ( oRange === "max" && this.orientation === "vertical" ) {
+				this.range[ animate ? "animate" : "css" ]( { height: ( 100 - valPercent ) + "%" }, { queue: false, duration: o.animate } );
+			}
+		}
+	},
+
+	_handleEvents: {
+		keydown: function( event ) {
+			/*jshint maxcomplexity:25*/
+			var allowed, curVal, newVal, step,
+				index = $( event.target ).data( "ui-slider-handle-index" );
+
+			switch ( event.keyCode ) {
+				case $.ui.keyCode.HOME:
+				case $.ui.keyCode.END:
+				case $.ui.keyCode.PAGE_UP:
+				case $.ui.keyCode.PAGE_DOWN:
+				case $.ui.keyCode.UP:
+				case $.ui.keyCode.RIGHT:
+				case $.ui.keyCode.DOWN:
+				case $.ui.keyCode.LEFT:
+					event.preventDefault();
+					if ( !this._keySliding ) {
+						this._keySliding = true;
+						$( event.target ).addClass( "ui-state-active" );
+						allowed = this._start( event, index );
+						if ( allowed === false ) {
+							return;
+						}
+					}
+					break;
+			}
+
+			step = this.options.step;
+			if ( this.options.values && this.options.values.length ) {
+				curVal = newVal = this.values( index );
+			} else {
+				curVal = newVal = this.value();
+			}
+
+			switch ( event.keyCode ) {
+				case $.ui.keyCode.HOME:
+					newVal = this._valueMin();
+					break;
+				case $.ui.keyCode.END:
+					newVal = this._valueMax();
+					break;
+				case $.ui.keyCode.PAGE_UP:
+					newVal = this._trimAlignValue( curVal + ( (this._valueMax() - this._valueMin()) / numPages ) );
+					break;
+				case $.ui.keyCode.PAGE_DOWN:
+					newVal = this._trimAlignValue( curVal - ( (this._valueMax() - this._valueMin()) / numPages ) );
+					break;
+				case $.ui.keyCode.UP:
+				case $.ui.keyCode.RIGHT:
+					if ( curVal === this._valueMax() ) {
+						return;
+					}
+					newVal = this._trimAlignValue( curVal + step );
+					break;
+				case $.ui.keyCode.DOWN:
+				case $.ui.keyCode.LEFT:
+					if ( curVal === this._valueMin() ) {
+						return;
+					}
+					newVal = this._trimAlignValue( curVal - step );
+					break;
+			}
+
+			this._slide( event, index, newVal );
+		},
+		click: function( event ) {
+			event.preventDefault();
+		},
+		keyup: function( event ) {
+			var index = $( event.target ).data( "ui-slider-handle-index" );
+
+			if ( this._keySliding ) {
+				this._keySliding = false;
+				this._stop( event, index );
+				this._change( event, index );
+				$( event.target ).removeClass( "ui-state-active" );
+			}
+		}
+	}
+
+});
+
+}(jQuery));
+
+(function( $ ) {
+
+function modifier( fn ) {
+	return function() {
+		var previous = this.element.val();
+		fn.apply( this, arguments );
+		this._refresh();
+		if ( previous !== this.element.val() ) {
+			this._trigger( "change" );
+		}
+	};
+}
+
+$.widget( "ui.spinner", {
+	version: "1.10.3",
+	defaultElement: "<input>",
+	widgetEventPrefix: "spin",
+	options: {
+		culture: null,
+		icons: {
+			down: "ui-icon-triangle-1-s",
+			up: "ui-icon-triangle-1-n"
+		},
+		incremental: true,
+		max: null,
+		min: null,
+		numberFormat: null,
+		page: 10,
+		step: 1,
+
+		change: null,
+		spin: null,
+		start: null,
+		stop: null
+	},
+
+	_create: function() {
+		// handle string values that need to be parsed
+		this._setOption( "max", this.options.max );
+		this._setOption( "min", this.options.min );
+		this._setOption( "step", this.options.step );
+
+		// format the value, but don't constrain
+		this._value( this.element.val(), true );
+
+		this._draw();
+		this._on( this._events );
+		this._refresh();
+
+		// turning off autocomplete prevents the browser from remembering the
+		// value when navigating through history, so we re-enable autocomplete
+		// if the page is unloaded before the widget is destroyed. #7790
+		this._on( this.window, {
+			beforeunload: function() {
+				this.element.removeAttr( "autocomplete" );
+			}
+		});
+	},
+
+	_getCreateOptions: function() {
+		var options = {},
+			element = this.element;
+
+		$.each( [ "min", "max", "step" ], function( i, option ) {
+			var value = element.attr( option );
+			if ( value !== undefined && value.length ) {
+				options[ option ] = value;
+			}
+		});
+
+		return options;
+	},
+
+	_events: {
+		keydown: function( event ) {
+			if ( this._start( event ) && this._keydown( event ) ) {
+				event.preventDefault();
+			}
+		},
+		keyup: "_stop",
+		focus: function() {
+			this.previous = this.element.val();
+		},
+		blur: function( event ) {
+			if ( this.cancelBlur ) {
+				delete this.cancelBlur;
+				return;
+			}
+
+			this._stop();
+			this._refresh();
+			if ( this.previous !== this.element.val() ) {
+				this._trigger( "change", event );
+			}
+		},
+		mousewheel: function( event, delta ) {
+			if ( !delta ) {
+				return;
+			}
+			if ( !this.spinning && !this._start( event ) ) {
+				return false;
+			}
+
+			this._spin( (delta > 0 ? 1 : -1) * this.options.step, event );
+			clearTimeout( this.mousewheelTimer );
+			this.mousewheelTimer = this._delay(function() {
+				if ( this.spinning ) {
+					this._stop( event );
+				}
+			}, 100 );
+			event.preventDefault();
+		},
+		"mousedown .ui-spinner-button": function( event ) {
+			var previous;
+
+			// We never want the buttons to have focus; whenever the user is
+			// interacting with the spinner, the focus should be on the input.
+			// If the input is focused then this.previous is properly set from
+			// when the input first received focus. If the input is not focused
+			// then we need to set this.previous based on the value before spinning.
+			previous = this.element[0] === this.document[0].activeElement ?
+				this.previous : this.element.val();
+			function checkFocus() {
+				var isActive = this.element[0] === this.document[0].activeElement;
+				if ( !isActive ) {
+					this.element.focus();
+					this.previous = previous;
+					// support: IE
+					// IE sets focus asynchronously, so we need to check if focus
+					// moved off of the input because the user clicked on the button.
+					this._delay(function() {
+						this.previous = previous;
+					});
+				}
+			}
+
+			// ensure focus is on (or stays on) the text field
+			event.preventDefault();
+			checkFocus.call( this );
+
+			// support: IE
+			// IE doesn't prevent moving focus even with event.preventDefault()
+			// so we set a flag to know when we should ignore the blur event
+			// and check (again) if focus moved off of the input.
+			this.cancelBlur = true;
+			this._delay(function() {
+				delete this.cancelBlur;
+				checkFocus.call( this );
+			});
+
+			if ( this._start( event ) === false ) {
+				return;
+			}
+
+			this._repeat( null, $( event.currentTarget ).hasClass( "ui-spinner-up" ) ? 1 : -1, event );
+		},
+		"mouseup .ui-spinner-button": "_stop",
+		"mouseenter .ui-spinner-button": function( event ) {
+			// button will add ui-state-active if mouse was down while mouseleave and kept down
+			if ( !$( event.currentTarget ).hasClass( "ui-state-active" ) ) {
+				return;
+			}
+
+			if ( this._start( event ) === false ) {
+				return false;
+			}
+			this._repeat( null, $( event.currentTarget ).hasClass( "ui-spinner-up" ) ? 1 : -1, event );
+		},
+		// TODO: do we really want to consider this a stop?
+		// shouldn't we just stop the repeater and wait until mouseup before
+		// we trigger the stop event?
+		"mouseleave .ui-spinner-button": "_stop"
+	},
+
+	_draw: function() {
+		var uiSpinner = this.uiSpinner = this.element
+			.addClass( "ui-spinner-input" )
+			.attr( "autocomplete", "off" )
+			.wrap( this._uiSpinnerHtml() )
+			.parent()
+				// add buttons
+				.append( this._buttonHtml() );
+
+		this.element.attr( "role", "spinbutton" );
+
+		// button bindings
+		this.buttons = uiSpinner.find( ".ui-spinner-button" )
+			.attr( "tabIndex", -1 )
+			.button()
+			.removeClass( "ui-corner-all" );
+
+		// IE 6 doesn't understand height: 50% for the buttons
+		// unless the wrapper has an explicit height
+		if ( this.buttons.height() > Math.ceil( uiSpinner.height() * 0.5 ) &&
+				uiSpinner.height() > 0 ) {
+			uiSpinner.height( uiSpinner.height() );
+		}
+
+		// disable spinner if element was already disabled
+		if ( this.options.disabled ) {
+			this.disable();
+		}
+	},
+
+	_keydown: function( event ) {
+		var options = this.options,
+			keyCode = $.ui.keyCode;
+
+		switch ( event.keyCode ) {
+		case keyCode.UP:
+			this._repeat( null, 1, event );
+			return true;
+		case keyCode.DOWN:
+			this._repeat( null, -1, event );
+			return true;
+		case keyCode.PAGE_UP:
+			this._repeat( null, options.page, event );
+			return true;
+		case keyCode.PAGE_DOWN:
+			this._repeat( null, -options.page, event );
+			return true;
+		}
+
+		return false;
+	},
+
+	_uiSpinnerHtml: function() {
+		return "<span class='ui-spinner ui-widget ui-widget-content ui-corner-all'></span>";
+	},
+
+	_buttonHtml: function() {
+		return "" +
+			"<a class='ui-spinner-button ui-spinner-up ui-corner-tr'>" +
+				"<span class='ui-icon " + this.options.icons.up + "'>&#9650;</span>" +
+			"</a>" +
+			"<a class='ui-spinner-button ui-spinner-down ui-corner-br'>" +
+				"<span class='ui-icon " + this.options.icons.down + "'>&#9660;</span>" +
+			"</a>";
+	},
+
+	_start: function( event ) {
+		if ( !this.spinning && this._trigger( "start", event ) === false ) {
+			return false;
+		}
+
+		if ( !this.counter ) {
+			this.counter = 1;
+		}
+		this.spinning = true;
+		return true;
+	},
+
+	_repeat: function( i, steps, event ) {
+		i = i || 500;
+
+		clearTimeout( this.timer );
+		this.timer = this._delay(function() {
+			this._repeat( 40, steps, event );
+		}, i );
+
+		this._spin( steps * this.options.step, event );
+	},
+
+	_spin: function( step, event ) {
+		var value = this.value() || 0;
+
+		if ( !this.counter ) {
+			this.counter = 1;
+		}
+
+		value = this._adjustValue( value + step * this._increment( this.counter ) );
+
+		if ( !this.spinning || this._trigger( "spin", event, { value: value } ) !== false) {
+			this._value( value );
+			this.counter++;
+		}
+	},
+
+	_increment: function( i ) {
+		var incremental = this.options.incremental;
+
+		if ( incremental ) {
+			return $.isFunction( incremental ) ?
+				incremental( i ) :
+				Math.floor( i*i*i/50000 - i*i/500 + 17*i/200 + 1 );
+		}
+
+		return 1;
+	},
+
+	_precision: function() {
+		var precision = this._precisionOf( this.options.step );
+		if ( this.options.min !== null ) {
+			precision = Math.max( precision, this._precisionOf( this.options.min ) );
+		}
+		return precision;
+	},
+
+	_precisionOf: function( num ) {
+		var str = num.toString(),
+			decimal = str.indexOf( "." );
+		return decimal === -1 ? 0 : str.length - decimal - 1;
+	},
+
+	_adjustValue: function( value ) {
+		var base, aboveMin,
+			options = this.options;
+
+		// make sure we're at a valid step
+		// - find out where we are relative to the base (min or 0)
+		base = options.min !== null ? options.min : 0;
+		aboveMin = value - base;
+		// - round to the nearest step
+		aboveMin = Math.round(aboveMin / options.step) * options.step;
+		// - rounding is based on 0, so adjust back to our base
+		value = base + aboveMin;
+
+		// fix precision from bad JS floating point math
+		value = parseFloat( value.toFixed( this._precision() ) );
+
+		// clamp the value
+		if ( options.max !== null && value > options.max) {
+			return options.max;
+		}
+		if ( options.min !== null && value < options.min ) {
+			return options.min;
+		}
+
+		return value;
+	},
+
+	_stop: function( event ) {
+		if ( !this.spinning ) {
+			return;
+		}
+
+		clearTimeout( this.timer );
+		clearTimeout( this.mousewheelTimer );
+		this.counter = 0;
+		this.spinning = false;
+		this._trigger( "stop", event );
+	},
+
+	_setOption: function( key, value ) {
+		if ( key === "culture" || key === "numberFormat" ) {
+			var prevValue = this._parse( this.element.val() );
+			this.options[ key ] = value;
+			this.element.val( this._format( prevValue ) );
+			return;
+		}
+
+		if ( key === "max" || key === "min" || key === "step" ) {
+			if ( typeof value === "string" ) {
+				value = this._parse( value );
+			}
+		}
+		if ( key === "icons" ) {
+			this.buttons.first().find( ".ui-icon" )
+				.removeClass( this.options.icons.up )
+				.addClass( value.up );
+			this.buttons.last().find( ".ui-icon" )
+				.removeClass( this.options.icons.down )
+				.addClass( value.down );
+		}
+
+		this._super( key, value );
+
+		if ( key === "disabled" ) {
+			if ( value ) {
+				this.element.prop( "disabled", true );
+				this.buttons.button( "disable" );
+			} else {
+				this.element.prop( "disabled", false );
+				this.buttons.button( "enable" );
+			}
+		}
+	},
+
+	_setOptions: modifier(function( options ) {
+		this._super( options );
+		this._value( this.element.val() );
+	}),
+
+	_parse: function( val ) {
+		if ( typeof val === "string" && val !== "" ) {
+			val = window.Globalize && this.options.numberFormat ?
+				Globalize.parseFloat( val, 10, this.options.culture ) : +val;
+		}
+		return val === "" || isNaN( val ) ? null : val;
+	},
+
+	_format: function( value ) {
+		if ( value === "" ) {
+			return "";
+		}
+		return window.Globalize && this.options.numberFormat ?
+			Globalize.format( value, this.options.numberFormat, this.options.culture ) :
+			value;
+	},
+
+	_refresh: function() {
+		this.element.attr({
+			"aria-valuemin": this.options.min,
+			"aria-valuemax": this.options.max,
+			// TODO: what should we do with values that can't be parsed?
+			"aria-valuenow": this._parse( this.element.val() )
+		});
+	},
+
+	// update the value without triggering change
+	_value: function( value, allowAny ) {
+		var parsed;
+		if ( value !== "" ) {
+			parsed = this._parse( value );
+			if ( parsed !== null ) {
+				if ( !allowAny ) {
+					parsed = this._adjustValue( parsed );
+				}
+				value = this._format( parsed );
+			}
+		}
+		this.element.val( value );
+		this._refresh();
+	},
+
+	_destroy: function() {
+		this.element
+			.removeClass( "ui-spinner-input" )
+			.prop( "disabled", false )
+			.removeAttr( "autocomplete" )
+			.removeAttr( "role" )
+			.removeAttr( "aria-valuemin" )
+			.removeAttr( "aria-valuemax" )
+			.removeAttr( "aria-valuenow" );
+		this.uiSpinner.replaceWith( this.element );
+	},
+
+	stepUp: modifier(function( steps ) {
+		this._stepUp( steps );
+	}),
+	_stepUp: function( steps ) {
+		if ( this._start() ) {
+			this._spin( (steps || 1) * this.options.step );
+			this._stop();
+		}
+	},
+
+	stepDown: modifier(function( steps ) {
+		this._stepDown( steps );
+	}),
+	_stepDown: function( steps ) {
+		if ( this._start() ) {
+			this._spin( (steps || 1) * -this.options.step );
+			this._stop();
+		}
+	},
+
+	pageUp: modifier(function( pages ) {
+		this._stepUp( (pages || 1) * this.options.page );
+	}),
+
+	pageDown: modifier(function( pages ) {
+		this._stepDown( (pages || 1) * this.options.page );
+	}),
+
+	value: function( newVal ) {
+		if ( !arguments.length ) {
+			return this._parse( this.element.val() );
+		}
+		modifier( this._value ).call( this, newVal );
+	},
+
+	widget: function() {
+		return this.uiSpinner;
+	}
+});
+
+}( jQuery ) );
+
+(function( $, undefined ) {
+
+var tabId = 0,
+	rhash = /#.*$/;
+
+function getNextTabId() {
+	return ++tabId;
+}
+
+function isLocal( anchor ) {
+	return anchor.hash.length > 1 &&
+		decodeURIComponent( anchor.href.replace( rhash, "" ) ) ===
+			decodeURIComponent( location.href.replace( rhash, "" ) );
+}
+
+$.widget( "ui.tabs", {
+	version: "1.10.3",
+	delay: 300,
+	options: {
+		active: null,
+		collapsible: false,
+		event: "click",
+		heightStyle: "content",
+		hide: null,
+		show: null,
+
+		// callbacks
+		activate: null,
+		beforeActivate: null,
+		beforeLoad: null,
+		load: null
+	},
+
+	_create: function() {
+		var that = this,
+			options = this.options;
+
+		this.running = false;
+
+		this.element
+			.addClass( "ui-tabs ui-widget ui-widget-content ui-corner-all" )
+			.toggleClass( "ui-tabs-collapsible", options.collapsible )
+			// Prevent users from focusing disabled tabs via click
+			.delegate( ".ui-tabs-nav > li", "mousedown" + this.eventNamespace, function( event ) {
+				if ( $( this ).is( ".ui-state-disabled" ) ) {
+					event.preventDefault();
+				}
+			})
+			// support: IE <9
+			// Preventing the default action in mousedown doesn't prevent IE
+			// from focusing the element, so if the anchor gets focused, blur.
+			// We don't have to worry about focusing the previously focused
+			// element since clicking on a non-focusable element should focus
+			// the body anyway.
+			.delegate( ".ui-tabs-anchor", "focus" + this.eventNamespace, function() {
+				if ( $( this ).closest( "li" ).is( ".ui-state-disabled" ) ) {
+					this.blur();
+				}
+			});
+
+		this._processTabs();
+		options.active = this._initialActive();
+
+		// Take disabling tabs via class attribute from HTML
+		// into account and update option properly.
+		if ( $.isArray( options.disabled ) ) {
+			options.disabled = $.unique( options.disabled.concat(
+				$.map( this.tabs.filter( ".ui-state-disabled" ), function( li ) {
+					return that.tabs.index( li );
+				})
+			) ).sort();
+		}
+
+		// check for length avoids error when initializing empty list
+		if ( this.options.active !== false && this.anchors.length ) {
+			this.active = this._findActive( options.active );
+		} else {
+			this.active = $();
+		}
+
+		this._refresh();
+
+		if ( this.active.length ) {
+			this.load( options.active );
+		}
+	},
+
+	_initialActive: function() {
+		var active = this.options.active,
+			collapsible = this.options.collapsible,
+			locationHash = location.hash.substring( 1 );
+
+		if ( active === null ) {
+			// check the fragment identifier in the URL
+			if ( locationHash ) {
+				this.tabs.each(function( i, tab ) {
+					if ( $( tab ).attr( "aria-controls" ) === locationHash ) {
+						active = i;
+						return false;
+					}
+				});
+			}
+
+			// check for a tab marked active via a class
+			if ( active === null ) {
+				active = this.tabs.index( this.tabs.filter( ".ui-tabs-active" ) );
+			}
+
+			// no active tab, set to false
+			if ( active === null || active === -1 ) {
+				active = this.tabs.length ? 0 : false;
+			}
+		}
+
+		// handle numbers: negative, out of range
+		if ( active !== false ) {
+			active = this.tabs.index( this.tabs.eq( active ) );
+			if ( active === -1 ) {
+				active = collapsible ? false : 0;
+			}
+		}
+
+		// don't allow collapsible: false and active: false
+		if ( !collapsible && active === false && this.anchors.length ) {
+			active = 0;
+		}
+
+		return active;
+	},
+
+	_getCreateEventData: function() {
+		return {
+			tab: this.active,
+			panel: !this.active.length ? $() : this._getPanelForTab( this.active )
+		};
+	},
+
+	_tabKeydown: function( event ) {
+		/*jshint maxcomplexity:15*/
+		var focusedTab = $( this.document[0].activeElement ).closest( "li" ),
+			selectedIndex = this.tabs.index( focusedTab ),
+			goingForward = true;
+
+		if ( this._handlePageNav( event ) ) {
+			return;
+		}
+
+		switch ( event.keyCode ) {
+			case $.ui.keyCode.RIGHT:
+			case $.ui.keyCode.DOWN:
+				selectedIndex++;
+				break;
+			case $.ui.keyCode.UP:
+			case $.ui.keyCode.LEFT:
+				goingForward = false;
+				selectedIndex--;
+				break;
+			case $.ui.keyCode.END:
+				selectedIndex = this.anchors.length - 1;
+				break;
+			case $.ui.keyCode.HOME:
+				selectedIndex = 0;
+				break;
+			case $.ui.keyCode.SPACE:
+				// Activate only, no collapsing
+				event.preventDefault();
+				clearTimeout( this.activating );
+				this._activate( selectedIndex );
+				return;
+			case $.ui.keyCode.ENTER:
+				// Toggle (cancel delayed activation, allow collapsing)
+				event.preventDefault();
+				clearTimeout( this.activating );
+				// Determine if we should collapse or activate
+				this._activate( selectedIndex === this.options.active ? false : selectedIndex );
+				return;
+			default:
+				return;
+		}
+
+		// Focus the appropriate tab, based on which key was pressed
+		event.preventDefault();
+		clearTimeout( this.activating );
+		selectedIndex = this._focusNextTab( selectedIndex, goingForward );
+
+		// Navigating with control key will prevent automatic activation
+		if ( !event.ctrlKey ) {
+			// Update aria-selected immediately so that AT think the tab is already selected.
+			// Otherwise AT may confuse the user by stating that they need to activate the tab,
+			// but the tab will already be activated by the time the announcement finishes.
+			focusedTab.attr( "aria-selected", "false" );
+			this.tabs.eq( selectedIndex ).attr( "aria-selected", "true" );
+
+			this.activating = this._delay(function() {
+				this.option( "active", selectedIndex );
+			}, this.delay );
+		}
+	},
+
+	_panelKeydown: function( event ) {
+		if ( this._handlePageNav( event ) ) {
+			return;
+		}
+
+		// Ctrl+up moves focus to the current tab
+		if ( event.ctrlKey && event.keyCode === $.ui.keyCode.UP ) {
+			event.preventDefault();
+			this.active.focus();
+		}
+	},
+
+	// Alt+page up/down moves focus to the previous/next tab (and activates)
+	_handlePageNav: function( event ) {
+		if ( event.altKey && event.keyCode === $.ui.keyCode.PAGE_UP ) {
+			this._activate( this._focusNextTab( this.options.active - 1, false ) );
+			return true;
+		}
+		if ( event.altKey && event.keyCode === $.ui.keyCode.PAGE_DOWN ) {
+			this._activate( this._focusNextTab( this.options.active + 1, true ) );
+			return true;
+		}
+	},
+
+	_findNextTab: function( index, goingForward ) {
+		var lastTabIndex = this.tabs.length - 1;
+
+		function constrain() {
+			if ( index > lastTabIndex ) {
+				index = 0;
+			}
+			if ( index < 0 ) {
+				index = lastTabIndex;
+			}
+			return index;
+		}
+
+		while ( $.inArray( constrain(), this.options.disabled ) !== -1 ) {
+			index = goingForward ? index + 1 : index - 1;
+		}
+
+		return index;
+	},
+
+	_focusNextTab: function( index, goingForward ) {
+		index = this._findNextTab( index, goingForward );
+		this.tabs.eq( index ).focus();
+		return index;
+	},
+
+	_setOption: function( key, value ) {
+		if ( key === "active" ) {
+			// _activate() will handle invalid values and update this.options
+			this._activate( value );
+			return;
+		}
+
+		if ( key === "disabled" ) {
+			// don't use the widget factory's disabled handling
+			this._setupDisabled( value );
+			return;
+		}
+
+		this._super( key, value);
+
+		if ( key === "collapsible" ) {
+			this.element.toggleClass( "ui-tabs-collapsible", value );
+			// Setting collapsible: false while collapsed; open first panel
+			if ( !value && this.options.active === false ) {
+				this._activate( 0 );
+			}
+		}
+
+		if ( key === "event" ) {
+			this._setupEvents( value );
+		}
+
+		if ( key === "heightStyle" ) {
+			this._setupHeightStyle( value );
+		}
+	},
+
+	_tabId: function( tab ) {
+		return tab.attr( "aria-controls" ) || "ui-tabs-" + getNextTabId();
+	},
+
+	_sanitizeSelector: function( hash ) {
+		return hash ? hash.replace( /[!"$%&'()*+,.\/:;<=>?@\[\]\^`{|}~]/g, "\\$&" ) : "";
+	},
+
+	refresh: function() {
+		var options = this.options,
+			lis = this.tablist.children( ":has(a[href])" );
+
+		// get disabled tabs from class attribute from HTML
+		// this will get converted to a boolean if needed in _refresh()
+		options.disabled = $.map( lis.filter( ".ui-state-disabled" ), function( tab ) {
+			return lis.index( tab );
+		});
+
+		this._processTabs();
+
+		// was collapsed or no tabs
+		if ( options.active === false || !this.anchors.length ) {
+			options.active = false;
+			this.active = $();
+		// was active, but active tab is gone
+		} else if ( this.active.length && !$.contains( this.tablist[ 0 ], this.active[ 0 ] ) ) {
+			// all remaining tabs are disabled
+			if ( this.tabs.length === options.disabled.length ) {
+				options.active = false;
+				this.active = $();
+			// activate previous tab
+			} else {
+				this._activate( this._findNextTab( Math.max( 0, options.active - 1 ), false ) );
+			}
+		// was active, active tab still exists
+		} else {
+			// make sure active index is correct
+			options.active = this.tabs.index( this.active );
+		}
+
+		this._refresh();
+	},
+
+	_refresh: function() {
+		this._setupDisabled( this.options.disabled );
+		this._setupEvents( this.options.event );
+		this._setupHeightStyle( this.options.heightStyle );
+
+		this.tabs.not( this.active ).attr({
+			"aria-selected": "false",
+			tabIndex: -1
+		});
+		this.panels.not( this._getPanelForTab( this.active ) )
+			.hide()
+			.attr({
+				"aria-expanded": "false",
+				"aria-hidden": "true"
+			});
+
+		// Make sure one tab is in the tab order
+		if ( !this.active.length ) {
+			this.tabs.eq( 0 ).attr( "tabIndex", 0 );
+		} else {
+			this.active
+				.addClass( "ui-tabs-active ui-state-active" )
+				.attr({
+					"aria-selected": "true",
+					tabIndex: 0
+				});
+			this._getPanelForTab( this.active )
+				.show()
+				.attr({
+					"aria-expanded": "true",
+					"aria-hidden": "false"
+				});
+		}
+	},
+
+	_processTabs: function() {
+		var that = this;
+
+		this.tablist = this._getList()
+			.addClass( "ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all" )
+			.attr( "role", "tablist" );
+
+		this.tabs = this.tablist.find( "> li:has(a[href])" )
+			.addClass( "ui-state-default ui-corner-top" )
+			.attr({
+				role: "tab",
+				tabIndex: -1
+			});
+
+		this.anchors = this.tabs.map(function() {
+				return $( "a", this )[ 0 ];
+			})
+			.addClass( "ui-tabs-anchor" )
+			.attr({
+				role: "presentation",
+				tabIndex: -1
+			});
+
+		this.panels = $();
+
+		this.anchors.each(function( i, anchor ) {
+			var selector, panel, panelId,
+				anchorId = $( anchor ).uniqueId().attr( "id" ),
+				tab = $( anchor ).closest( "li" ),
+				originalAriaControls = tab.attr( "aria-controls" );
+
+			// inline tab
+			if ( isLocal( anchor ) ) {
+				selector = anchor.hash;
+				panel = that.element.find( that._sanitizeSelector( selector ) );
+			// remote tab
+			} else {
+				panelId = that._tabId( tab );
+				selector = "#" + panelId;
+				panel = that.element.find( selector );
+				if ( !panel.length ) {
+					panel = that._createPanel( panelId );
+					panel.insertAfter( that.panels[ i - 1 ] || that.tablist );
+				}
+				panel.attr( "aria-live", "polite" );
+			}
+
+			if ( panel.length) {
+				that.panels = that.panels.add( panel );
+			}
+			if ( originalAriaControls ) {
+				tab.data( "ui-tabs-aria-controls", originalAriaControls );
+			}
+			tab.attr({
+				"aria-controls": selector.substring( 1 ),
+				"aria-labelledby": anchorId
+			});
+			panel.attr( "aria-labelledby", anchorId );
+		});
+
+		this.panels
+			.addClass( "ui-tabs-panel ui-widget-content ui-corner-bottom" )
+			.attr( "role", "tabpanel" );
+	},
+
+	// allow overriding how to find the list for rare usage scenarios (#7715)
+	_getList: function() {
+		return this.element.find( "ol,ul" ).eq( 0 );
+	},
+
+	_createPanel: function( id ) {
+		return $( "<div>" )
+			.attr( "id", id )
+			.addClass( "ui-tabs-panel ui-widget-content ui-corner-bottom" )
+			.data( "ui-tabs-destroy", true );
+	},
+
+	_setupDisabled: function( disabled ) {
+		if ( $.isArray( disabled ) ) {
+			if ( !disabled.length ) {
+				disabled = false;
+			} else if ( disabled.length === this.anchors.length ) {
+				disabled = true;
+			}
+		}
+
+		// disable tabs
+		for ( var i = 0, li; ( li = this.tabs[ i ] ); i++ ) {
+			if ( disabled === true || $.inArray( i, disabled ) !== -1 ) {
+				$( li )
+					.addClass( "ui-state-disabled" )
+					.attr( "aria-disabled", "true" );
+			} else {
+				$( li )
+					.removeClass( "ui-state-disabled" )
+					.removeAttr( "aria-disabled" );
+			}
+		}
+
+		this.options.disabled = disabled;
+	},
+
+	_setupEvents: function( event ) {
+		var events = {
+			click: function( event ) {
+				event.preventDefault();
+			}
+		};
+		if ( event ) {
+			$.each( event.split(" "), function( index, eventName ) {
+				events[ eventName ] = "_eventHandler";
+			});
+		}
+
+		this._off( this.anchors.add( this.tabs ).add( this.panels ) );
+		this._on( this.anchors, events );
+		this._on( this.tabs, { keydown: "_tabKeydown" } );
+		this._on( this.panels, { keydown: "_panelKeydown" } );
+
+		this._focusable( this.tabs );
+		this._hoverable( this.tabs );
+	},
+
+	_setupHeightStyle: function( heightStyle ) {
+		var maxHeight,
+			parent = this.element.parent();
+
+		if ( heightStyle === "fill" ) {
+			maxHeight = parent.height();
+			maxHeight -= this.element.outerHeight() - this.element.height();
+
+			this.element.siblings( ":visible" ).each(function() {
+				var elem = $( this ),
+					position = elem.css( "position" );
+
+				if ( position === "absolute" || position === "fixed" ) {
+					return;
+				}
+				maxHeight -= elem.outerHeight( true );
+			});
+
+			this.element.children().not( this.panels ).each(function() {
+				maxHeight -= $( this ).outerHeight( true );
+			});
+
+			this.panels.each(function() {
+				$( this ).height( Math.max( 0, maxHeight -
+					$( this ).innerHeight() + $( this ).height() ) );
+			})
+			.css( "overflow", "auto" );
+		} else if ( heightStyle === "auto" ) {
+			maxHeight = 0;
+			this.panels.each(function() {
+				maxHeight = Math.max( maxHeight, $( this ).height( "" ).height() );
+			}).height( maxHeight );
+		}
+	},
+
+	_eventHandler: function( event ) {
+		var options = this.options,
+			active = this.active,
+			anchor = $( event.currentTarget ),
+			tab = anchor.closest( "li" ),
+			clickedIsActive = tab[ 0 ] === active[ 0 ],
+			collapsing = clickedIsActive && options.collapsible,
+			toShow = collapsing ? $() : this._getPanelForTab( tab ),
+			toHide = !active.length ? $() : this._getPanelForTab( active ),
+			eventData = {
+				oldTab: active,
+				oldPanel: toHide,
+				newTab: collapsing ? $() : tab,
+				newPanel: toShow
+			};
+
+		event.preventDefault();
+
+		if ( tab.hasClass( "ui-state-disabled" ) ||
+				// tab is already loading
+				tab.hasClass( "ui-tabs-loading" ) ||
+				// can't switch durning an animation
+				this.running ||
+				// click on active header, but not collapsible
+				( clickedIsActive && !options.collapsible ) ||
+				// allow canceling activation
+				( this._trigger( "beforeActivate", event, eventData ) === false ) ) {
+			return;
+		}
+
+		options.active = collapsing ? false : this.tabs.index( tab );
+
+		this.active = clickedIsActive ? $() : tab;
+		if ( this.xhr ) {
+			this.xhr.abort();
+		}
+
+		if ( !toHide.length && !toShow.length ) {
+			$.error( "jQuery UI Tabs: Mismatching fragment identifier." );
+		}
+
+		if ( toShow.length ) {
+			this.load( this.tabs.index( tab ), event );
+		}
+		this._toggle( event, eventData );
+	},
+
+	// handles show/hide for selecting tabs
+	_toggle: function( event, eventData ) {
+		var that = this,
+			toShow = eventData.newPanel,
+			toHide = eventData.oldPanel;
+
+		this.running = true;
+
+		function complete() {
+			that.running = false;
+			that._trigger( "activate", event, eventData );
+		}
+
+		function show() {
+			eventData.newTab.closest( "li" ).addClass( "ui-tabs-active ui-state-active" );
+
+			if ( toShow.length && that.options.show ) {
+				that._show( toShow, that.options.show, complete );
+			} else {
+				toShow.show();
+				complete();
+			}
+		}
+
+		// start out by hiding, then showing, then completing
+		if ( toHide.length && this.options.hide ) {
+			this._hide( toHide, this.options.hide, function() {
+				eventData.oldTab.closest( "li" ).removeClass( "ui-tabs-active ui-state-active" );
+				show();
+			});
+		} else {
+			eventData.oldTab.closest( "li" ).removeClass( "ui-tabs-active ui-state-active" );
+			toHide.hide();
+			show();
+		}
+
+		toHide.attr({
+			"aria-expanded": "false",
+			"aria-hidden": "true"
+		});
+		eventData.oldTab.attr( "aria-selected", "false" );
+		// If we're switching tabs, remove the old tab from the tab order.
+		// If we're opening from collapsed state, remove the previous tab from the tab order.
+		// If we're collapsing, then keep the collapsing tab in the tab order.
+		if ( toShow.length && toHide.length ) {
+			eventData.oldTab.attr( "tabIndex", -1 );
+		} else if ( toShow.length ) {
+			this.tabs.filter(function() {
+				return $( this ).attr( "tabIndex" ) === 0;
+			})
+			.attr( "tabIndex", -1 );
+		}
+
+		toShow.attr({
+			"aria-expanded": "true",
+			"aria-hidden": "false"
+		});
+		eventData.newTab.attr({
+			"aria-selected": "true",
+			tabIndex: 0
+		});
+	},
+
+	_activate: function( index ) {
+		var anchor,
+			active = this._findActive( index );
+
+		// trying to activate the already active panel
+		if ( active[ 0 ] === this.active[ 0 ] ) {
+			return;
+		}
+
+		// trying to collapse, simulate a click on the current active header
+		if ( !active.length ) {
+			active = this.active;
+		}
+
+		anchor = active.find( ".ui-tabs-anchor" )[ 0 ];
+		this._eventHandler({
+			target: anchor,
+			currentTarget: anchor,
+			preventDefault: $.noop
+		});
+	},
+
+	_findActive: function( index ) {
+		return index === false ? $() : this.tabs.eq( index );
+	},
+
+	_getIndex: function( index ) {
+		// meta-function to give users option to provide a href string instead of a numerical index.
+		if ( typeof index === "string" ) {
+			index = this.anchors.index( this.anchors.filter( "[href$='" + index + "']" ) );
+		}
+
+		return index;
+	},
+
+	_destroy: function() {
+		if ( this.xhr ) {
+			this.xhr.abort();
+		}
+
+		this.element.removeClass( "ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible" );
+
+		this.tablist
+			.removeClass( "ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all" )
+			.removeAttr( "role" );
+
+		this.anchors
+			.removeClass( "ui-tabs-anchor" )
+			.removeAttr( "role" )
+			.removeAttr( "tabIndex" )
+			.removeUniqueId();
+
+		this.tabs.add( this.panels ).each(function() {
+			if ( $.data( this, "ui-tabs-destroy" ) ) {
+				$( this ).remove();
+			} else {
+				$( this )
+					.removeClass( "ui-state-default ui-state-active ui-state-disabled " +
+						"ui-corner-top ui-corner-bottom ui-widget-content ui-tabs-active ui-tabs-panel" )
+					.removeAttr( "tabIndex" )
+					.removeAttr( "aria-live" )
+					.removeAttr( "aria-busy" )
+					.removeAttr( "aria-selected" )
+					.removeAttr( "aria-labelledby" )
+					.removeAttr( "aria-hidden" )
+					.removeAttr( "aria-expanded" )
+					.removeAttr( "role" );
+			}
+		});
+
+		this.tabs.each(function() {
+			var li = $( this ),
+				prev = li.data( "ui-tabs-aria-controls" );
+			if ( prev ) {
+				li
+					.attr( "aria-controls", prev )
+					.removeData( "ui-tabs-aria-controls" );
+			} else {
+				li.removeAttr( "aria-controls" );
+			}
+		});
+
+		this.panels.show();
+
+		if ( this.options.heightStyle !== "content" ) {
+			this.panels.css( "height", "" );
+		}
+	},
+
+	enable: function( index ) {
+		var disabled = this.options.disabled;
+		if ( disabled === false ) {
+			return;
+		}
+
+		if ( index === undefined ) {
+			disabled = false;
+		} else {
+			index = this._getIndex( index );
+			if ( $.isArray( disabled ) ) {
+				disabled = $.map( disabled, function( num ) {
+					return num !== index ? num : null;
+				});
+			} else {
+				disabled = $.map( this.tabs, function( li, num ) {
+					return num !== index ? num : null;
+				});
+			}
+		}
+		this._setupDisabled( disabled );
+	},
+
+	disable: function( index ) {
+		var disabled = this.options.disabled;
+		if ( disabled === true ) {
+			return;
+		}
+
+		if ( index === undefined ) {
+			disabled = true;
+		} else {
+			index = this._getIndex( index );
+			if ( $.inArray( index, disabled ) !== -1 ) {
+				return;
+			}
+			if ( $.isArray( disabled ) ) {
+				disabled = $.merge( [ index ], disabled ).sort();
+			} else {
+				disabled = [ index ];
+			}
+		}
+		this._setupDisabled( disabled );
+	},
+
+	load: function( index, event ) {
+		index = this._getIndex( index );
+		var that = this,
+			tab = this.tabs.eq( index ),
+			anchor = tab.find( ".ui-tabs-anchor" ),
+			panel = this._getPanelForTab( tab ),
+			eventData = {
+				tab: tab,
+				panel: panel
+			};
+
+		// not remote
+		if ( isLocal( anchor[ 0 ] ) ) {
+			return;
+		}
+
+		this.xhr = $.ajax( this._ajaxSettings( anchor, event, eventData ) );
+
+		// support: jQuery <1.8
+		// jQuery <1.8 returns false if the request is canceled in beforeSend,
+		// but as of 1.8, $.ajax() always returns a jqXHR object.
+		if ( this.xhr && this.xhr.statusText !== "canceled" ) {
+			tab.addClass( "ui-tabs-loading" );
+			panel.attr( "aria-busy", "true" );
+
+			this.xhr
+				.success(function( response ) {
+					// support: jQuery <1.8
+					// http://bugs.jquery.com/ticket/11778
+					setTimeout(function() {
+						panel.html( response );
+						that._trigger( "load", event, eventData );
+					}, 1 );
+				})
+				.complete(function( jqXHR, status ) {
+					// support: jQuery <1.8
+					// http://bugs.jquery.com/ticket/11778
+					setTimeout(function() {
+						if ( status === "abort" ) {
+							that.panels.stop( false, true );
+						}
+
+						tab.removeClass( "ui-tabs-loading" );
+						panel.removeAttr( "aria-busy" );
+
+						if ( jqXHR === that.xhr ) {
+							delete that.xhr;
+						}
+					}, 1 );
+				});
+		}
+	},
+
+	_ajaxSettings: function( anchor, event, eventData ) {
+		var that = this;
+		return {
+			url: anchor.attr( "href" ),
+			beforeSend: function( jqXHR, settings ) {
+				return that._trigger( "beforeLoad", event,
+					$.extend( { jqXHR : jqXHR, ajaxSettings: settings }, eventData ) );
+			}
+		};
+	},
+
+	_getPanelForTab: function( tab ) {
+		var id = $( tab ).attr( "aria-controls" );
+		return this.element.find( this._sanitizeSelector( "#" + id ) );
+	}
+});
+
+})( jQuery );
+
+(function( $ ) {
+
+var increments = 0;
+
+function addDescribedBy( elem, id ) {
+	var describedby = (elem.attr( "aria-describedby" ) || "").split( /\s+/ );
+	describedby.push( id );
+	elem
+		.data( "ui-tooltip-id", id )
+		.attr( "aria-describedby", $.trim( describedby.join( " " ) ) );
+}
+
+function removeDescribedBy( elem ) {
+	var id = elem.data( "ui-tooltip-id" ),
+		describedby = (elem.attr( "aria-describedby" ) || "").split( /\s+/ ),
+		index = $.inArray( id, describedby );
+	if ( index !== -1 ) {
+		describedby.splice( index, 1 );
+	}
+
+	elem.removeData( "ui-tooltip-id" );
+	describedby = $.trim( describedby.join( " " ) );
+	if ( describedby ) {
+		elem.attr( "aria-describedby", describedby );
+	} else {
+		elem.removeAttr( "aria-describedby" );
+	}
+}
+
+$.widget( "ui.tooltip", {
+	version: "1.10.3",
+	options: {
+		content: function() {
+			// support: IE<9, Opera in jQuery <1.7
+			// .text() can't accept undefined, so coerce to a string
+			var title = $( this ).attr( "title" ) || "";
+			// Escape title, since we're going from an attribute to raw HTML
+			return $( "<a>" ).text( title ).html();
+		},
+		hide: true,
+		// Disabled elements have inconsistent behavior across browsers (#8661)
+		items: "[title]:not([disabled])",
+		position: {
+			my: "left top+15",
+			at: "left bottom",
+			collision: "flipfit flip"
+		},
+		show: true,
+		tooltipClass: null,
+		track: false,
+
+		// callbacks
+		close: null,
+		open: null
+	},
+
+	_create: function() {
+		this._on({
+			mouseover: "open",
+			focusin: "open"
+		});
+
+		// IDs of generated tooltips, needed for destroy
+		this.tooltips = {};
+		// IDs of parent tooltips where we removed the title attribute
+		this.parents = {};
+
+		if ( this.options.disabled ) {
+			this._disable();
+		}
+	},
+
+	_setOption: function( key, value ) {
+		var that = this;
+
+		if ( key === "disabled" ) {
+			this[ value ? "_disable" : "_enable" ]();
+			this.options[ key ] = value;
+			// disable element style changes
+			return;
+		}
+
+		this._super( key, value );
+
+		if ( key === "content" ) {
+			$.each( this.tooltips, function( id, element ) {
+				that._updateContent( element );
+			});
+		}
+	},
+
+	_disable: function() {
+		var that = this;
+
+		// close open tooltips
+		$.each( this.tooltips, function( id, element ) {
+			var event = $.Event( "blur" );
+			event.target = event.currentTarget = element[0];
+			that.close( event, true );
+		});
+
+		// remove title attributes to prevent native tooltips
+		this.element.find( this.options.items ).addBack().each(function() {
+			var element = $( this );
+			if ( element.is( "[title]" ) ) {
+				element
+					.data( "ui-tooltip-title", element.attr( "title" ) )
+					.attr( "title", "" );
+			}
+		});
+	},
+
+	_enable: function() {
+		// restore title attributes
+		this.element.find( this.options.items ).addBack().each(function() {
+			var element = $( this );
+			if ( element.data( "ui-tooltip-title" ) ) {
+				element.attr( "title", element.data( "ui-tooltip-title" ) );
+			}
+		});
+	},
+
+	open: function( event ) {
+		var that = this,
+			target = $( event ? event.target : this.element )
+				// we need closest here due to mouseover bubbling,
+				// but always pointing at the same event target
+				.closest( this.options.items );
+
+		// No element to show a tooltip for or the tooltip is already open
+		if ( !target.length || target.data( "ui-tooltip-id" ) ) {
+			return;
+		}
+
+		if ( target.attr( "title" ) ) {
+			target.data( "ui-tooltip-title", target.attr( "title" ) );
+		}
+
+		target.data( "ui-tooltip-open", true );
+
+		// kill parent tooltips, custom or native, for hover
+		if ( event && event.type === "mouseover" ) {
+			target.parents().each(function() {
+				var parent = $( this ),
+					blurEvent;
+				if ( parent.data( "ui-tooltip-open" ) ) {
+					blurEvent = $.Event( "blur" );
+					blurEvent.target = blurEvent.currentTarget = this;
+					that.close( blurEvent, true );
+				}
+				if ( parent.attr( "title" ) ) {
+					parent.uniqueId();
+					that.parents[ this.id ] = {
+						element: this,
+						title: parent.attr( "title" )
+					};
+					parent.attr( "title", "" );
+				}
+			});
+		}
+
+		this._updateContent( target, event );
+	},
+
+	_updateContent: function( target, event ) {
+		var content,
+			contentOption = this.options.content,
+			that = this,
+			eventType = event ? event.type : null;
+
+		if ( typeof contentOption === "string" ) {
+			return this._open( event, target, contentOption );
+		}
+
+		content = contentOption.call( target[0], function( response ) {
+			// ignore async response if tooltip was closed already
+			if ( !target.data( "ui-tooltip-open" ) ) {
+				return;
+			}
+			// IE may instantly serve a cached response for ajax requests
+			// delay this call to _open so the other call to _open runs first
+			that._delay(function() {
+				// jQuery creates a special event for focusin when it doesn't
+				// exist natively. To improve performance, the native event
+				// object is reused and the type is changed. Therefore, we can't
+				// rely on the type being correct after the event finished
+				// bubbling, so we set it back to the previous value. (#8740)
+				if ( event ) {
+					event.type = eventType;
+				}
+				this._open( event, target, response );
+			});
+		});
+		if ( content ) {
+			this._open( event, target, content );
+		}
+	},
+
+	_open: function( event, target, content ) {
+		var tooltip, events, delayedShow,
+			positionOption = $.extend( {}, this.options.position );
+
+		if ( !content ) {
+			return;
+		}
+
+		// Content can be updated multiple times. If the tooltip already
+		// exists, then just update the content and bail.
+		tooltip = this._find( target );
+		if ( tooltip.length ) {
+			tooltip.find( ".ui-tooltip-content" ).html( content );
+			return;
+		}
+
+		// if we have a title, clear it to prevent the native tooltip
+		// we have to check first to avoid defining a title if none exists
+		// (we don't want to cause an element to start matching [title])
+		//
+		// We use removeAttr only for key events, to allow IE to export the correct
+		// accessible attributes. For mouse events, set to empty string to avoid
+		// native tooltip showing up (happens only when removing inside mouseover).
+		if ( target.is( "[title]" ) ) {
+			if ( event && event.type === "mouseover" ) {
+				target.attr( "title", "" );
+			} else {
+				target.removeAttr( "title" );
+			}
+		}
+
+		tooltip = this._tooltip( target );
+		addDescribedBy( target, tooltip.attr( "id" ) );
+		tooltip.find( ".ui-tooltip-content" ).html( content );
+
+		function position( event ) {
+			positionOption.of = event;
+			if ( tooltip.is( ":hidden" ) ) {
+				return;
+			}
+			tooltip.position( positionOption );
+		}
+		if ( this.options.track && event && /^mouse/.test( event.type ) ) {
+			this._on( this.document, {
+				mousemove: position
+			});
+			// trigger once to override element-relative positioning
+			position( event );
+		} else {
+			tooltip.position( $.extend({
+				of: target
+			}, this.options.position ) );
+		}
+
+		tooltip.hide();
+
+		this._show( tooltip, this.options.show );
+		// Handle tracking tooltips that are shown with a delay (#8644). As soon
+		// as the tooltip is visible, position the tooltip using the most recent
+		// event.
+		if ( this.options.show && this.options.show.delay ) {
+			delayedShow = this.delayedShow = setInterval(function() {
+				if ( tooltip.is( ":visible" ) ) {
+					position( positionOption.of );
+					clearInterval( delayedShow );
+				}
+			}, $.fx.interval );
+		}
+
+		this._trigger( "open", event, { tooltip: tooltip } );
+
+		events = {
+			keyup: function( event ) {
+				if ( event.keyCode === $.ui.keyCode.ESCAPE ) {
+					var fakeEvent = $.Event(event);
+					fakeEvent.currentTarget = target[0];
+					this.close( fakeEvent, true );
+				}
+			},
+			remove: function() {
+				this._removeTooltip( tooltip );
+			}
+		};
+		if ( !event || event.type === "mouseover" ) {
+			events.mouseleave = "close";
+		}
+		if ( !event || event.type === "focusin" ) {
+			events.focusout = "close";
+		}
+		this._on( true, target, events );
+	},
+
+	close: function( event ) {
+		var that = this,
+			target = $( event ? event.currentTarget : this.element ),
+			tooltip = this._find( target );
+
+		// disabling closes the tooltip, so we need to track when we're closing
+		// to avoid an infinite loop in case the tooltip becomes disabled on close
+		if ( this.closing ) {
+			return;
+		}
+
+		// Clear the interval for delayed tracking tooltips
+		clearInterval( this.delayedShow );
+
+		// only set title if we had one before (see comment in _open())
+		if ( target.data( "ui-tooltip-title" ) ) {
+			target.attr( "title", target.data( "ui-tooltip-title" ) );
+		}
+
+		removeDescribedBy( target );
+
+		tooltip.stop( true );
+		this._hide( tooltip, this.options.hide, function() {
+			that._removeTooltip( $( this ) );
+		});
+
+		target.removeData( "ui-tooltip-open" );
+		this._off( target, "mouseleave focusout keyup" );
+		// Remove 'remove' binding only on delegated targets
+		if ( target[0] !== this.element[0] ) {
+			this._off( target, "remove" );
+		}
+		this._off( this.document, "mousemove" );
+
+		if ( event && event.type === "mouseleave" ) {
+			$.each( this.parents, function( id, parent ) {
+				$( parent.element ).attr( "title", parent.title );
+				delete that.parents[ id ];
+			});
+		}
+
+		this.closing = true;
+		this._trigger( "close", event, { tooltip: tooltip } );
+		this.closing = false;
+	},
+
+	_tooltip: function( element ) {
+		var id = "ui-tooltip-" + increments++,
+			tooltip = $( "<div>" )
+				.attr({
+					id: id,
+					role: "tooltip"
+				})
+				.addClass( "ui-tooltip ui-widget ui-corner-all ui-widget-content " +
+					( this.options.tooltipClass || "" ) );
+		$( "<div>" )
+			.addClass( "ui-tooltip-content" )
+			.appendTo( tooltip );
+		tooltip.appendTo( this.document[0].body );
+		this.tooltips[ id ] = element;
+		return tooltip;
+	},
+
+	_find: function( target ) {
+		var id = target.data( "ui-tooltip-id" );
+		return id ? $( "#" + id ) : $();
+	},
+
+	_removeTooltip: function( tooltip ) {
+		tooltip.remove();
+		delete this.tooltips[ tooltip.attr( "id" ) ];
+	},
+
+	_destroy: function() {
+		var that = this;
+
+		// close open tooltips
+		$.each( this.tooltips, function( id, element ) {
+			// Delegate to close method to handle common cleanup
+			var event = $.Event( "blur" );
+			event.target = event.currentTarget = element[0];
+			that.close( event, true );
+
+			// Remove immediately; destroying an open tooltip doesn't use the
+			// hide animation
+			$( "#" + id ).remove();
+
+			// Restore the title
+			if ( element.data( "ui-tooltip-title" ) ) {
+				element.attr( "title", element.data( "ui-tooltip-title" ) );
+				element.removeData( "ui-tooltip-title" );
+			}
+		});
+	}
+});
+
+}( jQuery ) );
diff --git a/data/treeio/treeio/static/js/jquery-ui-1.10.3/ui/jquery.ui.button.js b/data/treeio/treeio/static/js/jquery-ui-1.10.3/ui/jquery.ui.button.js
new file mode 100644
index 0000000..5926642
--- /dev/null
+++ b/data/treeio/treeio/static/js/jquery-ui-1.10.3/ui/jquery.ui.button.js
@@ -0,0 +1,419 @@
+/*!
+ * jQuery UI Button 1.10.3
+ * http://jqueryui.com
+ *
+ * Copyright 2013 jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ *
+ * http://api.jqueryui.com/button/
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ */
+(function( $, undefined ) {
+
+var lastActive, startXPos, startYPos, clickDragged,
+	baseClasses = "ui-button ui-widget ui-state-default ui-corner-all",
+	stateClasses = "ui-state-hover ui-state-active ",
+	typeClasses = "ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only",
+	formResetHandler = function() {
+		var form = $( this );
+		setTimeout(function() {
+			form.find( ":ui-button" ).button( "refresh" );
+		}, 1 );
+	},
+	radioGroup = function( radio ) {
+		var name = radio.name,
+			form = radio.form,
+			radios = $( [] );
+		if ( name ) {
+			name = name.replace( /'/g, "\\'" );
+			if ( form ) {
+				radios = $( form ).find( "[name='" + name + "']" );
+			} else {
+				radios = $( "[name='" + name + "']", radio.ownerDocument )
+					.filter(function() {
+						return !this.form;
+					});
+			}
+		}
+		return radios;
+	};
+
+$.widget( "ui.button", {
+	version: "1.10.3",
+	defaultElement: "<button>",
+	options: {
+		disabled: null,
+		text: true,
+		label: null,
+		icons: {
+			primary: null,
+			secondary: null
+		}
+	},
+	_create: function() {
+		this.element.closest( "form" )
+			.unbind( "reset" + this.eventNamespace )
+			.bind( "reset" + this.eventNamespace, formResetHandler );
+
+		if ( typeof this.options.disabled !== "boolean" ) {
+			this.options.disabled = !!this.element.prop( "disabled" );
+		} else {
+			this.element.prop( "disabled", this.options.disabled );
+		}
+
+		this._determineButtonType();
+		this.hasTitle = !!this.buttonElement.attr( "title" );
+
+		var that = this,
+			options = this.options,
+			toggleButton = this.type === "checkbox" || this.type === "radio",
+			activeClass = !toggleButton ? "ui-state-active" : "",
+			focusClass = "ui-state-focus";
+
+		if ( options.label === null ) {
+			options.label = (this.type === "input" ? this.buttonElement.val() : this.buttonElement.html());
+		}
+
+		this._hoverable( this.buttonElement );
+
+		this.buttonElement
+			.addClass( baseClasses )
+			.attr( "role", "button" )
+			.bind( "mouseenter" + this.eventNamespace, function() {
+				if ( options.disabled ) {
+					return;
+				}
+				if ( this === lastActive ) {
+					$( this ).addClass( "ui-state-active" );
+				}
+			})
+			.bind( "mouseleave" + this.eventNamespace, function() {
+				if ( options.disabled ) {
+					return;
+				}
+				$( this ).removeClass( activeClass );
+			})
+			.bind( "click" + this.eventNamespace, function( event ) {
+				if ( options.disabled ) {
+					event.preventDefault();
+					event.stopImmediatePropagation();
+				}
+			});
+
+		this.element
+			.bind( "focus" + this.eventNamespace, function() {
+				// no need to check disabled, focus won't be triggered anyway
+				that.buttonElement.addClass( focusClass );
+			})
+			.bind( "blur" + this.eventNamespace, function() {
+				that.buttonElement.removeClass( focusClass );
+			});
+
+		if ( toggleButton ) {
+			this.element.bind( "change" + this.eventNamespace, function() {
+				if ( clickDragged ) {
+					return;
+				}
+				that.refresh();
+			});
+			// if mouse moves between mousedown and mouseup (drag) set clickDragged flag
+			// prevents issue where button state changes but checkbox/radio checked state
+			// does not in Firefox (see ticket #6970)
+			this.buttonElement
+				.bind( "mousedown" + this.eventNamespace, function( event ) {
+					if ( options.disabled ) {
+						return;
+					}
+					clickDragged = false;
+					startXPos = event.pageX;
+					startYPos = event.pageY;
+				})
+				.bind( "mouseup" + this.eventNamespace, function( event ) {
+					if ( options.disabled ) {
+						return;
+					}
+					if ( startXPos !== event.pageX || startYPos !== event.pageY ) {
+						clickDragged = true;
+					}
+			});
+		}
+
+		if ( this.type === "checkbox" ) {
+			this.buttonElement.bind( "click" + this.eventNamespace, function() {
+				if ( options.disabled || clickDragged ) {
+					return false;
+				}
+			});
+		} else if ( this.type === "radio" ) {
+			this.buttonElement.bind( "click" + this.eventNamespace, function() {
+				if ( options.disabled || clickDragged ) {
+					return false;
+				}
+				$( this ).addClass( "ui-state-active" );
+				that.buttonElement.attr( "aria-pressed", "true" );
+
+				var radio = that.element[ 0 ];
+				radioGroup( radio )
+					.not( radio )
+					.map(function() {
+						return $( this ).button( "widget" )[ 0 ];
+					})
+					.removeClass( "ui-state-active" )
+					.attr( "aria-pressed", "false" );
+			});
+		} else {
+			this.buttonElement
+				.bind( "mousedown" + this.eventNamespace, function() {
+					if ( options.disabled ) {
+						return false;
+					}
+					$( this ).addClass( "ui-state-active" );
+					lastActive = this;
+					that.document.one( "mouseup", function() {
+						lastActive = null;
+					});
+				})
+				.bind( "mouseup" + this.eventNamespace, function() {
+					if ( options.disabled ) {
+						return false;
+					}
+					$( this ).removeClass( "ui-state-active" );
+				})
+				.bind( "keydown" + this.eventNamespace, function(event) {
+					if ( options.disabled ) {
+						return false;
+					}
+					if ( event.keyCode === $.ui.keyCode.SPACE || event.keyCode === $.ui.keyCode.ENTER ) {
+						$( this ).addClass( "ui-state-active" );
+					}
+				})
+				// see #8559, we bind to blur here in case the button element loses
+				// focus between keydown and keyup, it would be left in an "active" state
+				.bind( "keyup" + this.eventNamespace + " blur" + this.eventNamespace, function() {
+					$( this ).removeClass( "ui-state-active" );
+				});
+
+			if ( this.buttonElement.is("a") ) {
+				this.buttonElement.keyup(function(event) {
+					if ( event.keyCode === $.ui.keyCode.SPACE ) {
+						// TODO pass through original event correctly (just as 2nd argument doesn't work)
+						$( this ).click();
+					}
+				});
+			}
+		}
+
+		// TODO: pull out $.Widget's handling for the disabled option into
+		// $.Widget.prototype._setOptionDisabled so it's easy to proxy and can
+		// be overridden by individual plugins
+		this._setOption( "disabled", options.disabled );
+		this._resetButton();
+	},
+
+	_determineButtonType: function() {
+		var ancestor, labelSelector, checked;
+
+		if ( this.element.is("[type=checkbox]") ) {
+			this.type = "checkbox";
+		} else if ( this.element.is("[type=radio]") ) {
+			this.type = "radio";
+		} else if ( this.element.is("input") ) {
+			this.type = "input";
+		} else {
+			this.type = "button";
+		}
+
+		if ( this.type === "checkbox" || this.type === "radio" ) {
+			// we don't search against the document in case the element
+			// is disconnected from the DOM
+			ancestor = this.element.parents().last();
+			labelSelector = "label[for='" + this.element.attr("id") + "']";
+			this.buttonElement = ancestor.find( labelSelector );
+			if ( !this.buttonElement.length ) {
+				ancestor = ancestor.length ? ancestor.siblings() : this.element.siblings();
+				this.buttonElement = ancestor.filter( labelSelector );
+				if ( !this.buttonElement.length ) {
+					this.buttonElement = ancestor.find( labelSelector );
+				}
+			}
+			this.element.addClass( "ui-helper-hidden-accessible" );
+
+			checked = this.element.is( ":checked" );
+			if ( checked ) {
+				this.buttonElement.addClass( "ui-state-active" );
+			}
+			this.buttonElement.prop( "aria-pressed", checked );
+		} else {
+			this.buttonElement = this.element;
+		}
+	},
+
+	widget: function() {
+		return this.buttonElement;
+	},
+
+	_destroy: function() {
+		this.element
+			.removeClass( "ui-helper-hidden-accessible" );
+		this.buttonElement
+			.removeClass( baseClasses + " " + stateClasses + " " + typeClasses )
+			.removeAttr( "role" )
+			.removeAttr( "aria-pressed" )
+			.html( this.buttonElement.find(".ui-button-text").html() );
+
+		if ( !this.hasTitle ) {
+			this.buttonElement.removeAttr( "title" );
+		}
+	},
+
+	_setOption: function( key, value ) {
+		this._super( key, value );
+		if ( key === "disabled" ) {
+			if ( value ) {
+				this.element.prop( "disabled", true );
+			} else {
+				this.element.prop( "disabled", false );
+			}
+			return;
+		}
+		this._resetButton();
+	},
+
+	refresh: function() {
+		//See #8237 & #8828
+		var isDisabled = this.element.is( "input, button" ) ? this.element.is( ":disabled" ) : this.element.hasClass( "ui-button-disabled" );
+
+		if ( isDisabled !== this.options.disabled ) {
+			this._setOption( "disabled", isDisabled );
+		}
+		if ( this.type === "radio" ) {
+			radioGroup( this.element[0] ).each(function() {
+				if ( $( this ).is( ":checked" ) ) {
+					$( this ).button( "widget" )
+						.addClass( "ui-state-active" )
+						.attr( "aria-pressed", "true" );
+				} else {
+					$( this ).button( "widget" )
+						.removeClass( "ui-state-active" )
+						.attr( "aria-pressed", "false" );
+				}
+			});
+		} else if ( this.type === "checkbox" ) {
+			if ( this.element.is( ":checked" ) ) {
+				this.buttonElement
+					.addClass( "ui-state-active" )
+					.attr( "aria-pressed", "true" );
+			} else {
+				this.buttonElement
+					.removeClass( "ui-state-active" )
+					.attr( "aria-pressed", "false" );
+			}
+		}
+	},
+
+	_resetButton: function() {
+		if ( this.type === "input" ) {
+			if ( this.options.label ) {
+				this.element.val( this.options.label );
+			}
+			return;
+		}
+		var buttonElement = this.buttonElement.removeClass( typeClasses ),
+			buttonText = $( "<span></span>", this.document[0] )
+				.addClass( "ui-button-text" )
+				.html( this.options.label )
+				.appendTo( buttonElement.empty() )
+				.text(),
+			icons = this.options.icons,
+			multipleIcons = icons.primary && icons.secondary,
+			buttonClasses = [];
+
+		if ( icons.primary || icons.secondary ) {
+			if ( this.options.text ) {
+				buttonClasses.push( "ui-button-text-icon" + ( multipleIcons ? "s" : ( icons.primary ? "-primary" : "-secondary" ) ) );
+			}
+
+			if ( icons.primary ) {
+				buttonElement.prepend( "<span class='ui-button-icon-primary ui-icon " + icons.primary + "'></span>" );
+			}
+
+			if ( icons.secondary ) {
+				buttonElement.append( "<span class='ui-button-icon-secondary ui-icon " + icons.secondary + "'></span>" );
+			}
+
+			if ( !this.options.text ) {
+				buttonClasses.push( multipleIcons ? "ui-button-icons-only" : "ui-button-icon-only" );
+
+				if ( !this.hasTitle ) {
+					buttonElement.attr( "title", $.trim( buttonText ) );
+				}
+			}
+		} else {
+			buttonClasses.push( "ui-button-text-only" );
+		}
+		buttonElement.addClass( buttonClasses.join( " " ) );
+	}
+});
+
+$.widget( "ui.buttonset", {
+	version: "1.10.3",
+	options: {
+		items: "button, input[type=button], input[type=submit], input[type=reset], input[type=checkbox], input[type=radio], a, :data(ui-button)"
+	},
+
+	_create: function() {
+		this.element.addClass( "ui-buttonset" );
+	},
+
+	_init: function() {
+		this.refresh();
+	},
+
+	_setOption: function( key, value ) {
+		if ( key === "disabled" ) {
+			this.buttons.button( "option", key, value );
+		}
+
+		this._super( key, value );
+	},
+
+	refresh: function() {
+		var rtl = this.element.css( "direction" ) === "rtl";
+
+		this.buttons = this.element.find( this.options.items )
+			.filter( ":ui-button" )
+				.button( "refresh" )
+			.end()
+			.not( ":ui-button" )
+				.button()
+			.end()
+			.map(function() {
+				return $( this ).button( "widget" )[ 0 ];
+			})
+				.removeClass( "ui-corner-all ui-corner-left ui-corner-right" )
+				.filter( ":first" )
+					.addClass( rtl ? "ui-corner-right" : "ui-corner-left" )
+				.end()
+				.filter( ":last" )
+					.addClass( rtl ? "ui-corner-left" : "ui-corner-right" )
+				.end()
+			.end();
+	},
+
+	_destroy: function() {
+		this.element.removeClass( "ui-buttonset" );
+		this.buttons
+			.map(function() {
+				return $( this ).button( "widget" )[ 0 ];
+			})
+				.removeClass( "ui-corner-left ui-corner-right" )
+			.end()
+			.button( "destroy" );
+	}
+});
+
+}( jQuery ) );
diff --git a/data/treeio/treeio/static/js/jquery-ui-1.10.3/ui/jquery.ui.datepicker.js b/data/treeio/treeio/static/js/jquery-ui-1.10.3/ui/jquery.ui.datepicker.js
new file mode 100644
index 0000000..8afddbd
--- /dev/null
+++ b/data/treeio/treeio/static/js/jquery-ui-1.10.3/ui/jquery.ui.datepicker.js
@@ -0,0 +1,2038 @@
+/*!
+ * jQuery UI Datepicker 1.10.3
+ * http://jqueryui.com
+ *
+ * Copyright 2013 jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ *
+ * http://api.jqueryui.com/datepicker/
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ */
+(function( $, undefined ) {
+
+$.extend($.ui, { datepicker: { version: "1.10.3" } });
+
+var PROP_NAME = "datepicker",
+	instActive;
+
+/* Date picker manager.
+   Use the singleton instance of this class, $.datepicker, to interact with the date picker.
+   Settings for (groups of) date pickers are maintained in an instance object,
+   allowing multiple different settings on the same page. */
+
+function Datepicker() {
+	this._curInst = null; // The current instance in use
+	this._keyEvent = false; // If the last event was a key event
+	this._disabledInputs = []; // List of date picker inputs that have been disabled
+	this._datepickerShowing = false; // True if the popup picker is showing , false if not
+	this._inDialog = false; // True if showing within a "dialog", false if not
+	this._mainDivId = "ui-datepicker-div"; // The ID of the main datepicker division
+	this._inlineClass = "ui-datepicker-inline"; // The name of the inline marker class
+	this._appendClass = "ui-datepicker-append"; // The name of the append marker class
+	this._triggerClass = "ui-datepicker-trigger"; // The name of the trigger marker class
+	this._dialogClass = "ui-datepicker-dialog"; // The name of the dialog marker class
+	this._disableClass = "ui-datepicker-disabled"; // The name of the disabled covering marker class
+	this._unselectableClass = "ui-datepicker-unselectable"; // The name of the unselectable cell marker class
+	this._currentClass = "ui-datepicker-current-day"; // The name of the current day marker class
+	this._dayOverClass = "ui-datepicker-days-cell-over"; // The name of the day hover marker class
+	this.regional = []; // Available regional settings, indexed by language code
+	this.regional[""] = { // Default regional settings
+		closeText: "Done", // Display text for close link
+		prevText: "Prev", // Display text for previous month link
+		nextText: "Next", // Display text for next month link
+		currentText: "Today", // Display text for current month link
+		monthNames: ["January","February","March","April","May","June",
+			"July","August","September","October","November","December"], // Names of months for drop-down and formatting
+		monthNamesShort: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"], // For formatting
+		dayNames: ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"], // For formatting
+		dayNamesShort: ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"], // For formatting
+		dayNamesMin: ["Su","Mo","Tu","We","Th","Fr","Sa"], // Column headings for days starting at Sunday
+		weekHeader: "Wk", // Column header for week of the year
+		dateFormat: "mm/dd/yy", // See format options on parseDate
+		firstDay: 0, // The first day of the week, Sun = 0, Mon = 1, ...
+		isRTL: false, // True if right-to-left language, false if left-to-right
+		showMonthAfterYear: false, // True if the year select precedes month, false for month then year
+		yearSuffix: "" // Additional text to append to the year in the month headers
+	};
+	this._defaults = { // Global defaults for all the date picker instances
+		showOn: "focus", // "focus" for popup on focus,
+			// "button" for trigger button, or "both" for either
+		showAnim: "fadeIn", // Name of jQuery animation for popup
+		showOptions: {}, // Options for enhanced animations
+		defaultDate: null, // Used when field is blank: actual date,
+			// +/-number for offset from today, null for today
+		appendText: "", // Display text following the input box, e.g. showing the format
+		buttonText: "...", // Text for trigger button
+		buttonImage: "", // URL for trigger button image
+		buttonImageOnly: false, // True if the image appears alone, false if it appears on a button
+		hideIfNoPrevNext: false, // True to hide next/previous month links
+			// if not applicable, false to just disable them
+		navigationAsDateFormat: false, // True if date formatting applied to prev/today/next links
+		gotoCurrent: false, // True if today link goes back to current selection instead
+		changeMonth: false, // True if month can be selected directly, false if only prev/next
+		changeYear: false, // True if year can be selected directly, false if only prev/next
+		yearRange: "c-10:c+10", // Range of years to display in drop-down,
+			// either relative to today's year (-nn:+nn), relative to currently displayed year
+			// (c-nn:c+nn), absolute (nnnn:nnnn), or a combination of the above (nnnn:-n)
+		showOtherMonths: false, // True to show dates in other months, false to leave blank
+		selectOtherMonths: false, // True to allow selection of dates in other months, false for unselectable
+		showWeek: false, // True to show week of the year, false to not show it
+		calculateWeek: this.iso8601Week, // How to calculate the week of the year,
+			// takes a Date and returns the number of the week for it
+		shortYearCutoff: "+10", // Short year values < this are in the current century,
+			// > this are in the previous century,
+			// string value starting with "+" for current year + value
+		minDate: null, // The earliest selectable date, or null for no limit
+		maxDate: null, // The latest selectable date, or null for no limit
+		duration: "fast", // Duration of display/closure
+		beforeShowDay: null, // Function that takes a date and returns an array with
+			// [0] = true if selectable, false if not, [1] = custom CSS class name(s) or "",
+			// [2] = cell title (optional), e.g. $.datepicker.noWeekends
+		beforeShow: null, // Function that takes an input field and
+			// returns a set of custom settings for the date picker
+		onSelect: null, // Define a callback function when a date is selected
+		onChangeMonthYear: null, // Define a callback function when the month or year is changed
+		onClose: null, // Define a callback function when the datepicker is closed
+		numberOfMonths: 1, // Number of months to show at a time
+		showCurrentAtPos: 0, // The position in multipe months at which to show the current month (starting at 0)
+		stepMonths: 1, // Number of months to step back/forward
+		stepBigMonths: 12, // Number of months to step back/forward for the big links
+		altField: "", // Selector for an alternate field to store selected dates into
+		altFormat: "", // The date format to use for the alternate field
+		constrainInput: true, // The input is constrained by the current date format
+		showButtonPanel: false, // True to show button panel, false to not show it
+		autoSize: false, // True to size the input for the date format, false to leave as is
+		disabled: false // The initial disabled state
+	};
+	$.extend(this._defaults, this.regional[""]);
+	this.dpDiv = bindHover($("<div id='" + this._mainDivId + "' class='ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>"));
+}
+
+$.extend(Datepicker.prototype, {
+	/* Class name added to elements to indicate already configured with a date picker. */
+	markerClassName: "hasDatepicker",
+
+	//Keep track of the maximum number of rows displayed (see #7043)
+	maxRows: 4,
+
+	// TODO rename to "widget" when switching to widget factory
+	_widgetDatepicker: function() {
+		return this.dpDiv;
+	},
+
+	/* Override the default settings for all instances of the date picker.
+	 * @param  settings  object - the new settings to use as defaults (anonymous object)
+	 * @return the manager object
+	 */
+	setDefaults: function(settings) {
+		extendRemove(this._defaults, settings || {});
+		return this;
+	},
+
+	/* Attach the date picker to a jQuery selection.
+	 * @param  target	element - the target input field or division or span
+	 * @param  settings  object - the new settings to use for this date picker instance (anonymous)
+	 */
+	_attachDatepicker: function(target, settings) {
+		var nodeName, inline, inst;
+		nodeName = target.nodeName.toLowerCase();
+		inline = (nodeName === "div" || nodeName === "span");
+		if (!target.id) {
+			this.uuid += 1;
+			target.id = "dp" + this.uuid;
+		}
+		inst = this._newInst($(target), inline);
+		inst.settings = $.extend({}, settings || {});
+		if (nodeName === "input") {
+			this._connectDatepicker(target, inst);
+		} else if (inline) {
+			this._inlineDatepicker(target, inst);
+		}
+	},
+
+	/* Create a new instance object. */
+	_newInst: function(target, inline) {
+		var id = target[0].id.replace(/([^A-Za-z0-9_\-])/g, "\\\\$1"); // escape jQuery meta chars
+		return {id: id, input: target, // associated target
+			selectedDay: 0, selectedMonth: 0, selectedYear: 0, // current selection
+			drawMonth: 0, drawYear: 0, // month being drawn
+			inline: inline, // is datepicker inline or not
+			dpDiv: (!inline ? this.dpDiv : // presentation div
+			bindHover($("<div class='" + this._inlineClass + " ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>")))};
+	},
+
+	/* Attach the date picker to an input field. */
+	_connectDatepicker: function(target, inst) {
+		var input = $(target);
+		inst.append = $([]);
+		inst.trigger = $([]);
+		if (input.hasClass(this.markerClassName)) {
+			return;
+		}
+		this._attachments(input, inst);
+		input.addClass(this.markerClassName).keydown(this._doKeyDown).
+			keypress(this._doKeyPress).keyup(this._doKeyUp);
+		this._autoSize(inst);
+		$.data(target, PROP_NAME, inst);
+		//If disabled option is true, disable the datepicker once it has been attached to the input (see ticket #5665)
+		if( inst.settings.disabled ) {
+			this._disableDatepicker( target );
+		}
+	},
+
+	/* Make attachments based on settings. */
+	_attachments: function(input, inst) {
+		var showOn, buttonText, buttonImage,
+			appendText = this._get(inst, "appendText"),
+			isRTL = this._get(inst, "isRTL");
+
+		if (inst.append) {
+			inst.append.remove();
+		}
+		if (appendText) {
+			inst.append = $("<span class='" + this._appendClass + "'>" + appendText + "</span>");
+			input[isRTL ? "before" : "after"](inst.append);
+		}
+
+		input.unbind("focus", this._showDatepicker);
+
+		if (inst.trigger) {
+			inst.trigger.remove();
+		}
+
+		showOn = this._get(inst, "showOn");
+		if (showOn === "focus" || showOn === "both") { // pop-up date picker when in the marked field
+			input.focus(this._showDatepicker);
+		}
+		if (showOn === "button" || showOn === "both") { // pop-up date picker when button clicked
+			buttonText = this._get(inst, "buttonText");
+			buttonImage = this._get(inst, "buttonImage");
+			inst.trigger = $(this._get(inst, "buttonImageOnly") ?
+				$("<img/>").addClass(this._triggerClass).
+					attr({ src: buttonImage, alt: buttonText, title: buttonText }) :
+				$("<button type='button'></button>").addClass(this._triggerClass).
+					html(!buttonImage ? buttonText : $("<img/>").attr(
+					{ src:buttonImage, alt:buttonText, title:buttonText })));
+			input[isRTL ? "before" : "after"](inst.trigger);
+			inst.trigger.click(function() {
+				if ($.datepicker._datepickerShowing && $.datepicker._lastInput === input[0]) {
+					$.datepicker._hideDatepicker();
+				} else if ($.datepicker._datepickerShowing && $.datepicker._lastInput !== input[0]) {
+					$.datepicker._hideDatepicker();
+					$.datepicker._showDatepicker(input[0]);
+				} else {
+					$.datepicker._showDatepicker(input[0]);
+				}
+				return false;
+			});
+		}
+	},
+
+	/* Apply the maximum length for the date format. */
+	_autoSize: function(inst) {
+		if (this._get(inst, "autoSize") && !inst.inline) {
+			var findMax, max, maxI, i,
+				date = new Date(2009, 12 - 1, 20), // Ensure double digits
+				dateFormat = this._get(inst, "dateFormat");
+
+			if (dateFormat.match(/[DM]/)) {
+				findMax = function(names) {
+					max = 0;
+					maxI = 0;
+					for (i = 0; i < names.length; i++) {
+						if (names[i].length > max) {
+							max = names[i].length;
+							maxI = i;
+						}
+					}
+					return maxI;
+				};
+				date.setMonth(findMax(this._get(inst, (dateFormat.match(/MM/) ?
+					"monthNames" : "monthNamesShort"))));
+				date.setDate(findMax(this._get(inst, (dateFormat.match(/DD/) ?
+					"dayNames" : "dayNamesShort"))) + 20 - date.getDay());
+			}
+			inst.input.attr("size", this._formatDate(inst, date).length);
+		}
+	},
+
+	/* Attach an inline date picker to a div. */
+	_inlineDatepicker: function(target, inst) {
+		var divSpan = $(target);
+		if (divSpan.hasClass(this.markerClassName)) {
+			return;
+		}
+		divSpan.addClass(this.markerClassName).append(inst.dpDiv);
+		$.data(target, PROP_NAME, inst);
+		this._setDate(inst, this._getDefaultDate(inst), true);
+		this._updateDatepicker(inst);
+		this._updateAlternate(inst);
+		//If disabled option is true, disable the datepicker before showing it (see ticket #5665)
+		if( inst.settings.disabled ) {
+			this._disableDatepicker( target );
+		}
+		// Set display:block in place of inst.dpDiv.show() which won't work on disconnected elements
+		// http://bugs.jqueryui.com/ticket/7552 - A Datepicker created on a detached div has zero height
+		inst.dpDiv.css( "display", "block" );
+	},
+
+	/* Pop-up the date picker in a "dialog" box.
+	 * @param  input element - ignored
+	 * @param  date	string or Date - the initial date to display
+	 * @param  onSelect  function - the function to call when a date is selected
+	 * @param  settings  object - update the dialog date picker instance's settings (anonymous object)
+	 * @param  pos int[2] - coordinates for the dialog's position within the screen or
+	 *					event - with x/y coordinates or
+	 *					leave empty for default (screen centre)
+	 * @return the manager object
+	 */
+	_dialogDatepicker: function(input, date, onSelect, settings, pos) {
+		var id, browserWidth, browserHeight, scrollX, scrollY,
+			inst = this._dialogInst; // internal instance
+
+		if (!inst) {
+			this.uuid += 1;
+			id = "dp" + this.uuid;
+			this._dialogInput = $("<input type='text' id='" + id +
+				"' style='position: absolute; top: -100px; width: 0px;'/>");
+			this._dialogInput.keydown(this._doKeyDown);
+			$("body").append(this._dialogInput);
+			inst = this._dialogInst = this._newInst(this._dialogInput, false);
+			inst.settings = {};
+			$.data(this._dialogInput[0], PROP_NAME, inst);
+		}
+		extendRemove(inst.settings, settings || {});
+		date = (date && date.constructor === Date ? this._formatDate(inst, date) : date);
+		this._dialogInput.val(date);
+
+		this._pos = (pos ? (pos.length ? pos : [pos.pageX, pos.pageY]) : null);
+		if (!this._pos) {
+			browserWidth = document.documentElement.clientWidth;
+			browserHeight = document.documentElement.clientHeight;
+			scrollX = document.documentElement.scrollLeft || document.body.scrollLeft;
+			scrollY = document.documentElement.scrollTop || document.body.scrollTop;
+			this._pos = // should use actual width/height below
+				[(browserWidth / 2) - 100 + scrollX, (browserHeight / 2) - 150 + scrollY];
+		}
+
+		// move input on screen for focus, but hidden behind dialog
+		this._dialogInput.css("left", (this._pos[0] + 20) + "px").css("top", this._pos[1] + "px");
+		inst.settings.onSelect = onSelect;
+		this._inDialog = true;
+		this.dpDiv.addClass(this._dialogClass);
+		this._showDatepicker(this._dialogInput[0]);
+		if ($.blockUI) {
+			$.blockUI(this.dpDiv);
+		}
+		$.data(this._dialogInput[0], PROP_NAME, inst);
+		return this;
+	},
+
+	/* Detach a datepicker from its control.
+	 * @param  target	element - the target input field or division or span
+	 */
+	_destroyDatepicker: function(target) {
+		var nodeName,
+			$target = $(target),
+			inst = $.data(target, PROP_NAME);
+
+		if (!$target.hasClass(this.markerClassName)) {
+			return;
+		}
+
+		nodeName = target.nodeName.toLowerCase();
+		$.removeData(target, PROP_NAME);
+		if (nodeName === "input") {
+			inst.append.remove();
+			inst.trigger.remove();
+			$target.removeClass(this.markerClassName).
+				unbind("focus", this._showDatepicker).
+				unbind("keydown", this._doKeyDown).
+				unbind("keypress", this._doKeyPress).
+				unbind("keyup", this._doKeyUp);
+		} else if (nodeName === "div" || nodeName === "span") {
+			$target.removeClass(this.markerClassName).empty();
+		}
+	},
+
+	/* Enable the date picker to a jQuery selection.
+	 * @param  target	element - the target input field or division or span
+	 */
+	_enableDatepicker: function(target) {
+		var nodeName, inline,
+			$target = $(target),
+			inst = $.data(target, PROP_NAME);
+
+		if (!$target.hasClass(this.markerClassName)) {
+			return;
+		}
+
+		nodeName = target.nodeName.toLowerCase();
+		if (nodeName === "input") {
+			target.disabled = false;
+			inst.trigger.filter("button").
+				each(function() { this.disabled = false; }).end().
+				filter("img").css({opacity: "1.0", cursor: ""});
+		} else if (nodeName === "div" || nodeName === "span") {
+			inline = $target.children("." + this._inlineClass);
+			inline.children().removeClass("ui-state-disabled");
+			inline.find("select.ui-datepicker-month, select.ui-datepicker-year").
+				prop("disabled", false);
+		}
+		this._disabledInputs = $.map(this._disabledInputs,
+			function(value) { return (value === target ? null : value); }); // delete entry
+	},
+
+	/* Disable the date picker to a jQuery selection.
+	 * @param  target	element - the target input field or division or span
+	 */
+	_disableDatepicker: function(target) {
+		var nodeName, inline,
+			$target = $(target),
+			inst = $.data(target, PROP_NAME);
+
+		if (!$target.hasClass(this.markerClassName)) {
+			return;
+		}
+
+		nodeName = target.nodeName.toLowerCase();
+		if (nodeName === "input") {
+			target.disabled = true;
+			inst.trigger.filter("button").
+				each(function() { this.disabled = true; }).end().
+				filter("img").css({opacity: "0.5", cursor: "default"});
+		} else if (nodeName === "div" || nodeName === "span") {
+			inline = $target.children("." + this._inlineClass);
+			inline.children().addClass("ui-state-disabled");
+			inline.find("select.ui-datepicker-month, select.ui-datepicker-year").
+				prop("disabled", true);
+		}
+		this._disabledInputs = $.map(this._disabledInputs,
+			function(value) { return (value === target ? null : value); }); // delete entry
+		this._disabledInputs[this._disabledInputs.length] = target;
+	},
+
+	/* Is the first field in a jQuery collection disabled as a datepicker?
+	 * @param  target	element - the target input field or division or span
+	 * @return boolean - true if disabled, false if enabled
+	 */
+	_isDisabledDatepicker: function(target) {
+		if (!target) {
+			return false;
+		}
+		for (var i = 0; i < this._disabledInputs.length; i++) {
+			if (this._disabledInputs[i] === target) {
+				return true;
+			}
+		}
+		return false;
+	},
+
+	/* Retrieve the instance data for the target control.
+	 * @param  target  element - the target input field or division or span
+	 * @return  object - the associated instance data
+	 * @throws  error if a jQuery problem getting data
+	 */
+	_getInst: function(target) {
+		try {
+			return $.data(target, PROP_NAME);
+		}
+		catch (err) {
+			throw "Missing instance data for this datepicker";
+		}
+	},
+
+	/* Update or retrieve the settings for a date picker attached to an input field or division.
+	 * @param  target  element - the target input field or division or span
+	 * @param  name	object - the new settings to update or
+	 *				string - the name of the setting to change or retrieve,
+	 *				when retrieving also "all" for all instance settings or
+	 *				"defaults" for all global defaults
+	 * @param  value   any - the new value for the setting
+	 *				(omit if above is an object or to retrieve a value)
+	 */
+	_optionDatepicker: function(target, name, value) {
+		var settings, date, minDate, maxDate,
+			inst = this._getInst(target);
+
+		if (arguments.length === 2 && typeof name === "string") {
+			return (name === "defaults" ? $.extend({}, $.datepicker._defaults) :
+				(inst ? (name === "all" ? $.extend({}, inst.settings) :
+				this._get(inst, name)) : null));
+		}
+
+		settings = name || {};
+		if (typeof name === "string") {
+			settings = {};
+			settings[name] = value;
+		}
+
+		if (inst) {
+			if (this._curInst === inst) {
+				this._hideDatepicker();
+			}
+
+			date = this._getDateDatepicker(target, true);
+			minDate = this._getMinMaxDate(inst, "min");
+			maxDate = this._getMinMaxDate(inst, "max");
+			extendRemove(inst.settings, settings);
+			// reformat the old minDate/maxDate values if dateFormat changes and a new minDate/maxDate isn't provided
+			if (minDate !== null && settings.dateFormat !== undefined && settings.minDate === undefined) {
+				inst.settings.minDate = this._formatDate(inst, minDate);
+			}
+			if (maxDate !== null && settings.dateFormat !== undefined && settings.maxDate === undefined) {
+				inst.settings.maxDate = this._formatDate(inst, maxDate);
+			}
+			if ( "disabled" in settings ) {
+				if ( settings.disabled ) {
+					this._disableDatepicker(target);
+				} else {
+					this._enableDatepicker(target);
+				}
+			}
+			this._attachments($(target), inst);
+			this._autoSize(inst);
+			this._setDate(inst, date);
+			this._updateAlternate(inst);
+			this._updateDatepicker(inst);
+		}
+	},
+
+	// change method deprecated
+	_changeDatepicker: function(target, name, value) {
+		this._optionDatepicker(target, name, value);
+	},
+
+	/* Redraw the date picker attached to an input field or division.
+	 * @param  target  element - the target input field or division or span
+	 */
+	_refreshDatepicker: function(target) {
+		var inst = this._getInst(target);
+		if (inst) {
+			this._updateDatepicker(inst);
+		}
+	},
+
+	/* Set the dates for a jQuery selection.
+	 * @param  target element - the target input field or division or span
+	 * @param  date	Date - the new date
+	 */
+	_setDateDatepicker: function(target, date) {
+		var inst = this._getInst(target);
+		if (inst) {
+			this._setDate(inst, date);
+			this._updateDatepicker(inst);
+			this._updateAlternate(inst);
+		}
+	},
+
+	/* Get the date(s) for the first entry in a jQuery selection.
+	 * @param  target element - the target input field or division or span
+	 * @param  noDefault boolean - true if no default date is to be used
+	 * @return Date - the current date
+	 */
+	_getDateDatepicker: function(target, noDefault) {
+		var inst = this._getInst(target);
+		if (inst && !inst.inline) {
+			this._setDateFromField(inst, noDefault);
+		}
+		return (inst ? this._getDate(inst) : null);
+	},
+
+	/* Handle keystrokes. */
+	_doKeyDown: function(event) {
+		var onSelect, dateStr, sel,
+			inst = $.datepicker._getInst(event.target),
+			handled = true,
+			isRTL = inst.dpDiv.is(".ui-datepicker-rtl");
+
+		inst._keyEvent = true;
+		if ($.datepicker._datepickerShowing) {
+			switch (event.keyCode) {
+				case 9: $.datepicker._hideDatepicker();
+						handled = false;
+						break; // hide on tab out
+				case 13: sel = $("td." + $.datepicker._dayOverClass + ":not(." +
+									$.datepicker._currentClass + ")", inst.dpDiv);
+						if (sel[0]) {
+							$.datepicker._selectDay(event.target, inst.selectedMonth, inst.selectedYear, sel[0]);
+						}
+
+						onSelect = $.datepicker._get(inst, "onSelect");
+						if (onSelect) {
+							dateStr = $.datepicker._formatDate(inst);
+
+							// trigger custom callback
+							onSelect.apply((inst.input ? inst.input[0] : null), [dateStr, inst]);
+						} else {
+							$.datepicker._hideDatepicker();
+						}
+
+						return false; // don't submit the form
+				case 27: $.datepicker._hideDatepicker();
+						break; // hide on escape
+				case 33: $.datepicker._adjustDate(event.target, (event.ctrlKey ?
+							-$.datepicker._get(inst, "stepBigMonths") :
+							-$.datepicker._get(inst, "stepMonths")), "M");
+						break; // previous month/year on page up/+ ctrl
+				case 34: $.datepicker._adjustDate(event.target, (event.ctrlKey ?
+							+$.datepicker._get(inst, "stepBigMonths") :
+							+$.datepicker._get(inst, "stepMonths")), "M");
+						break; // next month/year on page down/+ ctrl
+				case 35: if (event.ctrlKey || event.metaKey) {
+							$.datepicker._clearDate(event.target);
+						}
+						handled = event.ctrlKey || event.metaKey;
+						break; // clear on ctrl or command +end
+				case 36: if (event.ctrlKey || event.metaKey) {
+							$.datepicker._gotoToday(event.target);
+						}
+						handled = event.ctrlKey || event.metaKey;
+						break; // current on ctrl or command +home
+				case 37: if (event.ctrlKey || event.metaKey) {
+							$.datepicker._adjustDate(event.target, (isRTL ? +1 : -1), "D");
+						}
+						handled = event.ctrlKey || event.metaKey;
+						// -1 day on ctrl or command +left
+						if (event.originalEvent.altKey) {
+							$.datepicker._adjustDate(event.target, (event.ctrlKey ?
+								-$.datepicker._get(inst, "stepBigMonths") :
+								-$.datepicker._get(inst, "stepMonths")), "M");
+						}
+						// next month/year on alt +left on Mac
+						break;
+				case 38: if (event.ctrlKey || event.metaKey) {
+							$.datepicker._adjustDate(event.target, -7, "D");
+						}
+						handled = event.ctrlKey || event.metaKey;
+						break; // -1 week on ctrl or command +up
+				case 39: if (event.ctrlKey || event.metaKey) {
+							$.datepicker._adjustDate(event.target, (isRTL ? -1 : +1), "D");
+						}
+						handled = event.ctrlKey || event.metaKey;
+						// +1 day on ctrl or command +right
+						if (event.originalEvent.altKey) {
+							$.datepicker._adjustDate(event.target, (event.ctrlKey ?
+								+$.datepicker._get(inst, "stepBigMonths") :
+								+$.datepicker._get(inst, "stepMonths")), "M");
+						}
+						// next month/year on alt +right
+						break;
+				case 40: if (event.ctrlKey || event.metaKey) {
+							$.datepicker._adjustDate(event.target, +7, "D");
+						}
+						handled = event.ctrlKey || event.metaKey;
+						break; // +1 week on ctrl or command +down
+				default: handled = false;
+			}
+		} else if (event.keyCode === 36 && event.ctrlKey) { // display the date picker on ctrl+home
+			$.datepicker._showDatepicker(this);
+		} else {
+			handled = false;
+		}
+
+		if (handled) {
+			event.preventDefault();
+			event.stopPropagation();
+		}
+	},
+
+	/* Filter entered characters - based on date format. */
+	_doKeyPress: function(event) {
+		var chars, chr,
+			inst = $.datepicker._getInst(event.target);
+
+		if ($.datepicker._get(inst, "constrainInput")) {
+			chars = $.datepicker._possibleChars($.datepicker._get(inst, "dateFormat"));
+			chr = String.fromCharCode(event.charCode == null ? event.keyCode : event.charCode);
+			return event.ctrlKey || event.metaKey || (chr < " " || !chars || chars.indexOf(chr) > -1);
+		}
+	},
+
+	/* Synchronise manual entry and field/alternate field. */
+	_doKeyUp: function(event) {
+		var date,
+			inst = $.datepicker._getInst(event.target);
+
+		if (inst.input.val() !== inst.lastVal) {
+			try {
+				date = $.datepicker.parseDate($.datepicker._get(inst, "dateFormat"),
+					(inst.input ? inst.input.val() : null),
+					$.datepicker._getFormatConfig(inst));
+
+				if (date) { // only if valid
+					$.datepicker._setDateFromField(inst);
+					$.datepicker._updateAlternate(inst);
+					$.datepicker._updateDatepicker(inst);
+				}
+			}
+			catch (err) {
+			}
+		}
+		return true;
+	},
+
+	/* Pop-up the date picker for a given input field.
+	 * If false returned from beforeShow event handler do not show.
+	 * @param  input  element - the input field attached to the date picker or
+	 *					event - if triggered by focus
+	 */
+	_showDatepicker: function(input) {
+		input = input.target || input;
+		if (input.nodeName.toLowerCase() !== "input") { // find from button/image trigger
+			input = $("input", input.parentNode)[0];
+		}
+
+		if ($.datepicker._isDisabledDatepicker(input) || $.datepicker._lastInput === input) { // already here
+			return;
+		}
+
+		var inst, beforeShow, beforeShowSettings, isFixed,
+			offset, showAnim, duration;
+
+		inst = $.datepicker._getInst(input);
+		if ($.datepicker._curInst && $.datepicker._curInst !== inst) {
+			$.datepicker._curInst.dpDiv.stop(true, true);
+			if ( inst && $.datepicker._datepickerShowing ) {
+				$.datepicker._hideDatepicker( $.datepicker._curInst.input[0] );
+			}
+		}
+
+		beforeShow = $.datepicker._get(inst, "beforeShow");
+		beforeShowSettings = beforeShow ? beforeShow.apply(input, [input, inst]) : {};
+		if(beforeShowSettings === false){
+			return;
+		}
+		extendRemove(inst.settings, beforeShowSettings);
+
+		inst.lastVal = null;
+		$.datepicker._lastInput = input;
+		$.datepicker._setDateFromField(inst);
+
+		if ($.datepicker._inDialog) { // hide cursor
+			input.value = "";
+		}
+		if (!$.datepicker._pos) { // position below input
+			$.datepicker._pos = $.datepicker._findPos(input);
+			$.datepicker._pos[1] += input.offsetHeight; // add the height
+		}
+
+		isFixed = false;
+		$(input).parents().each(function() {
+			isFixed |= $(this).css("position") === "fixed";
+			return !isFixed;
+		});
+
+		offset = {left: $.datepicker._pos[0], top: $.datepicker._pos[1]};
+		$.datepicker._pos = null;
+		//to avoid flashes on Firefox
+		inst.dpDiv.empty();
+		// determine sizing offscreen
+		inst.dpDiv.css({position: "absolute", display: "block", top: "-1000px"});
+		$.datepicker._updateDatepicker(inst);
+		// fix width for dynamic number of date pickers
+		// and adjust position before showing
+		offset = $.datepicker._checkOffset(inst, offset, isFixed);
+		inst.dpDiv.css({position: ($.datepicker._inDialog && $.blockUI ?
+			"static" : (isFixed ? "fixed" : "absolute")), display: "none",
+			left: offset.left + "px", top: offset.top + "px"});
+
+		if (!inst.inline) {
+			showAnim = $.datepicker._get(inst, "showAnim");
+			duration = $.datepicker._get(inst, "duration");
+			inst.dpDiv.zIndex($(input).zIndex()+1);
+			$.datepicker._datepickerShowing = true;
+
+			if ( $.effects && $.effects.effect[ showAnim ] ) {
+				inst.dpDiv.show(showAnim, $.datepicker._get(inst, "showOptions"), duration);
+			} else {
+				inst.dpDiv[showAnim || "show"](showAnim ? duration : null);
+			}
+
+			if ( $.datepicker._shouldFocusInput( inst ) ) {
+				inst.input.focus();
+			}
+
+			$.datepicker._curInst = inst;
+		}
+	},
+
+	/* Generate the date picker content. */
+	_updateDatepicker: function(inst) {
+		this.maxRows = 4; //Reset the max number of rows being displayed (see #7043)
+		instActive = inst; // for delegate hover events
+		inst.dpDiv.empty().append(this._generateHTML(inst));
+		this._attachHandlers(inst);
+		inst.dpDiv.find("." + this._dayOverClass + " a").mouseover();
+
+		var origyearshtml,
+			numMonths = this._getNumberOfMonths(inst),
+			cols = numMonths[1],
+			width = 17;
+
+		inst.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width("");
+		if (cols > 1) {
+			inst.dpDiv.addClass("ui-datepicker-multi-" + cols).css("width", (width * cols) + "em");
+		}
+		inst.dpDiv[(numMonths[0] !== 1 || numMonths[1] !== 1 ? "add" : "remove") +
+			"Class"]("ui-datepicker-multi");
+		inst.dpDiv[(this._get(inst, "isRTL") ? "add" : "remove") +
+			"Class"]("ui-datepicker-rtl");
+
+		if (inst === $.datepicker._curInst && $.datepicker._datepickerShowing && $.datepicker._shouldFocusInput( inst ) ) {
+			inst.input.focus();
+		}
+
+		// deffered render of the years select (to avoid flashes on Firefox)
+		if( inst.yearshtml ){
+			origyearshtml = inst.yearshtml;
+			setTimeout(function(){
+				//assure that inst.yearshtml didn't change.
+				if( origyearshtml === inst.yearshtml && inst.yearshtml ){
+					inst.dpDiv.find("select.ui-datepicker-year:first").replaceWith(inst.yearshtml);
+				}
+				origyearshtml = inst.yearshtml = null;
+			}, 0);
+		}
+	},
+
+	// #6694 - don't focus the input if it's already focused
+	// this breaks the change event in IE
+	// Support: IE and jQuery <1.9
+	_shouldFocusInput: function( inst ) {
+		return inst.input && inst.input.is( ":visible" ) && !inst.input.is( ":disabled" ) && !inst.input.is( ":focus" );
+	},
+
+	/* Check positioning to remain on screen. */
+	_checkOffset: function(inst, offset, isFixed) {
+		var dpWidth = inst.dpDiv.outerWidth(),
+			dpHeight = inst.dpDiv.outerHeight(),
+			inputWidth = inst.input ? inst.input.outerWidth() : 0,
+			inputHeight = inst.input ? inst.input.outerHeight() : 0,
+			viewWidth = document.documentElement.clientWidth + (isFixed ? 0 : $(document).scrollLeft()),
+			viewHeight = document.documentElement.clientHeight + (isFixed ? 0 : $(document).scrollTop());
+
+		offset.left -= (this._get(inst, "isRTL") ? (dpWidth - inputWidth) : 0);
+		offset.left -= (isFixed && offset.left === inst.input.offset().left) ? $(document).scrollLeft() : 0;
+		offset.top -= (isFixed && offset.top === (inst.input.offset().top + inputHeight)) ? $(document).scrollTop() : 0;
+
+		// now check if datepicker is showing outside window viewport - move to a better place if so.
+		offset.left -= Math.min(offset.left, (offset.left + dpWidth > viewWidth && viewWidth > dpWidth) ?
+			Math.abs(offset.left + dpWidth - viewWidth) : 0);
+		offset.top -= Math.min(offset.top, (offset.top + dpHeight > viewHeight && viewHeight > dpHeight) ?
+			Math.abs(dpHeight + inputHeight) : 0);
+
+		return offset;
+	},
+
+	/* Find an object's position on the screen. */
+	_findPos: function(obj) {
+		var position,
+			inst = this._getInst(obj),
+			isRTL = this._get(inst, "isRTL");
+
+		while (obj && (obj.type === "hidden" || obj.nodeType !== 1 || $.expr.filters.hidden(obj))) {
+			obj = obj[isRTL ? "previousSibling" : "nextSibling"];
+		}
+
+		position = $(obj).offset();
+		return [position.left, position.top];
+	},
+
+	/* Hide the date picker from view.
+	 * @param  input  element - the input field attached to the date picker
+	 */
+	_hideDatepicker: function(input) {
+		var showAnim, duration, postProcess, onClose,
+			inst = this._curInst;
+
+		if (!inst || (input && inst !== $.data(input, PROP_NAME))) {
+			return;
+		}
+
+		if (this._datepickerShowing) {
+			showAnim = this._get(inst, "showAnim");
+			duration = this._get(inst, "duration");
+			postProcess = function() {
+				$.datepicker._tidyDialog(inst);
+			};
+
+			// DEPRECATED: after BC for 1.8.x $.effects[ showAnim ] is not needed
+			if ( $.effects && ( $.effects.effect[ showAnim ] || $.effects[ showAnim ] ) ) {
+				inst.dpDiv.hide(showAnim, $.datepicker._get(inst, "showOptions"), duration, postProcess);
+			} else {
+				inst.dpDiv[(showAnim === "slideDown" ? "slideUp" :
+					(showAnim === "fadeIn" ? "fadeOut" : "hide"))]((showAnim ? duration : null), postProcess);
+			}
+
+			if (!showAnim) {
+				postProcess();
+			}
+			this._datepickerShowing = false;
+
+			onClose = this._get(inst, "onClose");
+			if (onClose) {
+				onClose.apply((inst.input ? inst.input[0] : null), [(inst.input ? inst.input.val() : ""), inst]);
+			}
+
+			this._lastInput = null;
+			if (this._inDialog) {
+				this._dialogInput.css({ position: "absolute", left: "0", top: "-100px" });
+				if ($.blockUI) {
+					$.unblockUI();
+					$("body").append(this.dpDiv);
+				}
+			}
+			this._inDialog = false;
+		}
+	},
+
+	/* Tidy up after a dialog display. */
+	_tidyDialog: function(inst) {
+		inst.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar");
+	},
+
+	/* Close date picker if clicked elsewhere. */
+	_checkExternalClick: function(event) {
+		if (!$.datepicker._curInst) {
+			return;
+		}
+
+		var $target = $(event.target),
+			inst = $.datepicker._getInst($target[0]);
+
+		if ( ( ( $target[0].id !== $.datepicker._mainDivId &&
+				$target.parents("#" + $.datepicker._mainDivId).length === 0 &&
+				!$target.hasClass($.datepicker.markerClassName) &&
+				!$target.closest("." + $.datepicker._triggerClass).length &&
+				$.datepicker._datepickerShowing && !($.datepicker._inDialog && $.blockUI) ) ) ||
+			( $target.hasClass($.datepicker.markerClassName) && $.datepicker._curInst !== inst ) ) {
+				$.datepicker._hideDatepicker();
+		}
+	},
+
+	/* Adjust one of the date sub-fields. */
+	_adjustDate: function(id, offset, period) {
+		var target = $(id),
+			inst = this._getInst(target[0]);
+
+		if (this._isDisabledDatepicker(target[0])) {
+			return;
+		}
+		this._adjustInstDate(inst, offset +
+			(period === "M" ? this._get(inst, "showCurrentAtPos") : 0), // undo positioning
+			period);
+		this._updateDatepicker(inst);
+	},
+
+	/* Action for current link. */
+	_gotoToday: function(id) {
+		var date,
+			target = $(id),
+			inst = this._getInst(target[0]);
+
+		if (this._get(inst, "gotoCurrent") && inst.currentDay) {
+			inst.selectedDay = inst.currentDay;
+			inst.drawMonth = inst.selectedMonth = inst.currentMonth;
+			inst.drawYear = inst.selectedYear = inst.currentYear;
+		} else {
+			date = new Date();
+			inst.selectedDay = date.getDate();
+			inst.drawMonth = inst.selectedMonth = date.getMonth();
+			inst.drawYear = inst.selectedYear = date.getFullYear();
+		}
+		this._notifyChange(inst);
+		this._adjustDate(target);
+	},
+
+	/* Action for selecting a new month/year. */
+	_selectMonthYear: function(id, select, period) {
+		var target = $(id),
+			inst = this._getInst(target[0]);
+
+		inst["selected" + (period === "M" ? "Month" : "Year")] =
+		inst["draw" + (period === "M" ? "Month" : "Year")] =
+			parseInt(select.options[select.selectedIndex].value,10);
+
+		this._notifyChange(inst);
+		this._adjustDate(target);
+	},
+
+	/* Action for selecting a day. */
+	_selectDay: function(id, month, year, td) {
+		var inst,
+			target = $(id);
+
+		if ($(td).hasClass(this._unselectableClass) || this._isDisabledDatepicker(target[0])) {
+			return;
+		}
+
+		inst = this._getInst(target[0]);
+		inst.selectedDay = inst.currentDay = $("a", td).html();
+		inst.selectedMonth = inst.currentMonth = month;
+		inst.selectedYear = inst.currentYear = year;
+		this._selectDate(id, this._formatDate(inst,
+			inst.currentDay, inst.currentMonth, inst.currentYear));
+	},
+
+	/* Erase the input field and hide the date picker. */
+	_clearDate: function(id) {
+		var target = $(id);
+		this._selectDate(target, "");
+	},
+
+	/* Update the input field with the selected date. */
+	_selectDate: function(id, dateStr) {
+		var onSelect,
+			target = $(id),
+			inst = this._getInst(target[0]);
+
+		dateStr = (dateStr != null ? dateStr : this._formatDate(inst));
+		if (inst.input) {
+			inst.input.val(dateStr);
+		}
+		this._updateAlternate(inst);
+
+		onSelect = this._get(inst, "onSelect");
+		if (onSelect) {
+			onSelect.apply((inst.input ? inst.input[0] : null), [dateStr, inst]);  // trigger custom callback
+		} else if (inst.input) {
+			inst.input.trigger("change"); // fire the change event
+		}
+
+		if (inst.inline){
+			this._updateDatepicker(inst);
+		} else {
+			this._hideDatepicker();
+			this._lastInput = inst.input[0];
+			if (typeof(inst.input[0]) !== "object") {
+				inst.input.focus(); // restore focus
+			}
+			this._lastInput = null;
+		}
+	},
+
+	/* Update any alternate field to synchronise with the main field. */
+	_updateAlternate: function(inst) {
+		var altFormat, date, dateStr,
+			altField = this._get(inst, "altField");
+
+		if (altField) { // update alternate field too
+			altFormat = this._get(inst, "altFormat") || this._get(inst, "dateFormat");
+			date = this._getDate(inst);
+			dateStr = this.formatDate(altFormat, date, this._getFormatConfig(inst));
+			$(altField).each(function() { $(this).val(dateStr); });
+		}
+	},
+
+	/* Set as beforeShowDay function to prevent selection of weekends.
+	 * @param  date  Date - the date to customise
+	 * @return [boolean, string] - is this date selectable?, what is its CSS class?
+	 */
+	noWeekends: function(date) {
+		var day = date.getDay();
+		return [(day > 0 && day < 6), ""];
+	},
+
+	/* Set as calculateWeek to determine the week of the year based on the ISO 8601 definition.
+	 * @param  date  Date - the date to get the week for
+	 * @return  number - the number of the week within the year that contains this date
+	 */
+	iso8601Week: function(date) {
+		var time,
+			checkDate = new Date(date.getTime());
+
+		// Find Thursday of this week starting on Monday
+		checkDate.setDate(checkDate.getDate() + 4 - (checkDate.getDay() || 7));
+
+		time = checkDate.getTime();
+		checkDate.setMonth(0); // Compare with Jan 1
+		checkDate.setDate(1);
+		return Math.floor(Math.round((time - checkDate) / 86400000) / 7) + 1;
+	},
+
+	/* Parse a string value into a date object.
+	 * See formatDate below for the possible formats.
+	 *
+	 * @param  format string - the expected format of the date
+	 * @param  value string - the date in the above format
+	 * @param  settings Object - attributes include:
+	 *					shortYearCutoff  number - the cutoff year for determining the century (optional)
+	 *					dayNamesShort	string[7] - abbreviated names of the days from Sunday (optional)
+	 *					dayNames		string[7] - names of the days from Sunday (optional)
+	 *					monthNamesShort string[12] - abbreviated names of the months (optional)
+	 *					monthNames		string[12] - names of the months (optional)
+	 * @return  Date - the extracted date value or null if value is blank
+	 */
+	parseDate: function (format, value, settings) {
+		if (format == null || value == null) {
+			throw "Invalid arguments";
+		}
+
+		value = (typeof value === "object" ? value.toString() : value + "");
+		if (value === "") {
+			return null;
+		}
+
+		var iFormat, dim, extra,
+			iValue = 0,
+			shortYearCutoffTemp = (settings ? settings.shortYearCutoff : null) || this._defaults.shortYearCutoff,
+			shortYearCutoff = (typeof shortYearCutoffTemp !== "string" ? shortYearCutoffTemp :
+				new Date().getFullYear() % 100 + parseInt(shortYearCutoffTemp, 10)),
+			dayNamesShort = (settings ? settings.dayNamesShort : null) || this._defaults.dayNamesShort,
+			dayNames = (settings ? settings.dayNames : null) || this._defaults.dayNames,
+			monthNamesShort = (settings ? settings.monthNamesShort : null) || this._defaults.monthNamesShort,
+			monthNames = (settings ? settings.monthNames : null) || this._defaults.monthNames,
+			year = -1,
+			month = -1,
+			day = -1,
+			doy = -1,
+			literal = false,
+			date,
+			// Check whether a format character is doubled
+			lookAhead = function(match) {
+				var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) === match);
+				if (matches) {
+					iFormat++;
+				}
+				return matches;
+			},
+			// Extract a number from the string value
+			getNumber = function(match) {
+				var isDoubled = lookAhead(match),
+					size = (match === "@" ? 14 : (match === "!" ? 20 :
+					(match === "y" && isDoubled ? 4 : (match === "o" ? 3 : 2)))),
+					digits = new RegExp("^\\d{1," + size + "}"),
+					num = value.substring(iValue).match(digits);
+				if (!num) {
+					throw "Missing number at position " + iValue;
+				}
+				iValue += num[0].length;
+				return parseInt(num[0], 10);
+			},
+			// Extract a name from the string value and convert to an index
+			getName = function(match, shortNames, longNames) {
+				var index = -1,
+					names = $.map(lookAhead(match) ? longNames : shortNames, function (v, k) {
+						return [ [k, v] ];
+					}).sort(function (a, b) {
+						return -(a[1].length - b[1].length);
+					});
+
+				$.each(names, function (i, pair) {
+					var name = pair[1];
+					if (value.substr(iValue, name.length).toLowerCase() === name.toLowerCase()) {
+						index = pair[0];
+						iValue += name.length;
+						return false;
+					}
+				});
+				if (index !== -1) {
+					return index + 1;
+				} else {
+					throw "Unknown name at position " + iValue;
+				}
+			},
+			// Confirm that a literal character matches the string value
+			checkLiteral = function() {
+				if (value.charAt(iValue) !== format.charAt(iFormat)) {
+					throw "Unexpected literal at position " + iValue;
+				}
+				iValue++;
+			};
+
+		for (iFormat = 0; iFormat < format.length; iFormat++) {
+			if (literal) {
+				if (format.charAt(iFormat) === "'" && !lookAhead("'")) {
+					literal = false;
+				} else {
+					checkLiteral();
+				}
+			} else {
+				switch (format.charAt(iFormat)) {
+					case "d":
+						day = getNumber("d");
+						break;
+					case "D":
+						getName("D", dayNamesShort, dayNames);
+						break;
+					case "o":
+						doy = getNumber("o");
+						break;
+					case "m":
+						month = getNumber("m");
+						break;
+					case "M":
+						month = getName("M", monthNamesShort, monthNames);
+						break;
+					case "y":
+						year = getNumber("y");
+						break;
+					case "@":
+						date = new Date(getNumber("@"));
+						year = date.getFullYear();
+						month = date.getMonth() + 1;
+						day = date.getDate();
+						break;
+					case "!":
+						date = new Date((getNumber("!") - this._ticksTo1970) / 10000);
+						year = date.getFullYear();
+						month = date.getMonth() + 1;
+						day = date.getDate();
+						break;
+					case "'":
+						if (lookAhead("'")){
+							checkLiteral();
+						} else {
+							literal = true;
+						}
+						break;
+					default:
+						checkLiteral();
+				}
+			}
+		}
+
+		if (iValue < value.length){
+			extra = value.substr(iValue);
+			if (!/^\s+/.test(extra)) {
+				throw "Extra/unparsed characters found in date: " + extra;
+			}
+		}
+
+		if (year === -1) {
+			year = new Date().getFullYear();
+		} else if (year < 100) {
+			year += new Date().getFullYear() - new Date().getFullYear() % 100 +
+				(year <= shortYearCutoff ? 0 : -100);
+		}
+
+		if (doy > -1) {
+			month = 1;
+			day = doy;
+			do {
+				dim = this._getDaysInMonth(year, month - 1);
+				if (day <= dim) {
+					break;
+				}
+				month++;
+				day -= dim;
+			} while (true);
+		}
+
+		date = this._daylightSavingAdjust(new Date(year, month - 1, day));
+		if (date.getFullYear() !== year || date.getMonth() + 1 !== month || date.getDate() !== day) {
+			throw "Invalid date"; // E.g. 31/02/00
+		}
+		return date;
+	},
+
+	/* Standard date formats. */
+	ATOM: "yy-mm-dd", // RFC 3339 (ISO 8601)
+	COOKIE: "D, dd M yy",
+	ISO_8601: "yy-mm-dd",
+	RFC_822: "D, d M y",
+	RFC_850: "DD, dd-M-y",
+	RFC_1036: "D, d M y",
+	RFC_1123: "D, d M yy",
+	RFC_2822: "D, d M yy",
+	RSS: "D, d M y", // RFC 822
+	TICKS: "!",
+	TIMESTAMP: "@",
+	W3C: "yy-mm-dd", // ISO 8601
+
+	_ticksTo1970: (((1970 - 1) * 365 + Math.floor(1970 / 4) - Math.floor(1970 / 100) +
+		Math.floor(1970 / 400)) * 24 * 60 * 60 * 10000000),
+
+	/* Format a date object into a string value.
+	 * The format can be combinations of the following:
+	 * d  - day of month (no leading zero)
+	 * dd - day of month (two digit)
+	 * o  - day of year (no leading zeros)
+	 * oo - day of year (three digit)
+	 * D  - day name short
+	 * DD - day name long
+	 * m  - month of year (no leading zero)
+	 * mm - month of year (two digit)
+	 * M  - month name short
+	 * MM - month name long
+	 * y  - year (two digit)
+	 * yy - year (four digit)
+	 * @ - Unix timestamp (ms since 01/01/1970)
+	 * ! - Windows ticks (100ns since 01/01/0001)
+	 * "..." - literal text
+	 * '' - single quote
+	 *
+	 * @param  format string - the desired format of the date
+	 * @param  date Date - the date value to format
+	 * @param  settings Object - attributes include:
+	 *					dayNamesShort	string[7] - abbreviated names of the days from Sunday (optional)
+	 *					dayNames		string[7] - names of the days from Sunday (optional)
+	 *					monthNamesShort string[12] - abbreviated names of the months (optional)
+	 *					monthNames		string[12] - names of the months (optional)
+	 * @return  string - the date in the above format
+	 */
+	formatDate: function (format, date, settings) {
+		if (!date) {
+			return "";
+		}
+
+		var iFormat,
+			dayNamesShort = (settings ? settings.dayNamesShort : null) || this._defaults.dayNamesShort,
+			dayNames = (settings ? settings.dayNames : null) || this._defaults.dayNames,
+			monthNamesShort = (settings ? settings.monthNamesShort : null) || this._defaults.monthNamesShort,
+			monthNames = (settings ? settings.monthNames : null) || this._defaults.monthNames,
+			// Check whether a format character is doubled
+			lookAhead = function(match) {
+				var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) === match);
+				if (matches) {
+					iFormat++;
+				}
+				return matches;
+			},
+			// Format a number, with leading zero if necessary
+			formatNumber = function(match, value, len) {
+				var num = "" + value;
+				if (lookAhead(match)) {
+					while (num.length < len) {
+						num = "0" + num;
+					}
+				}
+				return num;
+			},
+			// Format a name, short or long as requested
+			formatName = function(match, value, shortNames, longNames) {
+				return (lookAhead(match) ? longNames[value] : shortNames[value]);
+			},
+			output = "",
+			literal = false;
+
+		if (date) {
+			for (iFormat = 0; iFormat < format.length; iFormat++) {
+				if (literal) {
+					if (format.charAt(iFormat) === "'" && !lookAhead("'")) {
+						literal = false;
+					} else {
+						output += format.charAt(iFormat);
+					}
+				} else {
+					switch (format.charAt(iFormat)) {
+						case "d":
+							output += formatNumber("d", date.getDate(), 2);
+							break;
+						case "D":
+							output += formatName("D", date.getDay(), dayNamesShort, dayNames);
+							break;
+						case "o":
+							output += formatNumber("o",
+								Math.round((new Date(date.getFullYear(), date.getMonth(), date.getDate()).getTime() - new Date(date.getFullYear(), 0, 0).getTime()) / 86400000), 3);
+							break;
+						case "m":
+							output += formatNumber("m", date.getMonth() + 1, 2);
+							break;
+						case "M":
+							output += formatName("M", date.getMonth(), monthNamesShort, monthNames);
+							break;
+						case "y":
+							output += (lookAhead("y") ? date.getFullYear() :
+								(date.getYear() % 100 < 10 ? "0" : "") + date.getYear() % 100);
+							break;
+						case "@":
+							output += date.getTime();
+							break;
+						case "!":
+							output += date.getTime() * 10000 + this._ticksTo1970;
+							break;
+						case "'":
+							if (lookAhead("'")) {
+								output += "'";
+							} else {
+								literal = true;
+							}
+							break;
+						default:
+							output += format.charAt(iFormat);
+					}
+				}
+			}
+		}
+		return output;
+	},
+
+	/* Extract all possible characters from the date format. */
+	_possibleChars: function (format) {
+		var iFormat,
+			chars = "",
+			literal = false,
+			// Check whether a format character is doubled
+			lookAhead = function(match) {
+				var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) === match);
+				if (matches) {
+					iFormat++;
+				}
+				return matches;
+			};
+
+		for (iFormat = 0; iFormat < format.length; iFormat++) {
+			if (literal) {
+				if (format.charAt(iFormat) === "'" && !lookAhead("'")) {
+					literal = false;
+				} else {
+					chars += format.charAt(iFormat);
+				}
+			} else {
+				switch (format.charAt(iFormat)) {
+					case "d": case "m": case "y": case "@":
+						chars += "0123456789";
+						break;
+					case "D": case "M":
+						return null; // Accept anything
+					case "'":
+						if (lookAhead("'")) {
+							chars += "'";
+						} else {
+							literal = true;
+						}
+						break;
+					default:
+						chars += format.charAt(iFormat);
+				}
+			}
+		}
+		return chars;
+	},
+
+	/* Get a setting value, defaulting if necessary. */
+	_get: function(inst, name) {
+		return inst.settings[name] !== undefined ?
+			inst.settings[name] : this._defaults[name];
+	},
+
+	/* Parse existing date and initialise date picker. */
+	_setDateFromField: function(inst, noDefault) {
+		if (inst.input.val() === inst.lastVal) {
+			return;
+		}
+
+		var dateFormat = this._get(inst, "dateFormat"),
+			dates = inst.lastVal = inst.input ? inst.input.val() : null,
+			defaultDate = this._getDefaultDate(inst),
+			date = defaultDate,
+			settings = this._getFormatConfig(inst);
+
+		try {
+			date = this.parseDate(dateFormat, dates, settings) || defaultDate;
+		} catch (event) {
+			dates = (noDefault ? "" : dates);
+		}
+		inst.selectedDay = date.getDate();
+		inst.drawMonth = inst.selectedMonth = date.getMonth();
+		inst.drawYear = inst.selectedYear = date.getFullYear();
+		inst.currentDay = (dates ? date.getDate() : 0);
+		inst.currentMonth = (dates ? date.getMonth() : 0);
+		inst.currentYear = (dates ? date.getFullYear() : 0);
+		this._adjustInstDate(inst);
+	},
+
+	/* Retrieve the default date shown on opening. */
+	_getDefaultDate: function(inst) {
+		return this._restrictMinMax(inst,
+			this._determineDate(inst, this._get(inst, "defaultDate"), new Date()));
+	},
+
+	/* A date may be specified as an exact value or a relative one. */
+	_determineDate: function(inst, date, defaultDate) {
+		var offsetNumeric = function(offset) {
+				var date = new Date();
+				date.setDate(date.getDate() + offset);
+				return date;
+			},
+			offsetString = function(offset) {
+				try {
+					return $.datepicker.parseDate($.datepicker._get(inst, "dateFormat"),
+						offset, $.datepicker._getFormatConfig(inst));
+				}
+				catch (e) {
+					// Ignore
+				}
+
+				var date = (offset.toLowerCase().match(/^c/) ?
+					$.datepicker._getDate(inst) : null) || new Date(),
+					year = date.getFullYear(),
+					month = date.getMonth(),
+					day = date.getDate(),
+					pattern = /([+\-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,
+					matches = pattern.exec(offset);
+
+				while (matches) {
+					switch (matches[2] || "d") {
+						case "d" : case "D" :
+							day += parseInt(matches[1],10); break;
+						case "w" : case "W" :
+							day += parseInt(matches[1],10) * 7; break;
+						case "m" : case "M" :
+							month += parseInt(matches[1],10);
+							day = Math.min(day, $.datepicker._getDaysInMonth(year, month));
+							break;
+						case "y": case "Y" :
+							year += parseInt(matches[1],10);
+							day = Math.min(day, $.datepicker._getDaysInMonth(year, month));
+							break;
+					}
+					matches = pattern.exec(offset);
+				}
+				return new Date(year, month, day);
+			},
+			newDate = (date == null || date === "" ? defaultDate : (typeof date === "string" ? offsetString(date) :
+				(typeof date === "number" ? (isNaN(date) ? defaultDate : offsetNumeric(date)) : new Date(date.getTime()))));
+
+		newDate = (newDate && newDate.toString() === "Invalid Date" ? defaultDate : newDate);
+		if (newDate) {
+			newDate.setHours(0);
+			newDate.setMinutes(0);
+			newDate.setSeconds(0);
+			newDate.setMilliseconds(0);
+		}
+		return this._daylightSavingAdjust(newDate);
+	},
+
+	/* Handle switch to/from daylight saving.
+	 * Hours may be non-zero on daylight saving cut-over:
+	 * > 12 when midnight changeover, but then cannot generate
+	 * midnight datetime, so jump to 1AM, otherwise reset.
+	 * @param  date  (Date) the date to check
+	 * @return  (Date) the corrected date
+	 */
+	_daylightSavingAdjust: function(date) {
+		if (!date) {
+			return null;
+		}
+		date.setHours(date.getHours() > 12 ? date.getHours() + 2 : 0);
+		return date;
+	},
+
+	/* Set the date(s) directly. */
+	_setDate: function(inst, date, noChange) {
+		var clear = !date,
+			origMonth = inst.selectedMonth,
+			origYear = inst.selectedYear,
+			newDate = this._restrictMinMax(inst, this._determineDate(inst, date, new Date()));
+
+		inst.selectedDay = inst.currentDay = newDate.getDate();
+		inst.drawMonth = inst.selectedMonth = inst.currentMonth = newDate.getMonth();
+		inst.drawYear = inst.selectedYear = inst.currentYear = newDate.getFullYear();
+		if ((origMonth !== inst.selectedMonth || origYear !== inst.selectedYear) && !noChange) {
+			this._notifyChange(inst);
+		}
+		this._adjustInstDate(inst);
+		if (inst.input) {
+			inst.input.val(clear ? "" : this._formatDate(inst));
+		}
+	},
+
+	/* Retrieve the date(s) directly. */
+	_getDate: function(inst) {
+		var startDate = (!inst.currentYear || (inst.input && inst.input.val() === "") ? null :
+			this._daylightSavingAdjust(new Date(
+			inst.currentYear, inst.currentMonth, inst.currentDay)));
+			return startDate;
+	},
+
+	/* Attach the onxxx handlers.  These are declared statically so
+	 * they work with static code transformers like Caja.
+	 */
+	_attachHandlers: function(inst) {
+		var stepMonths = this._get(inst, "stepMonths"),
+			id = "#" + inst.id.replace( /\\\\/g, "\\" );
+		inst.dpDiv.find("[data-handler]").map(function () {
+			var handler = {
+				prev: function () {
+					$.datepicker._adjustDate(id, -stepMonths, "M");
+				},
+				next: function () {
+					$.datepicker._adjustDate(id, +stepMonths, "M");
+				},
+				hide: function () {
+					$.datepicker._hideDatepicker();
+				},
+				today: function () {
+					$.datepicker._gotoToday(id);
+				},
+				selectDay: function () {
+					$.datepicker._selectDay(id, +this.getAttribute("data-month"), +this.getAttribute("data-year"), this);
+					return false;
+				},
+				selectMonth: function () {
+					$.datepicker._selectMonthYear(id, this, "M");
+					return false;
+				},
+				selectYear: function () {
+					$.datepicker._selectMonthYear(id, this, "Y");
+					return false;
+				}
+			};
+			$(this).bind(this.getAttribute("data-event"), handler[this.getAttribute("data-handler")]);
+		});
+	},
+
+	/* Generate the HTML for the current state of the date picker. */
+	_generateHTML: function(inst) {
+		var maxDraw, prevText, prev, nextText, next, currentText, gotoDate,
+			controls, buttonPanel, firstDay, showWeek, dayNames, dayNamesMin,
+			monthNames, monthNamesShort, beforeShowDay, showOtherMonths,
+			selectOtherMonths, defaultDate, html, dow, row, group, col, selectedDate,
+			cornerClass, calender, thead, day, daysInMonth, leadDays, curRows, numRows,
+			printDate, dRow, tbody, daySettings, otherMonth, unselectable,
+			tempDate = new Date(),
+			today = this._daylightSavingAdjust(
+				new Date(tempDate.getFullYear(), tempDate.getMonth(), tempDate.getDate())), // clear time
+			isRTL = this._get(inst, "isRTL"),
+			showButtonPanel = this._get(inst, "showButtonPanel"),
+			hideIfNoPrevNext = this._get(inst, "hideIfNoPrevNext"),
+			navigationAsDateFormat = this._get(inst, "navigationAsDateFormat"),
+			numMonths = this._getNumberOfMonths(inst),
+			showCurrentAtPos = this._get(inst, "showCurrentAtPos"),
+			stepMonths = this._get(inst, "stepMonths"),
+			isMultiMonth = (numMonths[0] !== 1 || numMonths[1] !== 1),
+			currentDate = this._daylightSavingAdjust((!inst.currentDay ? new Date(9999, 9, 9) :
+				new Date(inst.currentYear, inst.currentMonth, inst.currentDay))),
+			minDate = this._getMinMaxDate(inst, "min"),
+			maxDate = this._getMinMaxDate(inst, "max"),
+			drawMonth = inst.drawMonth - showCurrentAtPos,
+			drawYear = inst.drawYear;
+
+		if (drawMonth < 0) {
+			drawMonth += 12;
+			drawYear--;
+		}
+		if (maxDate) {
+			maxDraw = this._daylightSavingAdjust(new Date(maxDate.getFullYear(),
+				maxDate.getMonth() - (numMonths[0] * numMonths[1]) + 1, maxDate.getDate()));
+			maxDraw = (minDate && maxDraw < minDate ? minDate : maxDraw);
+			while (this._daylightSavingAdjust(new Date(drawYear, drawMonth, 1)) > maxDraw) {
+				drawMonth--;
+				if (drawMonth < 0) {
+					drawMonth = 11;
+					drawYear--;
+				}
+			}
+		}
+		inst.drawMonth = drawMonth;
+		inst.drawYear = drawYear;
+
+		prevText = this._get(inst, "prevText");
+		prevText = (!navigationAsDateFormat ? prevText : this.formatDate(prevText,
+			this._daylightSavingAdjust(new Date(drawYear, drawMonth - stepMonths, 1)),
+			this._getFormatConfig(inst)));
+
+		prev = (this._canAdjustMonth(inst, -1, drawYear, drawMonth) ?
+			"<a class='ui-datepicker-prev ui-corner-all' data-handler='prev' data-event='click'" +
+			" title='" + prevText + "'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "e" : "w") + "'>" + prevText + "</span></a>" :
+			(hideIfNoPrevNext ? "" : "<a class='ui-datepicker-prev ui-corner-all ui-state-disabled' title='"+ prevText +"'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "e" : "w") + "'>" + prevText + "</span></a>"));
+
+		nextText = this._get(inst, "nextText");
+		nextText = (!navigationAsDateFormat ? nextText : this.formatDate(nextText,
+			this._daylightSavingAdjust(new Date(drawYear, drawMonth + stepMonths, 1)),
+			this._getFormatConfig(inst)));
+
+		next = (this._canAdjustMonth(inst, +1, drawYear, drawMonth) ?
+			"<a class='ui-datepicker-next ui-corner-all' data-handler='next' data-event='click'" +
+			" title='" + nextText + "'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "w" : "e") + "'>" + nextText + "</span></a>" :
+			(hideIfNoPrevNext ? "" : "<a class='ui-datepicker-next ui-corner-all ui-state-disabled' title='"+ nextText + "'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "w" : "e") + "'>" + nextText + "</span></a>"));
+
+		currentText = this._get(inst, "currentText");
+		gotoDate = (this._get(inst, "gotoCurrent") && inst.currentDay ? currentDate : today);
+		currentText = (!navigationAsDateFormat ? currentText :
+			this.formatDate(currentText, gotoDate, this._getFormatConfig(inst)));
+
+		controls = (!inst.inline ? "<button type='button' class='ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all' data-handler='hide' data-event='click'>" +
+			this._get(inst, "closeText") + "</button>" : "");
+
+		buttonPanel = (showButtonPanel) ? "<div class='ui-datepicker-buttonpane ui-widget-content'>" + (isRTL ? controls : "") +
+			(this._isInRange(inst, gotoDate) ? "<button type='button' class='ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all' data-handler='today' data-event='click'" +
+			">" + currentText + "</button>" : "") + (isRTL ? "" : controls) + "</div>" : "";
+
+		firstDay = parseInt(this._get(inst, "firstDay"),10);
+		firstDay = (isNaN(firstDay) ? 0 : firstDay);
+
+		showWeek = this._get(inst, "showWeek");
+		dayNames = this._get(inst, "dayNames");
+		dayNamesMin = this._get(inst, "dayNamesMin");
+		monthNames = this._get(inst, "monthNames");
+		monthNamesShort = this._get(inst, "monthNamesShort");
+		beforeShowDay = this._get(inst, "beforeShowDay");
+		showOtherMonths = this._get(inst, "showOtherMonths");
+		selectOtherMonths = this._get(inst, "selectOtherMonths");
+		defaultDate = this._getDefaultDate(inst);
+		html = "";
+		dow;
+		for (row = 0; row < numMonths[0]; row++) {
+			group = "";
+			this.maxRows = 4;
+			for (col = 0; col < numMonths[1]; col++) {
+				selectedDate = this._daylightSavingAdjust(new Date(drawYear, drawMonth, inst.selectedDay));
+				cornerClass = " ui-corner-all";
+				calender = "";
+				if (isMultiMonth) {
+					calender += "<div class='ui-datepicker-group";
+					if (numMonths[1] > 1) {
+						switch (col) {
+							case 0: calender += " ui-datepicker-group-first";
+								cornerClass = " ui-corner-" + (isRTL ? "right" : "left"); break;
+							case numMonths[1]-1: calender += " ui-datepicker-group-last";
+								cornerClass = " ui-corner-" + (isRTL ? "left" : "right"); break;
+							default: calender += " ui-datepicker-group-middle"; cornerClass = ""; break;
+						}
+					}
+					calender += "'>";
+				}
+				calender += "<div class='ui-datepicker-header ui-widget-header ui-helper-clearfix" + cornerClass + "'>" +
+					(/all|left/.test(cornerClass) && row === 0 ? (isRTL ? next : prev) : "") +
+					(/all|right/.test(cornerClass) && row === 0 ? (isRTL ? prev : next) : "") +
+					this._generateMonthYearHeader(inst, drawMonth, drawYear, minDate, maxDate,
+					row > 0 || col > 0, monthNames, monthNamesShort) + // draw month headers
+					"</div><table class='ui-datepicker-calendar'><thead>" +
+					"<tr>";
+				thead = (showWeek ? "<th class='ui-datepicker-week-col'>" + this._get(inst, "weekHeader") + "</th>" : "");
+				for (dow = 0; dow < 7; dow++) { // days of the week
+					day = (dow + firstDay) % 7;
+					thead += "<th" + ((dow + firstDay + 6) % 7 >= 5 ? " class='ui-datepicker-week-end'" : "") + ">" +
+						"<span title='" + dayNames[day] + "'>" + dayNamesMin[day] + "</span></th>";
+				}
+				calender += thead + "</tr></thead><tbody>";
+				daysInMonth = this._getDaysInMonth(drawYear, drawMonth);
+				if (drawYear === inst.selectedYear && drawMonth === inst.selectedMonth) {
+					inst.selectedDay = Math.min(inst.selectedDay, daysInMonth);
+				}
+				leadDays = (this._getFirstDayOfMonth(drawYear, drawMonth) - firstDay + 7) % 7;
+				curRows = Math.ceil((leadDays + daysInMonth) / 7); // calculate the number of rows to generate
+				numRows = (isMultiMonth ? this.maxRows > curRows ? this.maxRows : curRows : curRows); //If multiple months, use the higher number of rows (see #7043)
+				this.maxRows = numRows;
+				printDate = this._daylightSavingAdjust(new Date(drawYear, drawMonth, 1 - leadDays));
+				for (dRow = 0; dRow < numRows; dRow++) { // create date picker rows
+					calender += "<tr>";
+					tbody = (!showWeek ? "" : "<td class='ui-datepicker-week-col'>" +
+						this._get(inst, "calculateWeek")(printDate) + "</td>");
+					for (dow = 0; dow < 7; dow++) { // create date picker days
+						daySettings = (beforeShowDay ?
+							beforeShowDay.apply((inst.input ? inst.input[0] : null), [printDate]) : [true, ""]);
+						otherMonth = (printDate.getMonth() !== drawMonth);
+						unselectable = (otherMonth && !selectOtherMonths) || !daySettings[0] ||
+							(minDate && printDate < minDate) || (maxDate && printDate > maxDate);
+						tbody += "<td class='" +
+							((dow + firstDay + 6) % 7 >= 5 ? " ui-datepicker-week-end" : "") + // highlight weekends
+							(otherMonth ? " ui-datepicker-other-month" : "") + // highlight days from other months
+							((printDate.getTime() === selectedDate.getTime() && drawMonth === inst.selectedMonth && inst._keyEvent) || // user pressed key
+							(defaultDate.getTime() === printDate.getTime() && defaultDate.getTime() === selectedDate.getTime()) ?
+							// or defaultDate is current printedDate and defaultDate is selectedDate
+							" " + this._dayOverClass : "") + // highlight selected day
+							(unselectable ? " " + this._unselectableClass + " ui-state-disabled": "") +  // highlight unselectable days
+							(otherMonth && !showOtherMonths ? "" : " " + daySettings[1] + // highlight custom dates
+							(printDate.getTime() === currentDate.getTime() ? " " + this._currentClass : "") + // highlight selected day
+							(printDate.getTime() === today.getTime() ? " ui-datepicker-today" : "")) + "'" + // highlight today (if different)
+							((!otherMonth || showOtherMonths) && daySettings[2] ? " title='" + daySettings[2].replace(/'/g, "&#39;") + "'" : "") + // cell title
+							(unselectable ? "" : " data-handler='selectDay' data-event='click' data-month='" + printDate.getMonth() + "' data-year='" + printDate.getFullYear() + "'") + ">" + // actions
+							(otherMonth && !showOtherMonths ? "&#xa0;" : // display for other months
+							(unselectable ? "<span class='ui-state-default'>" + printDate.getDate() + "</span>" : "<a class='ui-state-default" +
+							(printDate.getTime() === today.getTime() ? " ui-state-highlight" : "") +
+							(printDate.getTime() === currentDate.getTime() ? " ui-state-active" : "") + // highlight selected day
+							(otherMonth ? " ui-priority-secondary" : "") + // distinguish dates from other months
+							"' href='#'>" + printDate.getDate() + "</a>")) + "</td>"; // display selectable date
+						printDate.setDate(printDate.getDate() + 1);
+						printDate = this._daylightSavingAdjust(printDate);
+					}
+					calender += tbody + "</tr>";
+				}
+				drawMonth++;
+				if (drawMonth > 11) {
+					drawMonth = 0;
+					drawYear++;
+				}
+				calender += "</tbody></table>" + (isMultiMonth ? "</div>" +
+							((numMonths[0] > 0 && col === numMonths[1]-1) ? "<div class='ui-datepicker-row-break'></div>" : "") : "");
+				group += calender;
+			}
+			html += group;
+		}
+		html += buttonPanel;
+		inst._keyEvent = false;
+		return html;
+	},
+
+	/* Generate the month and year header. */
+	_generateMonthYearHeader: function(inst, drawMonth, drawYear, minDate, maxDate,
+			secondary, monthNames, monthNamesShort) {
+
+		var inMinYear, inMaxYear, month, years, thisYear, determineYear, year, endYear,
+			changeMonth = this._get(inst, "changeMonth"),
+			changeYear = this._get(inst, "changeYear"),
+			showMonthAfterYear = this._get(inst, "showMonthAfterYear"),
+			html = "<div class='ui-datepicker-title'>",
+			monthHtml = "";
+
+		// month selection
+		if (secondary || !changeMonth) {
+			monthHtml += "<span class='ui-datepicker-month'>" + monthNames[drawMonth] + "</span>";
+		} else {
+			inMinYear = (minDate && minDate.getFullYear() === drawYear);
+			inMaxYear = (maxDate && maxDate.getFullYear() === drawYear);
+			monthHtml += "<select class='ui-datepicker-month' data-handler='selectMonth' data-event='change'>";
+			for ( month = 0; month < 12; month++) {
+				if ((!inMinYear || month >= minDate.getMonth()) && (!inMaxYear || month <= maxDate.getMonth())) {
+					monthHtml += "<option value='" + month + "'" +
+						(month === drawMonth ? " selected='selected'" : "") +
+						">" + monthNamesShort[month] + "</option>";
+				}
+			}
+			monthHtml += "</select>";
+		}
+
+		if (!showMonthAfterYear) {
+			html += monthHtml + (secondary || !(changeMonth && changeYear) ? "&#xa0;" : "");
+		}
+
+		// year selection
+		if ( !inst.yearshtml ) {
+			inst.yearshtml = "";
+			if (secondary || !changeYear) {
+				html += "<span class='ui-datepicker-year'>" + drawYear + "</span>";
+			} else {
+				// determine range of years to display
+				years = this._get(inst, "yearRange").split(":");
+				thisYear = new Date().getFullYear();
+				determineYear = function(value) {
+					var year = (value.match(/c[+\-].*/) ? drawYear + parseInt(value.substring(1), 10) :
+						(value.match(/[+\-].*/) ? thisYear + parseInt(value, 10) :
+						parseInt(value, 10)));
+					return (isNaN(year) ? thisYear : year);
+				};
+				year = determineYear(years[0]);
+				endYear = Math.max(year, determineYear(years[1] || ""));
+				year = (minDate ? Math.max(year, minDate.getFullYear()) : year);
+				endYear = (maxDate ? Math.min(endYear, maxDate.getFullYear()) : endYear);
+				inst.yearshtml += "<select class='ui-datepicker-year' data-handler='selectYear' data-event='change'>";
+				for (; year <= endYear; year++) {
+					inst.yearshtml += "<option value='" + year + "'" +
+						(year === drawYear ? " selected='selected'" : "") +
+						">" + year + "</option>";
+				}
+				inst.yearshtml += "</select>";
+
+				html += inst.yearshtml;
+				inst.yearshtml = null;
+			}
+		}
+
+		html += this._get(inst, "yearSuffix");
+		if (showMonthAfterYear) {
+			html += (secondary || !(changeMonth && changeYear) ? "&#xa0;" : "") + monthHtml;
+		}
+		html += "</div>"; // Close datepicker_header
+		return html;
+	},
+
+	/* Adjust one of the date sub-fields. */
+	_adjustInstDate: function(inst, offset, period) {
+		var year = inst.drawYear + (period === "Y" ? offset : 0),
+			month = inst.drawMonth + (period === "M" ? offset : 0),
+			day = Math.min(inst.selectedDay, this._getDaysInMonth(year, month)) + (period === "D" ? offset : 0),
+			date = this._restrictMinMax(inst, this._daylightSavingAdjust(new Date(year, month, day)));
+
+		inst.selectedDay = date.getDate();
+		inst.drawMonth = inst.selectedMonth = date.getMonth();
+		inst.drawYear = inst.selectedYear = date.getFullYear();
+		if (period === "M" || period === "Y") {
+			this._notifyChange(inst);
+		}
+	},
+
+	/* Ensure a date is within any min/max bounds. */
+	_restrictMinMax: function(inst, date) {
+		var minDate = this._getMinMaxDate(inst, "min"),
+			maxDate = this._getMinMaxDate(inst, "max"),
+			newDate = (minDate && date < minDate ? minDate : date);
+		return (maxDate && newDate > maxDate ? maxDate : newDate);
+	},
+
+	/* Notify change of month/year. */
+	_notifyChange: function(inst) {
+		var onChange = this._get(inst, "onChangeMonthYear");
+		if (onChange) {
+			onChange.apply((inst.input ? inst.input[0] : null),
+				[inst.selectedYear, inst.selectedMonth + 1, inst]);
+		}
+	},
+
+	/* Determine the number of months to show. */
+	_getNumberOfMonths: function(inst) {
+		var numMonths = this._get(inst, "numberOfMonths");
+		return (numMonths == null ? [1, 1] : (typeof numMonths === "number" ? [1, numMonths] : numMonths));
+	},
+
+	/* Determine the current maximum date - ensure no time components are set. */
+	_getMinMaxDate: function(inst, minMax) {
+		return this._determineDate(inst, this._get(inst, minMax + "Date"), null);
+	},
+
+	/* Find the number of days in a given month. */
+	_getDaysInMonth: function(year, month) {
+		return 32 - this._daylightSavingAdjust(new Date(year, month, 32)).getDate();
+	},
+
+	/* Find the day of the week of the first of a month. */
+	_getFirstDayOfMonth: function(year, month) {
+		return new Date(year, month, 1).getDay();
+	},
+
+	/* Determines if we should allow a "next/prev" month display change. */
+	_canAdjustMonth: function(inst, offset, curYear, curMonth) {
+		var numMonths = this._getNumberOfMonths(inst),
+			date = this._daylightSavingAdjust(new Date(curYear,
+			curMonth + (offset < 0 ? offset : numMonths[0] * numMonths[1]), 1));
+
+		if (offset < 0) {
+			date.setDate(this._getDaysInMonth(date.getFullYear(), date.getMonth()));
+		}
+		return this._isInRange(inst, date);
+	},
+
+	/* Is the given date in the accepted range? */
+	_isInRange: function(inst, date) {
+		var yearSplit, currentYear,
+			minDate = this._getMinMaxDate(inst, "min"),
+			maxDate = this._getMinMaxDate(inst, "max"),
+			minYear = null,
+			maxYear = null,
+			years = this._get(inst, "yearRange");
+			if (years){
+				yearSplit = years.split(":");
+				currentYear = new Date().getFullYear();
+				minYear = parseInt(yearSplit[0], 10);
+				maxYear = parseInt(yearSplit[1], 10);
+				if ( yearSplit[0].match(/[+\-].*/) ) {
+					minYear += currentYear;
+				}
+				if ( yearSplit[1].match(/[+\-].*/) ) {
+					maxYear += currentYear;
+				}
+			}
+
+		return ((!minDate || date.getTime() >= minDate.getTime()) &&
+			(!maxDate || date.getTime() <= maxDate.getTime()) &&
+			(!minYear || date.getFullYear() >= minYear) &&
+			(!maxYear || date.getFullYear() <= maxYear));
+	},
+
+	/* Provide the configuration settings for formatting/parsing. */
+	_getFormatConfig: function(inst) {
+		var shortYearCutoff = this._get(inst, "shortYearCutoff");
+		shortYearCutoff = (typeof shortYearCutoff !== "string" ? shortYearCutoff :
+			new Date().getFullYear() % 100 + parseInt(shortYearCutoff, 10));
+		return {shortYearCutoff: shortYearCutoff,
+			dayNamesShort: this._get(inst, "dayNamesShort"), dayNames: this._get(inst, "dayNames"),
+			monthNamesShort: this._get(inst, "monthNamesShort"), monthNames: this._get(inst, "monthNames")};
+	},
+
+	/* Format the given date for display. */
+	_formatDate: function(inst, day, month, year) {
+		if (!day) {
+			inst.currentDay = inst.selectedDay;
+			inst.currentMonth = inst.selectedMonth;
+			inst.currentYear = inst.selectedYear;
+		}
+		var date = (day ? (typeof day === "object" ? day :
+			this._daylightSavingAdjust(new Date(year, month, day))) :
+			this._daylightSavingAdjust(new Date(inst.currentYear, inst.currentMonth, inst.currentDay)));
+		return this.formatDate(this._get(inst, "dateFormat"), date, this._getFormatConfig(inst));
+	}
+});
+
+/*
+ * Bind hover events for datepicker elements.
+ * Done via delegate so the binding only occurs once in the lifetime of the parent div.
+ * Global instActive, set by _updateDatepicker allows the handlers to find their way back to the active picker.
+ */
+function bindHover(dpDiv) {
+	var selector = "button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a";
+	return dpDiv.delegate(selector, "mouseout", function() {
+			$(this).removeClass("ui-state-hover");
+			if (this.className.indexOf("ui-datepicker-prev") !== -1) {
+				$(this).removeClass("ui-datepicker-prev-hover");
+			}
+			if (this.className.indexOf("ui-datepicker-next") !== -1) {
+				$(this).removeClass("ui-datepicker-next-hover");
+			}
+		})
+		.delegate(selector, "mouseover", function(){
+			if (!$.datepicker._isDisabledDatepicker( instActive.inline ? dpDiv.parent()[0] : instActive.input[0])) {
+				$(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover");
+				$(this).addClass("ui-state-hover");
+				if (this.className.indexOf("ui-datepicker-prev") !== -1) {
+					$(this).addClass("ui-datepicker-prev-hover");
+				}
+				if (this.className.indexOf("ui-datepicker-next") !== -1) {
+					$(this).addClass("ui-datepicker-next-hover");
+				}
+			}
+		});
+}
+
+/* jQuery extend now ignores nulls! */
+function extendRemove(target, props) {
+	$.extend(target, props);
+	for (var name in props) {
+		if (props[name] == null) {
+			target[name] = props[name];
+		}
+	}
+	return target;
+}
+
+/* Invoke the datepicker functionality.
+   @param  options  string - a command, optionally followed by additional parameters or
+					Object - settings for attaching new datepicker functionality
+   @return  jQuery object */
+$.fn.datepicker = function(options){
+
+	/* Verify an empty collection wasn't passed - Fixes #6976 */
+	if ( !this.length ) {
+		return this;
+	}
+
+	/* Initialise the date picker. */
+	if (!$.datepicker.initialized) {
+		$(document).mousedown($.datepicker._checkExternalClick);
+		$.datepicker.initialized = true;
+	}
+
+	/* Append datepicker main container to body if not exist. */
+	if ($("#"+$.datepicker._mainDivId).length === 0) {
+		$("body").append($.datepicker.dpDiv);
+	}
+
+	var otherArgs = Array.prototype.slice.call(arguments, 1);
+	if (typeof options === "string" && (options === "isDisabled" || options === "getDate" || options === "widget")) {
+		return $.datepicker["_" + options + "Datepicker"].
+			apply($.datepicker, [this[0]].concat(otherArgs));
+	}
+	if (options === "option" && arguments.length === 2 && typeof arguments[1] === "string") {
+		return $.datepicker["_" + options + "Datepicker"].
+			apply($.datepicker, [this[0]].concat(otherArgs));
+	}
+	return this.each(function() {
+		typeof options === "string" ?
+			$.datepicker["_" + options + "Datepicker"].
+				apply($.datepicker, [this].concat(otherArgs)) :
+			$.datepicker._attachDatepicker(this, options);
+	});
+};
+
+$.datepicker = new Datepicker(); // singleton instance
+$.datepicker.initialized = false;
+$.datepicker.uuid = new Date().getTime();
+$.datepicker.version = "1.10.3";
+
+})(jQuery);
diff --git a/data/treeio/treeio/static/js/jquery-ui-1.10.3/ui/jquery.ui.droppable.js b/data/treeio/treeio/static/js/jquery-ui-1.10.3/ui/jquery.ui.droppable.js
new file mode 100644
index 0000000..24337d0
--- /dev/null
+++ b/data/treeio/treeio/static/js/jquery-ui-1.10.3/ui/jquery.ui.droppable.js
@@ -0,0 +1,372 @@
+/*!
+ * jQuery UI Droppable 1.10.3
+ * http://jqueryui.com
+ *
+ * Copyright 2013 jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ *
+ * http://api.jqueryui.com/droppable/
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.draggable.js
+ */
+(function( $, undefined ) {
+
+function isOverAxis( x, reference, size ) {
+	return ( x > reference ) && ( x < ( reference + size ) );
+}
+
+$.widget("ui.droppable", {
+	version: "1.10.3",
+	widgetEventPrefix: "drop",
+	options: {
+		accept: "*",
+		activeClass: false,
+		addClasses: true,
+		greedy: false,
+		hoverClass: false,
+		scope: "default",
+		tolerance: "intersect",
+
+		// callbacks
+		activate: null,
+		deactivate: null,
+		drop: null,
+		out: null,
+		over: null
+	},
+	_create: function() {
+
+		var o = this.options,
+			accept = o.accept;
+
+		this.isover = false;
+		this.isout = true;
+
+		this.accept = $.isFunction(accept) ? accept : function(d) {
+			return d.is(accept);
+		};
+
+		//Store the droppable's proportions
+		this.proportions = { width: this.element[0].offsetWidth, height: this.element[0].offsetHeight };
+
+		// Add the reference and positions to the manager
+		$.ui.ddmanager.droppables[o.scope] = $.ui.ddmanager.droppables[o.scope] || [];
+		$.ui.ddmanager.droppables[o.scope].push(this);
+
+		(o.addClasses && this.element.addClass("ui-droppable"));
+
+	},
+
+	_destroy: function() {
+		var i = 0,
+			drop = $.ui.ddmanager.droppables[this.options.scope];
+
+		for ( ; i < drop.length; i++ ) {
+			if ( drop[i] === this ) {
+				drop.splice(i, 1);
+			}
+		}
+
+		this.element.removeClass("ui-droppable ui-droppable-disabled");
+	},
+
+	_setOption: function(key, value) {
+
+		if(key === "accept") {
+			this.accept = $.isFunction(value) ? value : function(d) {
+				return d.is(value);
+			};
+		}
+		$.Widget.prototype._setOption.apply(this, arguments);
+	},
+
+	_activate: function(event) {
+		var draggable = $.ui.ddmanager.current;
+		if(this.options.activeClass) {
+			this.element.addClass(this.options.activeClass);
+		}
+		if(draggable){
+			this._trigger("activate", event, this.ui(draggable));
+		}
+	},
+
+	_deactivate: function(event) {
+		var draggable = $.ui.ddmanager.current;
+		if(this.options.activeClass) {
+			this.element.removeClass(this.options.activeClass);
+		}
+		if(draggable){
+			this._trigger("deactivate", event, this.ui(draggable));
+		}
+	},
+
+	_over: function(event) {
+
+		var draggable = $.ui.ddmanager.current;
+
+		// Bail if draggable and droppable are same element
+		if (!draggable || (draggable.currentItem || draggable.element)[0] === this.element[0]) {
+			return;
+		}
+
+		if (this.accept.call(this.element[0],(draggable.currentItem || draggable.element))) {
+			if(this.options.hoverClass) {
+				this.element.addClass(this.options.hoverClass);
+			}
+			this._trigger("over", event, this.ui(draggable));
+		}
+
+	},
+
+	_out: function(event) {
+
+		var draggable = $.ui.ddmanager.current;
+
+		// Bail if draggable and droppable are same element
+		if (!draggable || (draggable.currentItem || draggable.element)[0] === this.element[0]) {
+			return;
+		}
+
+		if (this.accept.call(this.element[0],(draggable.currentItem || draggable.element))) {
+			if(this.options.hoverClass) {
+				this.element.removeClass(this.options.hoverClass);
+			}
+			this._trigger("out", event, this.ui(draggable));
+		}
+
+	},
+
+	_drop: function(event,custom) {
+
+		var draggable = custom || $.ui.ddmanager.current,
+			childrenIntersection = false;
+
+		// Bail if draggable and droppable are same element
+		if (!draggable || (draggable.currentItem || draggable.element)[0] === this.element[0]) {
+			return false;
+		}
+
+		this.element.find(":data(ui-droppable)").not(".ui-draggable-dragging").each(function() {
+			var inst = $.data(this, "ui-droppable");
+			if(
+				inst.options.greedy &&
+				!inst.options.disabled &&
+				inst.options.scope === draggable.options.scope &&
+				inst.accept.call(inst.element[0], (draggable.currentItem || draggable.element)) &&
+				$.ui.intersect(draggable, $.extend(inst, { offset: inst.element.offset() }), inst.options.tolerance)
+			) { childrenIntersection = true; return false; }
+		});
+		if(childrenIntersection) {
+			return false;
+		}
+
+		if(this.accept.call(this.element[0],(draggable.currentItem || draggable.element))) {
+			if(this.options.activeClass) {
+				this.element.removeClass(this.options.activeClass);
+			}
+			if(this.options.hoverClass) {
+				this.element.removeClass(this.options.hoverClass);
+			}
+			this._trigger("drop", event, this.ui(draggable));
+			return this.element;
+		}
+
+		return false;
+
+	},
+
+	ui: function(c) {
+		return {
+			draggable: (c.currentItem || c.element),
+			helper: c.helper,
+			position: c.position,
+			offset: c.positionAbs
+		};
+	}
+
+});
+
+$.ui.intersect = function(draggable, droppable, toleranceMode) {
+
+	if (!droppable.offset) {
+		return false;
+	}
+
+	var draggableLeft, draggableTop,
+		x1 = (draggable.positionAbs || draggable.position.absolute).left, x2 = x1 + draggable.helperProportions.width,
+		y1 = (draggable.positionAbs || draggable.position.absolute).top, y2 = y1 + draggable.helperProportions.height,
+		l = droppable.offset.left, r = l + droppable.proportions.width,
+		t = droppable.offset.top, b = t + droppable.proportions.height;
+
+	switch (toleranceMode) {
+		case "fit":
+			return (l <= x1 && x2 <= r && t <= y1 && y2 <= b);
+		case "intersect":
+			return (l < x1 + (draggable.helperProportions.width / 2) && // Right Half
+				x2 - (draggable.helperProportions.width / 2) < r && // Left Half
+				t < y1 + (draggable.helperProportions.height / 2) && // Bottom Half
+				y2 - (draggable.helperProportions.height / 2) < b ); // Top Half
+		case "pointer":
+			draggableLeft = ((draggable.positionAbs || draggable.position.absolute).left + (draggable.clickOffset || draggable.offset.click).left);
+			draggableTop = ((draggable.positionAbs || draggable.position.absolute).top + (draggable.clickOffset || draggable.offset.click).top);
+			return isOverAxis( draggableTop, t, droppable.proportions.height ) && isOverAxis( draggableLeft, l, droppable.proportions.width );
+		case "touch":
+			return (
+				(y1 >= t && y1 <= b) ||	// Top edge touching
+				(y2 >= t && y2 <= b) ||	// Bottom edge touching
+				(y1 < t && y2 > b)		// Surrounded vertically
+			) && (
+				(x1 >= l && x1 <= r) ||	// Left edge touching
+				(x2 >= l && x2 <= r) ||	// Right edge touching
+				(x1 < l && x2 > r)		// Surrounded horizontally
+			);
+		default:
+			return false;
+		}
+
+};
+
+/*
+	This manager tracks offsets of draggables and droppables
+*/
+$.ui.ddmanager = {
+	current: null,
+	droppables: { "default": [] },
+	prepareOffsets: function(t, event) {
+
+		var i, j,
+			m = $.ui.ddmanager.droppables[t.options.scope] || [],
+			type = event ? event.type : null, // workaround for #2317
+			list = (t.currentItem || t.element).find(":data(ui-droppable)").addBack();
+
+		droppablesLoop: for (i = 0; i < m.length; i++) {
+
+			//No disabled and non-accepted
+			if(m[i].options.disabled || (t && !m[i].accept.call(m[i].element[0],(t.currentItem || t.element)))) {
+				continue;
+			}
+
+			// Filter out elements in the current dragged item
+			for (j=0; j < list.length; j++) {
+				if(list[j] === m[i].element[0]) {
+					m[i].proportions.height = 0;
+					continue droppablesLoop;
+				}
+			}
+
+			m[i].visible = m[i].element.css("display") !== "none";
+			if(!m[i].visible) {
+				continue;
+			}
+
+			//Activate the droppable if used directly from draggables
+			if(type === "mousedown") {
+				m[i]._activate.call(m[i], event);
+			}
+
+			m[i].offset = m[i].element.offset();
+			m[i].proportions = { width: m[i].element[0].offsetWidth, height: m[i].element[0].offsetHeight };
+
+		}
+
+	},
+	drop: function(draggable, event) {
+
+		var dropped = false;
+		// Create a copy of the droppables in case the list changes during the drop (#9116)
+		$.each(($.ui.ddmanager.droppables[draggable.options.scope] || []).slice(), function() {
+
+			if(!this.options) {
+				return;
+			}
+			if (!this.options.disabled && this.visible && $.ui.intersect(draggable, this, this.options.tolerance)) {
+				dropped = this._drop.call(this, event) || dropped;
+			}
+
+			if (!this.options.disabled && this.visible && this.accept.call(this.element[0],(draggable.currentItem || draggable.element))) {
+				this.isout = true;
+				this.isover = false;
+				this._deactivate.call(this, event);
+			}
+
+		});
+		return dropped;
+
+	},
+	dragStart: function( draggable, event ) {
+		//Listen for scrolling so that if the dragging causes scrolling the position of the droppables can be recalculated (see #5003)
+		draggable.element.parentsUntil( "body" ).bind( "scroll.droppable", function() {
+			if( !draggable.options.refreshPositions ) {
+				$.ui.ddmanager.prepareOffsets( draggable, event );
+			}
+		});
+	},
+	drag: function(draggable, event) {
+
+		//If you have a highly dynamic page, you might try this option. It renders positions every time you move the mouse.
+		if(draggable.options.refreshPositions) {
+			$.ui.ddmanager.prepareOffsets(draggable, event);
+		}
+
+		//Run through all droppables and check their positions based on specific tolerance options
+		$.each($.ui.ddmanager.droppables[draggable.options.scope] || [], function() {
+
+			if(this.options.disabled || this.greedyChild || !this.visible) {
+				return;
+			}
+
+			var parentInstance, scope, parent,
+				intersects = $.ui.intersect(draggable, this, this.options.tolerance),
+				c = !intersects && this.isover ? "isout" : (intersects && !this.isover ? "isover" : null);
+			if(!c) {
+				return;
+			}
+
+			if (this.options.greedy) {
+				// find droppable parents with same scope
+				scope = this.options.scope;
+				parent = this.element.parents(":data(ui-droppable)").filter(function () {
+					return $.data(this, "ui-droppable").options.scope === scope;
+				});
+
+				if (parent.length) {
+					parentInstance = $.data(parent[0], "ui-droppable");
+					parentInstance.greedyChild = (c === "isover");
+				}
+			}
+
+			// we just moved into a greedy child
+			if (parentInstance && c === "isover") {
+				parentInstance.isover = false;
+				parentInstance.isout = true;
+				parentInstance._out.call(parentInstance, event);
+			}
+
+			this[c] = true;
+			this[c === "isout" ? "isover" : "isout"] = false;
+			this[c === "isover" ? "_over" : "_out"].call(this, event);
+
+			// we just moved out of a greedy child
+			if (parentInstance && c === "isout") {
+				parentInstance.isout = false;
+				parentInstance.isover = true;
+				parentInstance._over.call(parentInstance, event);
+			}
+		});
+
+	},
+	dragStop: function( draggable, event ) {
+		draggable.element.parentsUntil( "body" ).unbind( "scroll.droppable" );
+		//Call prepareOffsets one final time since IE does not fire return scroll events when overflow was caused by drag (see #5003)
+		if( !draggable.options.refreshPositions ) {
+			$.ui.ddmanager.prepareOffsets( draggable, event );
+		}
+	}
+};
+
+})(jQuery);
diff --git a/data/treeio/treeio/static/js/jquery-ui-1.10.3/ui/jquery.ui.position.js b/data/treeio/treeio/static/js/jquery-ui-1.10.3/ui/jquery.ui.position.js
new file mode 100644
index 0000000..3fcdf25
--- /dev/null
+++ b/data/treeio/treeio/static/js/jquery-ui-1.10.3/ui/jquery.ui.position.js
@@ -0,0 +1,497 @@
+/*!
+ * jQuery UI Position 1.10.3
+ * http://jqueryui.com
+ *
+ * Copyright 2013 jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ *
+ * http://api.jqueryui.com/position/
+ */
+(function( $, undefined ) {
+
+$.ui = $.ui || {};
+
+var cachedScrollbarWidth,
+	max = Math.max,
+	abs = Math.abs,
+	round = Math.round,
+	rhorizontal = /left|center|right/,
+	rvertical = /top|center|bottom/,
+	roffset = /[\+\-]\d+(\.[\d]+)?%?/,
+	rposition = /^\w+/,
+	rpercent = /%$/,
+	_position = $.fn.position;
+
+function getOffsets( offsets, width, height ) {
+	return [
+		parseFloat( offsets[ 0 ] ) * ( rpercent.test( offsets[ 0 ] ) ? width / 100 : 1 ),
+		parseFloat( offsets[ 1 ] ) * ( rpercent.test( offsets[ 1 ] ) ? height / 100 : 1 )
+	];
+}
+
+function parseCss( element, property ) {
+	return parseInt( $.css( element, property ), 10 ) || 0;
+}
+
+function getDimensions( elem ) {
+	var raw = elem[0];
+	if ( raw.nodeType === 9 ) {
+		return {
+			width: elem.width(),
+			height: elem.height(),
+			offset: { top: 0, left: 0 }
+		};
+	}
+	if ( $.isWindow( raw ) ) {
+		return {
+			width: elem.width(),
+			height: elem.height(),
+			offset: { top: elem.scrollTop(), left: elem.scrollLeft() }
+		};
+	}
+	if ( raw.preventDefault ) {
+		return {
+			width: 0,
+			height: 0,
+			offset: { top: raw.pageY, left: raw.pageX }
+		};
+	}
+	return {
+		width: elem.outerWidth(),
+		height: elem.outerHeight(),
+		offset: elem.offset()
+	};
+}
+
+$.position = {
+	scrollbarWidth: function() {
+		if ( cachedScrollbarWidth !== undefined ) {
+			return cachedScrollbarWidth;
+		}
+		var w1, w2,
+			div = $( "<div style='display:block;width:50px;height:50px;overflow:hidden;'><div style='height:100px;width:auto;'></div></div>" ),
+			innerDiv = div.children()[0];
+
+		$( "body" ).append( div );
+		w1 = innerDiv.offsetWidth;
+		div.css( "overflow", "scroll" );
+
+		w2 = innerDiv.offsetWidth;
+
+		if ( w1 === w2 ) {
+			w2 = div[0].clientWidth;
+		}
+
+		div.remove();
+
+		return (cachedScrollbarWidth = w1 - w2);
+	},
+	getScrollInfo: function( within ) {
+		var overflowX = within.isWindow ? "" : within.element.css( "overflow-x" ),
+			overflowY = within.isWindow ? "" : within.element.css( "overflow-y" ),
+			hasOverflowX = overflowX === "scroll" ||
+				( overflowX === "auto" && within.width < within.element[0].scrollWidth ),
+			hasOverflowY = overflowY === "scroll" ||
+				( overflowY === "auto" && within.height < within.element[0].scrollHeight );
+		return {
+			width: hasOverflowY ? $.position.scrollbarWidth() : 0,
+			height: hasOverflowX ? $.position.scrollbarWidth() : 0
+		};
+	},
+	getWithinInfo: function( element ) {
+		var withinElement = $( element || window ),
+			isWindow = $.isWindow( withinElement[0] );
+		return {
+			element: withinElement,
+			isWindow: isWindow,
+			offset: withinElement.offset() || { left: 0, top: 0 },
+			scrollLeft: withinElement.scrollLeft(),
+			scrollTop: withinElement.scrollTop(),
+			width: isWindow ? withinElement.width() : withinElement.outerWidth(),
+			height: isWindow ? withinElement.height() : withinElement.outerHeight()
+		};
+	}
+};
+
+$.fn.position = function( options ) {
+	if ( !options || !options.of ) {
+		return _position.apply( this, arguments );
+	}
+
+	// make a copy, we don't want to modify arguments
+	options = $.extend( {}, options );
+
+	var atOffset, targetWidth, targetHeight, targetOffset, basePosition, dimensions,
+		target = $( options.of ),
+		within = $.position.getWithinInfo( options.within ),
+		scrollInfo = $.position.getScrollInfo( within ),
+		collision = ( options.collision || "flip" ).split( " " ),
+		offsets = {};
+
+	dimensions = getDimensions( target );
+	if ( target[0].preventDefault ) {
+		// force left top to allow flipping
+		options.at = "left top";
+	}
+	targetWidth = dimensions.width;
+	targetHeight = dimensions.height;
+	targetOffset = dimensions.offset;
+	// clone to reuse original targetOffset later
+	basePosition = $.extend( {}, targetOffset );
+
+	// force my and at to have valid horizontal and vertical positions
+	// if a value is missing or invalid, it will be converted to center
+	$.each( [ "my", "at" ], function() {
+		var pos = ( options[ this ] || "" ).split( " " ),
+			horizontalOffset,
+			verticalOffset;
+
+		if ( pos.length === 1) {
+			pos = rhorizontal.test( pos[ 0 ] ) ?
+				pos.concat( [ "center" ] ) :
+				rvertical.test( pos[ 0 ] ) ?
+					[ "center" ].concat( pos ) :
+					[ "center", "center" ];
+		}
+		pos[ 0 ] = rhorizontal.test( pos[ 0 ] ) ? pos[ 0 ] : "center";
+		pos[ 1 ] = rvertical.test( pos[ 1 ] ) ? pos[ 1 ] : "center";
+
+		// calculate offsets
+		horizontalOffset = roffset.exec( pos[ 0 ] );
+		verticalOffset = roffset.exec( pos[ 1 ] );
+		offsets[ this ] = [
+			horizontalOffset ? horizontalOffset[ 0 ] : 0,
+			verticalOffset ? verticalOffset[ 0 ] : 0
+		];
+
+		// reduce to just the positions without the offsets
+		options[ this ] = [
+			rposition.exec( pos[ 0 ] )[ 0 ],
+			rposition.exec( pos[ 1 ] )[ 0 ]
+		];
+	});
+
+	// normalize collision option
+	if ( collision.length === 1 ) {
+		collision[ 1 ] = collision[ 0 ];
+	}
+
+	if ( options.at[ 0 ] === "right" ) {
+		basePosition.left += targetWidth;
+	} else if ( options.at[ 0 ] === "center" ) {
+		basePosition.left += targetWidth / 2;
+	}
+
+	if ( options.at[ 1 ] === "bottom" ) {
+		basePosition.top += targetHeight;
+	} else if ( options.at[ 1 ] === "center" ) {
+		basePosition.top += targetHeight / 2;
+	}
+
+	atOffset = getOffsets( offsets.at, targetWidth, targetHeight );
+	basePosition.left += atOffset[ 0 ];
+	basePosition.top += atOffset[ 1 ];
+
+	return this.each(function() {
+		var collisionPosition, using,
+			elem = $( this ),
+			elemWidth = elem.outerWidth(),
+			elemHeight = elem.outerHeight(),
+			marginLeft = parseCss( this, "marginLeft" ),
+			marginTop = parseCss( this, "marginTop" ),
+			collisionWidth = elemWidth + marginLeft + parseCss( this, "marginRight" ) + scrollInfo.width,
+			collisionHeight = elemHeight + marginTop + parseCss( this, "marginBottom" ) + scrollInfo.height,
+			position = $.extend( {}, basePosition ),
+			myOffset = getOffsets( offsets.my, elem.outerWidth(), elem.outerHeight() );
+
+		if ( options.my[ 0 ] === "right" ) {
+			position.left -= elemWidth;
+		} else if ( options.my[ 0 ] === "center" ) {
+			position.left -= elemWidth / 2;
+		}
+
+		if ( options.my[ 1 ] === "bottom" ) {
+			position.top -= elemHeight;
+		} else if ( options.my[ 1 ] === "center" ) {
+			position.top -= elemHeight / 2;
+		}
+
+		position.left += myOffset[ 0 ];
+		position.top += myOffset[ 1 ];
+
+		// if the browser doesn't support fractions, then round for consistent results
+		if ( !$.support.offsetFractions ) {
+			position.left = round( position.left );
+			position.top = round( position.top );
+		}
+
+		collisionPosition = {
+			marginLeft: marginLeft,
+			marginTop: marginTop
+		};
+
+		$.each( [ "left", "top" ], function( i, dir ) {
+			if ( $.ui.position[ collision[ i ] ] ) {
+				$.ui.position[ collision[ i ] ][ dir ]( position, {
+					targetWidth: targetWidth,
+					targetHeight: targetHeight,
+					elemWidth: elemWidth,
+					elemHeight: elemHeight,
+					collisionPosition: collisionPosition,
+					collisionWidth: collisionWidth,
+					collisionHeight: collisionHeight,
+					offset: [ atOffset[ 0 ] + myOffset[ 0 ], atOffset [ 1 ] + myOffset[ 1 ] ],
+					my: options.my,
+					at: options.at,
+					within: within,
+					elem : elem
+				});
+			}
+		});
+
+		if ( options.using ) {
+			// adds feedback as second argument to using callback, if present
+			using = function( props ) {
+				var left = targetOffset.left - position.left,
+					right = left + targetWidth - elemWidth,
+					top = targetOffset.top - position.top,
+					bottom = top + targetHeight - elemHeight,
+					feedback = {
+						target: {
+							element: target,
+							left: targetOffset.left,
+							top: targetOffset.top,
+							width: targetWidth,
+							height: targetHeight
+						},
+						element: {
+							element: elem,
+							left: position.left,
+							top: position.top,
+							width: elemWidth,
+							height: elemHeight
+						},
+						horizontal: right < 0 ? "left" : left > 0 ? "right" : "center",
+						vertical: bottom < 0 ? "top" : top > 0 ? "bottom" : "middle"
+					};
+				if ( targetWidth < elemWidth && abs( left + right ) < targetWidth ) {
+					feedback.horizontal = "center";
+				}
+				if ( targetHeight < elemHeight && abs( top + bottom ) < targetHeight ) {
+					feedback.vertical = "middle";
+				}
+				if ( max( abs( left ), abs( right ) ) > max( abs( top ), abs( bottom ) ) ) {
+					feedback.important = "horizontal";
+				} else {
+					feedback.important = "vertical";
+				}
+				options.using.call( this, props, feedback );
+			};
+		}
+
+		elem.offset( $.extend( position, { using: using } ) );
+	});
+};
+
+$.ui.position = {
+	fit: {
+		left: function( position, data ) {
+			var within = data.within,
+				withinOffset = within.isWindow ? within.scrollLeft : within.offset.left,
+				outerWidth = within.width,
+				collisionPosLeft = position.left - data.collisionPosition.marginLeft,
+				overLeft = withinOffset - collisionPosLeft,
+				overRight = collisionPosLeft + data.collisionWidth - outerWidth - withinOffset,
+				newOverRight;
+
+			// element is wider than within
+			if ( data.collisionWidth > outerWidth ) {
+				// element is initially over the left side of within
+				if ( overLeft > 0 && overRight <= 0 ) {
+					newOverRight = position.left + overLeft + data.collisionWidth - outerWidth - withinOffset;
+					position.left += overLeft - newOverRight;
+				// element is initially over right side of within
+				} else if ( overRight > 0 && overLeft <= 0 ) {
+					position.left = withinOffset;
+				// element is initially over both left and right sides of within
+				} else {
+					if ( overLeft > overRight ) {
+						position.left = withinOffset + outerWidth - data.collisionWidth;
+					} else {
+						position.left = withinOffset;
+					}
+				}
+			// too far left -> align with left edge
+			} else if ( overLeft > 0 ) {
+				position.left += overLeft;
+			// too far right -> align with right edge
+			} else if ( overRight > 0 ) {
+				position.left -= overRight;
+			// adjust based on position and margin
+			} else {
+				position.left = max( position.left - collisionPosLeft, position.left );
+			}
+		},
+		top: function( position, data ) {
+			var within = data.within,
+				withinOffset = within.isWindow ? within.scrollTop : within.offset.top,
+				outerHeight = data.within.height,
+				collisionPosTop = position.top - data.collisionPosition.marginTop,
+				overTop = withinOffset - collisionPosTop,
+				overBottom = collisionPosTop + data.collisionHeight - outerHeight - withinOffset,
+				newOverBottom;
+
+			// element is taller than within
+			if ( data.collisionHeight > outerHeight ) {
+				// element is initially over the top of within
+				if ( overTop > 0 && overBottom <= 0 ) {
+					newOverBottom = position.top + overTop + data.collisionHeight - outerHeight - withinOffset;
+					position.top += overTop - newOverBottom;
+				// element is initially over bottom of within
+				} else if ( overBottom > 0 && overTop <= 0 ) {
+					position.top = withinOffset;
+				// element is initially over both top and bottom of within
+				} else {
+					if ( overTop > overBottom ) {
+						position.top = withinOffset + outerHeight - data.collisionHeight;
+					} else {
+						position.top = withinOffset;
+					}
+				}
+			// too far up -> align with top
+			} else if ( overTop > 0 ) {
+				position.top += overTop;
+			// too far down -> align with bottom edge
+			} else if ( overBottom > 0 ) {
+				position.top -= overBottom;
+			// adjust based on position and margin
+			} else {
+				position.top = max( position.top - collisionPosTop, position.top );
+			}
+		}
+	},
+	flip: {
+		left: function( position, data ) {
+			var within = data.within,
+				withinOffset = within.offset.left + within.scrollLeft,
+				outerWidth = within.width,
+				offsetLeft = within.isWindow ? within.scrollLeft : within.offset.left,
+				collisionPosLeft = position.left - data.collisionPosition.marginLeft,
+				overLeft = collisionPosLeft - offsetLeft,
+				overRight = collisionPosLeft + data.collisionWidth - outerWidth - offsetLeft,
+				myOffset = data.my[ 0 ] === "left" ?
+					-data.elemWidth :
+					data.my[ 0 ] === "right" ?
+						data.elemWidth :
+						0,
+				atOffset = data.at[ 0 ] === "left" ?
+					data.targetWidth :
+					data.at[ 0 ] === "right" ?
+						-data.targetWidth :
+						0,
+				offset = -2 * data.offset[ 0 ],
+				newOverRight,
+				newOverLeft;
+
+			if ( overLeft < 0 ) {
+				newOverRight = position.left + myOffset + atOffset + offset + data.collisionWidth - outerWidth - withinOffset;
+				if ( newOverRight < 0 || newOverRight < abs( overLeft ) ) {
+					position.left += myOffset + atOffset + offset;
+				}
+			}
+			else if ( overRight > 0 ) {
+				newOverLeft = position.left - data.collisionPosition.marginLeft + myOffset + atOffset + offset - offsetLeft;
+				if ( newOverLeft > 0 || abs( newOverLeft ) < overRight ) {
+					position.left += myOffset + atOffset + offset;
+				}
+			}
+		},
+		top: function( position, data ) {
+			var within = data.within,
+				withinOffset = within.offset.top + within.scrollTop,
+				outerHeight = within.height,
+				offsetTop = within.isWindow ? within.scrollTop : within.offset.top,
+				collisionPosTop = position.top - data.collisionPosition.marginTop,
+				overTop = collisionPosTop - offsetTop,
+				overBottom = collisionPosTop + data.collisionHeight - outerHeight - offsetTop,
+				top = data.my[ 1 ] === "top",
+				myOffset = top ?
+					-data.elemHeight :
+					data.my[ 1 ] === "bottom" ?
+						data.elemHeight :
+						0,
+				atOffset = data.at[ 1 ] === "top" ?
+					data.targetHeight :
+					data.at[ 1 ] === "bottom" ?
+						-data.targetHeight :
+						0,
+				offset = -2 * data.offset[ 1 ],
+				newOverTop,
+				newOverBottom;
+			if ( overTop < 0 ) {
+				newOverBottom = position.top + myOffset + atOffset + offset + data.collisionHeight - outerHeight - withinOffset;
+				if ( ( position.top + myOffset + atOffset + offset) > overTop && ( newOverBottom < 0 || newOverBottom < abs( overTop ) ) ) {
+					position.top += myOffset + atOffset + offset;
+				}
+			}
+			else if ( overBottom > 0 ) {
+				newOverTop = position.top -  data.collisionPosition.marginTop + myOffset + atOffset + offset - offsetTop;
+				if ( ( position.top + myOffset + atOffset + offset) > overBottom && ( newOverTop > 0 || abs( newOverTop ) < overBottom ) ) {
+					position.top += myOffset + atOffset + offset;
+				}
+			}
+		}
+	},
+	flipfit: {
+		left: function() {
+			$.ui.position.flip.left.apply( this, arguments );
+			$.ui.position.fit.left.apply( this, arguments );
+		},
+		top: function() {
+			$.ui.position.flip.top.apply( this, arguments );
+			$.ui.position.fit.top.apply( this, arguments );
+		}
+	}
+};
+
+// fraction support test
+(function () {
+	var testElement, testElementParent, testElementStyle, offsetLeft, i,
+		body = document.getElementsByTagName( "body" )[ 0 ],
+		div = document.createElement( "div" );
+
+	//Create a "fake body" for testing based on method used in jQuery.support
+	testElement = document.createElement( body ? "div" : "body" );
+	testElementStyle = {
+		visibility: "hidden",
+		width: 0,
+		height: 0,
+		border: 0,
+		margin: 0,
+		background: "none"
+	};
+	if ( body ) {
+		$.extend( testElementStyle, {
+			position: "absolute",
+			left: "-1000px",
+			top: "-1000px"
+		});
+	}
+	for ( i in testElementStyle ) {
+		testElement.style[ i ] = testElementStyle[ i ];
+	}
+	testElement.appendChild( div );
+	testElementParent = body || document.documentElement;
+	testElementParent.insertBefore( testElement, testElementParent.firstChild );
+
+	div.style.cssText = "position: absolute; left: 10.7432222px;";
+
+	offsetLeft = $( div ).offset().left;
+	$.support.offsetFractions = offsetLeft > 10 && offsetLeft < 11;
+
+	testElement.innerHTML = "";
+	testElementParent.removeChild( testElement );
+})();
+
+}( jQuery ) );
diff --git a/data/treeio/treeio/static/js/jquery-ui-1.10.3/ui/jquery.ui.resizable.js b/data/treeio/treeio/static/js/jquery-ui-1.10.3/ui/jquery.ui.resizable.js
new file mode 100644
index 0000000..f007732
--- /dev/null
+++ b/data/treeio/treeio/static/js/jquery-ui-1.10.3/ui/jquery.ui.resizable.js
@@ -0,0 +1,968 @@
+/*!
+ * jQuery UI Resizable 1.10.3
+ * http://jqueryui.com
+ *
+ * Copyright 2013 jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ *
+ * http://api.jqueryui.com/resizable/
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+(function( $, undefined ) {
+
+function num(v) {
+	return parseInt(v, 10) || 0;
+}
+
+function isNumber(value) {
+	return !isNaN(parseInt(value, 10));
+}
+
+$.widget("ui.resizable", $.ui.mouse, {
+	version: "1.10.3",
+	widgetEventPrefix: "resize",
+	options: {
+		alsoResize: false,
+		animate: false,
+		animateDuration: "slow",
+		animateEasing: "swing",
+		aspectRatio: false,
+		autoHide: false,
+		containment: false,
+		ghost: false,
+		grid: false,
+		handles: "e,s,se",
+		helper: false,
+		maxHeight: null,
+		maxWidth: null,
+		minHeight: 10,
+		minWidth: 10,
+		// See #7960
+		zIndex: 90,
+
+		// callbacks
+		resize: null,
+		start: null,
+		stop: null
+	},
+	_create: function() {
+
+		var n, i, handle, axis, hname,
+			that = this,
+			o = this.options;
+		this.element.addClass("ui-resizable");
+
+		$.extend(this, {
+			_aspectRatio: !!(o.aspectRatio),
+			aspectRatio: o.aspectRatio,
+			originalElement: this.element,
+			_proportionallyResizeElements: [],
+			_helper: o.helper || o.ghost || o.animate ? o.helper || "ui-resizable-helper" : null
+		});
+
+		//Wrap the element if it cannot hold child nodes
+		if(this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)) {
+
+			//Create a wrapper element and set the wrapper to the new current internal element
+			this.element.wrap(
+				$("<div class='ui-wrapper' style='overflow: hidden;'></div>").css({
+					position: this.element.css("position"),
+					width: this.element.outerWidth(),
+					height: this.element.outerHeight(),
+					top: this.element.css("top"),
+					left: this.element.css("left")
+				})
+			);
+
+			//Overwrite the original this.element
+			this.element = this.element.parent().data(
+				"ui-resizable", this.element.data("ui-resizable")
+			);
+
+			this.elementIsWrapper = true;
+
+			//Move margins to the wrapper
+			this.element.css({ marginLeft: this.originalElement.css("marginLeft"), marginTop: this.originalElement.css("marginTop"), marginRight: this.originalElement.css("marginRight"), marginBottom: this.originalElement.css("marginBottom") });
+			this.originalElement.css({ marginLeft: 0, marginTop: 0, marginRight: 0, marginBottom: 0});
+
+			//Prevent Safari textarea resize
+			this.originalResizeStyle = this.originalElement.css("resize");
+			this.originalElement.css("resize", "none");
+
+			//Push the actual element to our proportionallyResize internal array
+			this._proportionallyResizeElements.push(this.originalElement.css({ position: "static", zoom: 1, display: "block" }));
+
+			// avoid IE jump (hard set the margin)
+			this.originalElement.css({ margin: this.originalElement.css("margin") });
+
+			// fix handlers offset
+			this._proportionallyResize();
+
+		}
+
+		this.handles = o.handles || (!$(".ui-resizable-handle", this.element).length ? "e,s,se" : { n: ".ui-resizable-n", e: ".ui-resizable-e", s: ".ui-resizable-s", w: ".ui-resizable-w", se: ".ui-resizable-se", sw: ".ui-resizable-sw", ne: ".ui-resizable-ne", nw: ".ui-resizable-nw" });
+		if(this.handles.constructor === String) {
+
+			if ( this.handles === "all") {
+				this.handles = "n,e,s,w,se,sw,ne,nw";
+			}
+
+			n = this.handles.split(",");
+			this.handles = {};
+
+			for(i = 0; i < n.length; i++) {
+
+				handle = $.trim(n[i]);
+				hname = "ui-resizable-"+handle;
+				axis = $("<div class='ui-resizable-handle " + hname + "'></div>");
+
+				// Apply zIndex to all handles - see #7960
+				axis.css({ zIndex: o.zIndex });
+
+				//TODO : What's going on here?
+				if ("se" === handle) {
+					axis.addClass("ui-icon ui-icon-gripsmall-diagonal-se");
+				}
+
+				//Insert into internal handles object and append to element
+				this.handles[handle] = ".ui-resizable-"+handle;
+				this.element.append(axis);
+			}
+
+		}
+
+		this._renderAxis = function(target) {
+
+			var i, axis, padPos, padWrapper;
+
+			target = target || this.element;
+
+			for(i in this.handles) {
+
+				if(this.handles[i].constructor === String) {
+					this.handles[i] = $(this.handles[i], this.element).show();
+				}
+
+				//Apply pad to wrapper element, needed to fix axis position (textarea, inputs, scrolls)
+				if (this.elementIsWrapper && this.originalElement[0].nodeName.match(/textarea|input|select|button/i)) {
+
+					axis = $(this.handles[i], this.element);
+
+					//Checking the correct pad and border
+					padWrapper = /sw|ne|nw|se|n|s/.test(i) ? axis.outerHeight() : axis.outerWidth();
+
+					//The padding type i have to apply...
+					padPos = [ "padding",
+						/ne|nw|n/.test(i) ? "Top" :
+						/se|sw|s/.test(i) ? "Bottom" :
+						/^e$/.test(i) ? "Right" : "Left" ].join("");
+
+					target.css(padPos, padWrapper);
+
+					this._proportionallyResize();
+
+				}
+
+				//TODO: What's that good for? There's not anything to be executed left
+				if(!$(this.handles[i]).length) {
+					continue;
+				}
+			}
+		};
+
+		//TODO: make renderAxis a prototype function
+		this._renderAxis(this.element);
+
+		this._handles = $(".ui-resizable-handle", this.element)
+			.disableSelection();
+
+		//Matching axis name
+		this._handles.mouseover(function() {
+			if (!that.resizing) {
+				if (this.className) {
+					axis = this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i);
+				}
+				//Axis, default = se
+				that.axis = axis && axis[1] ? axis[1] : "se";
+			}
+		});
+
+		//If we want to auto hide the elements
+		if (o.autoHide) {
+			this._handles.hide();
+			$(this.element)
+				.addClass("ui-resizable-autohide")
+				.mouseenter(function() {
+					if (o.disabled) {
+						return;
+					}
+					$(this).removeClass("ui-resizable-autohide");
+					that._handles.show();
+				})
+				.mouseleave(function(){
+					if (o.disabled) {
+						return;
+					}
+					if (!that.resizing) {
+						$(this).addClass("ui-resizable-autohide");
+						that._handles.hide();
+					}
+				});
+		}
+
+		//Initialize the mouse interaction
+		this._mouseInit();
+
+	},
+
+	_destroy: function() {
+
+		this._mouseDestroy();
+
+		var wrapper,
+			_destroy = function(exp) {
+				$(exp).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing")
+					.removeData("resizable").removeData("ui-resizable").unbind(".resizable").find(".ui-resizable-handle").remove();
+			};
+
+		//TODO: Unwrap at same DOM position
+		if (this.elementIsWrapper) {
+			_destroy(this.element);
+			wrapper = this.element;
+			this.originalElement.css({
+				position: wrapper.css("position"),
+				width: wrapper.outerWidth(),
+				height: wrapper.outerHeight(),
+				top: wrapper.css("top"),
+				left: wrapper.css("left")
+			}).insertAfter( wrapper );
+			wrapper.remove();
+		}
+
+		this.originalElement.css("resize", this.originalResizeStyle);
+		_destroy(this.originalElement);
+
+		return this;
+	},
+
+	_mouseCapture: function(event) {
+		var i, handle,
+			capture = false;
+
+		for (i in this.handles) {
+			handle = $(this.handles[i])[0];
+			if (handle === event.target || $.contains(handle, event.target)) {
+				capture = true;
+			}
+		}
+
+		return !this.options.disabled && capture;
+	},
+
+	_mouseStart: function(event) {
+
+		var curleft, curtop, cursor,
+			o = this.options,
+			iniPos = this.element.position(),
+			el = this.element;
+
+		this.resizing = true;
+
+		// bugfix for http://dev.jquery.com/ticket/1749
+		if ( (/absolute/).test( el.css("position") ) ) {
+			el.css({ position: "absolute", top: el.css("top"), left: el.css("left") });
+		} else if (el.is(".ui-draggable")) {
+			el.css({ position: "absolute", top: iniPos.top, left: iniPos.left });
+		}
+
+		this._renderProxy();
+
+		curleft = num(this.helper.css("left"));
+		curtop = num(this.helper.css("top"));
+
+		if (o.containment) {
+			curleft += $(o.containment).scrollLeft() || 0;
+			curtop += $(o.containment).scrollTop() || 0;
+		}
+
+		//Store needed variables
+		this.offset = this.helper.offset();
+		this.position = { left: curleft, top: curtop };
+		this.size = this._helper ? { width: el.outerWidth(), height: el.outerHeight() } : { width: el.width(), height: el.height() };
+		this.originalSize = this._helper ? { width: el.outerWidth(), height: el.outerHeight() } : { width: el.width(), height: el.height() };
+		this.originalPosition = { left: curleft, top: curtop };
+		this.sizeDiff = { width: el.outerWidth() - el.width(), height: el.outerHeight() - el.height() };
+		this.originalMousePosition = { left: event.pageX, top: event.pageY };
+
+		//Aspect Ratio
+		this.aspectRatio = (typeof o.aspectRatio === "number") ? o.aspectRatio : ((this.originalSize.width / this.originalSize.height) || 1);
+
+		cursor = $(".ui-resizable-" + this.axis).css("cursor");
+		$("body").css("cursor", cursor === "auto" ? this.axis + "-resize" : cursor);
+
+		el.addClass("ui-resizable-resizing");
+		this._propagate("start", event);
+		return true;
+	},
+
+	_mouseDrag: function(event) {
+
+		//Increase performance, avoid regex
+		var data,
+			el = this.helper, props = {},
+			smp = this.originalMousePosition,
+			a = this.axis,
+			prevTop = this.position.top,
+			prevLeft = this.position.left,
+			prevWidth = this.size.width,
+			prevHeight = this.size.height,
+			dx = (event.pageX-smp.left)||0,
+			dy = (event.pageY-smp.top)||0,
+			trigger = this._change[a];
+
+		if (!trigger) {
+			return false;
+		}
+
+		// Calculate the attrs that will be change
+		data = trigger.apply(this, [event, dx, dy]);
+
+		// Put this in the mouseDrag handler since the user can start pressing shift while resizing
+		this._updateVirtualBoundaries(event.shiftKey);
+		if (this._aspectRatio || event.shiftKey) {
+			data = this._updateRatio(data, event);
+		}
+
+		data = this._respectSize(data, event);
+
+		this._updateCache(data);
+
+		// plugins callbacks need to be called first
+		this._propagate("resize", event);
+
+		if (this.position.top !== prevTop) {
+			props.top = this.position.top + "px";
+		}
+		if (this.position.left !== prevLeft) {
+			props.left = this.position.left + "px";
+		}
+		if (this.size.width !== prevWidth) {
+			props.width = this.size.width + "px";
+		}
+		if (this.size.height !== prevHeight) {
+			props.height = this.size.height + "px";
+		}
+		el.css(props);
+
+		if (!this._helper && this._proportionallyResizeElements.length) {
+			this._proportionallyResize();
+		}
+
+		// Call the user callback if the element was resized
+		if ( ! $.isEmptyObject(props) ) {
+			this._trigger("resize", event, this.ui());
+		}
+
+		return false;
+	},
+
+	_mouseStop: function(event) {
+
+		this.resizing = false;
+		var pr, ista, soffseth, soffsetw, s, left, top,
+			o = this.options, that = this;
+
+		if(this._helper) {
+
+			pr = this._proportionallyResizeElements;
+			ista = pr.length && (/textarea/i).test(pr[0].nodeName);
+			soffseth = ista && $.ui.hasScroll(pr[0], "left") /* TODO - jump height */ ? 0 : that.sizeDiff.height;
+			soffsetw = ista ? 0 : that.sizeDiff.width;
+
+			s = { width: (that.helper.width()  - soffsetw), height: (that.helper.height() - soffseth) };
+			left = (parseInt(that.element.css("left"), 10) + (that.position.left - that.originalPosition.left)) || null;
+			top = (parseInt(that.element.css("top"), 10) + (that.position.top - that.originalPosition.top)) || null;
+
+			if (!o.animate) {
+				this.element.css($.extend(s, { top: top, left: left }));
+			}
+
+			that.helper.height(that.size.height);
+			that.helper.width(that.size.width);
+
+			if (this._helper && !o.animate) {
+				this._proportionallyResize();
+			}
+		}
+
+		$("body").css("cursor", "auto");
+
+		this.element.removeClass("ui-resizable-resizing");
+
+		this._propagate("stop", event);
+
+		if (this._helper) {
+			this.helper.remove();
+		}
+
+		return false;
+
+	},
+
+	_updateVirtualBoundaries: function(forceAspectRatio) {
+		var pMinWidth, pMaxWidth, pMinHeight, pMaxHeight, b,
+			o = this.options;
+
+		b = {
+			minWidth: isNumber(o.minWidth) ? o.minWidth : 0,
+			maxWidth: isNumber(o.maxWidth) ? o.maxWidth : Infinity,
+			minHeight: isNumber(o.minHeight) ? o.minHeight : 0,
+			maxHeight: isNumber(o.maxHeight) ? o.maxHeight : Infinity
+		};
+
+		if(this._aspectRatio || forceAspectRatio) {
+			// We want to create an enclosing box whose aspect ration is the requested one
+			// First, compute the "projected" size for each dimension based on the aspect ratio and other dimension
+			pMinWidth = b.minHeight * this.aspectRatio;
+			pMinHeight = b.minWidth / this.aspectRatio;
+			pMaxWidth = b.maxHeight * this.aspectRatio;
+			pMaxHeight = b.maxWidth / this.aspectRatio;
+
+			if(pMinWidth > b.minWidth) {
+				b.minWidth = pMinWidth;
+			}
+			if(pMinHeight > b.minHeight) {
+				b.minHeight = pMinHeight;
+			}
+			if(pMaxWidth < b.maxWidth) {
+				b.maxWidth = pMaxWidth;
+			}
+			if(pMaxHeight < b.maxHeight) {
+				b.maxHeight = pMaxHeight;
+			}
+		}
+		this._vBoundaries = b;
+	},
+
+	_updateCache: function(data) {
+		this.offset = this.helper.offset();
+		if (isNumber(data.left)) {
+			this.position.left = data.left;
+		}
+		if (isNumber(data.top)) {
+			this.position.top = data.top;
+		}
+		if (isNumber(data.height)) {
+			this.size.height = data.height;
+		}
+		if (isNumber(data.width)) {
+			this.size.width = data.width;
+		}
+	},
+
+	_updateRatio: function( data ) {
+
+		var cpos = this.position,
+			csize = this.size,
+			a = this.axis;
+
+		if (isNumber(data.height)) {
+			data.width = (data.height * this.aspectRatio);
+		} else if (isNumber(data.width)) {
+			data.height = (data.width / this.aspectRatio);
+		}
+
+		if (a === "sw") {
+			data.left = cpos.left + (csize.width - data.width);
+			data.top = null;
+		}
+		if (a === "nw") {
+			data.top = cpos.top + (csize.height - data.height);
+			data.left = cpos.left + (csize.width - data.width);
+		}
+
+		return data;
+	},
+
+	_respectSize: function( data ) {
+
+		var o = this._vBoundaries,
+			a = this.axis,
+			ismaxw = isNumber(data.width) && o.maxWidth && (o.maxWidth < data.width), ismaxh = isNumber(data.height) && o.maxHeight && (o.maxHeight < data.height),
+			isminw = isNumber(data.width) && o.minWidth && (o.minWidth > data.width), isminh = isNumber(data.height) && o.minHeight && (o.minHeight > data.height),
+			dw = this.originalPosition.left + this.originalSize.width,
+			dh = this.position.top + this.size.height,
+			cw = /sw|nw|w/.test(a), ch = /nw|ne|n/.test(a);
+		if (isminw) {
+			data.width = o.minWidth;
+		}
+		if (isminh) {
+			data.height = o.minHeight;
+		}
+		if (ismaxw) {
+			data.width = o.maxWidth;
+		}
+		if (ismaxh) {
+			data.height = o.maxHeight;
+		}
+
+		if (isminw && cw) {
+			data.left = dw - o.minWidth;
+		}
+		if (ismaxw && cw) {
+			data.left = dw - o.maxWidth;
+		}
+		if (isminh && ch) {
+			data.top = dh - o.minHeight;
+		}
+		if (ismaxh && ch) {
+			data.top = dh - o.maxHeight;
+		}
+
+		// fixing jump error on top/left - bug #2330
+		if (!data.width && !data.height && !data.left && data.top) {
+			data.top = null;
+		} else if (!data.width && !data.height && !data.top && data.left) {
+			data.left = null;
+		}
+
+		return data;
+	},
+
+	_proportionallyResize: function() {
+
+		if (!this._proportionallyResizeElements.length) {
+			return;
+		}
+
+		var i, j, borders, paddings, prel,
+			element = this.helper || this.element;
+
+		for ( i=0; i < this._proportionallyResizeElements.length; i++) {
+
+			prel = this._proportionallyResizeElements[i];
+
+			if (!this.borderDif) {
+				this.borderDif = [];
+				borders = [prel.css("borderTopWidth"), prel.css("borderRightWidth"), prel.css("borderBottomWidth"), prel.css("borderLeftWidth")];
+				paddings = [prel.css("paddingTop"), prel.css("paddingRight"), prel.css("paddingBottom"), prel.css("paddingLeft")];
+
+				for ( j = 0; j < borders.length; j++ ) {
+					this.borderDif[ j ] = ( parseInt( borders[ j ], 10 ) || 0 ) + ( parseInt( paddings[ j ], 10 ) || 0 );
+				}
+			}
+
+			prel.css({
+				height: (element.height() - this.borderDif[0] - this.borderDif[2]) || 0,
+				width: (element.width() - this.borderDif[1] - this.borderDif[3]) || 0
+			});
+
+		}
+
+	},
+
+	_renderProxy: function() {
+
+		var el = this.element, o = this.options;
+		this.elementOffset = el.offset();
+
+		if(this._helper) {
+
+			this.helper = this.helper || $("<div style='overflow:hidden;'></div>");
+
+			this.helper.addClass(this._helper).css({
+				width: this.element.outerWidth() - 1,
+				height: this.element.outerHeight() - 1,
+				position: "absolute",
+				left: this.elementOffset.left +"px",
+				top: this.elementOffset.top +"px",
+				zIndex: ++o.zIndex //TODO: Don't modify option
+			});
+
+			this.helper
+				.appendTo("body")
+				.disableSelection();
+
+		} else {
+			this.helper = this.element;
+		}
+
+	},
+
+	_change: {
+		e: function(event, dx) {
+			return { width: this.originalSize.width + dx };
+		},
+		w: function(event, dx) {
+			var cs = this.originalSize, sp = this.originalPosition;
+			return { left: sp.left + dx, width: cs.width - dx };
+		},
+		n: function(event, dx, dy) {
+			var cs = this.originalSize, sp = this.originalPosition;
+			return { top: sp.top + dy, height: cs.height - dy };
+		},
+		s: function(event, dx, dy) {
+			return { height: this.originalSize.height + dy };
+		},
+		se: function(event, dx, dy) {
+			return $.extend(this._change.s.apply(this, arguments), this._change.e.apply(this, [event, dx, dy]));
+		},
+		sw: function(event, dx, dy) {
+			return $.extend(this._change.s.apply(this, arguments), this._change.w.apply(this, [event, dx, dy]));
+		},
+		ne: function(event, dx, dy) {
+			return $.extend(this._change.n.apply(this, arguments), this._change.e.apply(this, [event, dx, dy]));
+		},
+		nw: function(event, dx, dy) {
+			return $.extend(this._change.n.apply(this, arguments), this._change.w.apply(this, [event, dx, dy]));
+		}
+	},
+
+	_propagate: function(n, event) {
+		$.ui.plugin.call(this, n, [event, this.ui()]);
+		(n !== "resize" && this._trigger(n, event, this.ui()));
+	},
+
+	plugins: {},
+
+	ui: function() {
+		return {
+			originalElement: this.originalElement,
+			element: this.element,
+			helper: this.helper,
+			position: this.position,
+			size: this.size,
+			originalSize: this.originalSize,
+			originalPosition: this.originalPosition
+		};
+	}
+
+});
+
+/*
+ * Resizable Extensions
+ */
+
+$.ui.plugin.add("resizable", "animate", {
+
+	stop: function( event ) {
+		var that = $(this).data("ui-resizable"),
+			o = that.options,
+			pr = that._proportionallyResizeElements,
+			ista = pr.length && (/textarea/i).test(pr[0].nodeName),
+			soffseth = ista && $.ui.hasScroll(pr[0], "left") /* TODO - jump height */ ? 0 : that.sizeDiff.height,
+			soffsetw = ista ? 0 : that.sizeDiff.width,
+			style = { width: (that.size.width - soffsetw), height: (that.size.height - soffseth) },
+			left = (parseInt(that.element.css("left"), 10) + (that.position.left - that.originalPosition.left)) || null,
+			top = (parseInt(that.element.css("top"), 10) + (that.position.top - that.originalPosition.top)) || null;
+
+		that.element.animate(
+			$.extend(style, top && left ? { top: top, left: left } : {}), {
+				duration: o.animateDuration,
+				easing: o.animateEasing,
+				step: function() {
+
+					var data = {
+						width: parseInt(that.element.css("width"), 10),
+						height: parseInt(that.element.css("height"), 10),
+						top: parseInt(that.element.css("top"), 10),
+						left: parseInt(that.element.css("left"), 10)
+					};
+
+					if (pr && pr.length) {
+						$(pr[0]).css({ width: data.width, height: data.height });
+					}
+
+					// propagating resize, and updating values for each animation step
+					that._updateCache(data);
+					that._propagate("resize", event);
+
+				}
+			}
+		);
+	}
+
+});
+
+$.ui.plugin.add("resizable", "containment", {
+
+	start: function() {
+		var element, p, co, ch, cw, width, height,
+			that = $(this).data("ui-resizable"),
+			o = that.options,
+			el = that.element,
+			oc = o.containment,
+			ce = (oc instanceof $) ? oc.get(0) : (/parent/.test(oc)) ? el.parent().get(0) : oc;
+
+		if (!ce) {
+			return;
+		}
+
+		that.containerElement = $(ce);
+
+		if (/document/.test(oc) || oc === document) {
+			that.containerOffset = { left: 0, top: 0 };
+			that.containerPosition = { left: 0, top: 0 };
+
+			that.parentData = {
+				element: $(document), left: 0, top: 0,
+				width: $(document).width(), height: $(document).height() || document.body.parentNode.scrollHeight
+			};
+		}
+
+		// i'm a node, so compute top, left, right, bottom
+		else {
+			element = $(ce);
+			p = [];
+			$([ "Top", "Right", "Left", "Bottom" ]).each(function(i, name) { p[i] = num(element.css("padding" + name)); });
+
+			that.containerOffset = element.offset();
+			that.containerPosition = element.position();
+			that.containerSize = { height: (element.innerHeight() - p[3]), width: (element.innerWidth() - p[1]) };
+
+			co = that.containerOffset;
+			ch = that.containerSize.height;
+			cw = that.containerSize.width;
+			width = ($.ui.hasScroll(ce, "left") ? ce.scrollWidth : cw );
+			height = ($.ui.hasScroll(ce) ? ce.scrollHeight : ch);
+
+			that.parentData = {
+				element: ce, left: co.left, top: co.top, width: width, height: height
+			};
+		}
+	},
+
+	resize: function( event ) {
+		var woset, hoset, isParent, isOffsetRelative,
+			that = $(this).data("ui-resizable"),
+			o = that.options,
+			co = that.containerOffset, cp = that.position,
+			pRatio = that._aspectRatio || event.shiftKey,
+			cop = { top:0, left:0 }, ce = that.containerElement;
+
+		if (ce[0] !== document && (/static/).test(ce.css("position"))) {
+			cop = co;
+		}
+
+		if (cp.left < (that._helper ? co.left : 0)) {
+			that.size.width = that.size.width + (that._helper ? (that.position.left - co.left) : (that.position.left - cop.left));
+			if (pRatio) {
+				that.size.height = that.size.width / that.aspectRatio;
+			}
+			that.position.left = o.helper ? co.left : 0;
+		}
+
+		if (cp.top < (that._helper ? co.top : 0)) {
+			that.size.height = that.size.height + (that._helper ? (that.position.top - co.top) : that.position.top);
+			if (pRatio) {
+				that.size.width = that.size.height * that.aspectRatio;
+			}
+			that.position.top = that._helper ? co.top : 0;
+		}
+
+		that.offset.left = that.parentData.left+that.position.left;
+		that.offset.top = that.parentData.top+that.position.top;
+
+		woset = Math.abs( (that._helper ? that.offset.left - cop.left : (that.offset.left - cop.left)) + that.sizeDiff.width );
+		hoset = Math.abs( (that._helper ? that.offset.top - cop.top : (that.offset.top - co.top)) + that.sizeDiff.height );
+
+		isParent = that.containerElement.get(0) === that.element.parent().get(0);
+		isOffsetRelative = /relative|absolute/.test(that.containerElement.css("position"));
+
+		if(isParent && isOffsetRelative) {
+			woset -= that.parentData.left;
+		}
+
+		if (woset + that.size.width >= that.parentData.width) {
+			that.size.width = that.parentData.width - woset;
+			if (pRatio) {
+				that.size.height = that.size.width / that.aspectRatio;
+			}
+		}
+
+		if (hoset + that.size.height >= that.parentData.height) {
+			that.size.height = that.parentData.height - hoset;
+			if (pRatio) {
+				that.size.width = that.size.height * that.aspectRatio;
+			}
+		}
+	},
+
+	stop: function(){
+		var that = $(this).data("ui-resizable"),
+			o = that.options,
+			co = that.containerOffset,
+			cop = that.containerPosition,
+			ce = that.containerElement,
+			helper = $(that.helper),
+			ho = helper.offset(),
+			w = helper.outerWidth() - that.sizeDiff.width,
+			h = helper.outerHeight() - that.sizeDiff.height;
+
+		if (that._helper && !o.animate && (/relative/).test(ce.css("position"))) {
+			$(this).css({ left: ho.left - cop.left - co.left, width: w, height: h });
+		}
+
+		if (that._helper && !o.animate && (/static/).test(ce.css("position"))) {
+			$(this).css({ left: ho.left - cop.left - co.left, width: w, height: h });
+		}
+
+	}
+});
+
+$.ui.plugin.add("resizable", "alsoResize", {
+
+	start: function () {
+		var that = $(this).data("ui-resizable"),
+			o = that.options,
+			_store = function (exp) {
+				$(exp).each(function() {
+					var el = $(this);
+					el.data("ui-resizable-alsoresize", {
+						width: parseInt(el.width(), 10), height: parseInt(el.height(), 10),
+						left: parseInt(el.css("left"), 10), top: parseInt(el.css("top"), 10)
+					});
+				});
+			};
+
+		if (typeof(o.alsoResize) === "object" && !o.alsoResize.parentNode) {
+			if (o.alsoResize.length) { o.alsoResize = o.alsoResize[0]; _store(o.alsoResize); }
+			else { $.each(o.alsoResize, function (exp) { _store(exp); }); }
+		}else{
+			_store(o.alsoResize);
+		}
+	},
+
+	resize: function (event, ui) {
+		var that = $(this).data("ui-resizable"),
+			o = that.options,
+			os = that.originalSize,
+			op = that.originalPosition,
+			delta = {
+				height: (that.size.height - os.height) || 0, width: (that.size.width - os.width) || 0,
+				top: (that.position.top - op.top) || 0, left: (that.position.left - op.left) || 0
+			},
+
+			_alsoResize = function (exp, c) {
+				$(exp).each(function() {
+					var el = $(this), start = $(this).data("ui-resizable-alsoresize"), style = {},
+						css = c && c.length ? c : el.parents(ui.originalElement[0]).length ? ["width", "height"] : ["width", "height", "top", "left"];
+
+					$.each(css, function (i, prop) {
+						var sum = (start[prop]||0) + (delta[prop]||0);
+						if (sum && sum >= 0) {
+							style[prop] = sum || null;
+						}
+					});
+
+					el.css(style);
+				});
+			};
+
+		if (typeof(o.alsoResize) === "object" && !o.alsoResize.nodeType) {
+			$.each(o.alsoResize, function (exp, c) { _alsoResize(exp, c); });
+		}else{
+			_alsoResize(o.alsoResize);
+		}
+	},
+
+	stop: function () {
+		$(this).removeData("resizable-alsoresize");
+	}
+});
+
+$.ui.plugin.add("resizable", "ghost", {
+
+	start: function() {
+
+		var that = $(this).data("ui-resizable"), o = that.options, cs = that.size;
+
+		that.ghost = that.originalElement.clone();
+		that.ghost
+			.css({ opacity: 0.25, display: "block", position: "relative", height: cs.height, width: cs.width, margin: 0, left: 0, top: 0 })
+			.addClass("ui-resizable-ghost")
+			.addClass(typeof o.ghost === "string" ? o.ghost : "");
+
+		that.ghost.appendTo(that.helper);
+
+	},
+
+	resize: function(){
+		var that = $(this).data("ui-resizable");
+		if (that.ghost) {
+			that.ghost.css({ position: "relative", height: that.size.height, width: that.size.width });
+		}
+	},
+
+	stop: function() {
+		var that = $(this).data("ui-resizable");
+		if (that.ghost && that.helper) {
+			that.helper.get(0).removeChild(that.ghost.get(0));
+		}
+	}
+
+});
+
+$.ui.plugin.add("resizable", "grid", {
+
+	resize: function() {
+		var that = $(this).data("ui-resizable"),
+			o = that.options,
+			cs = that.size,
+			os = that.originalSize,
+			op = that.originalPosition,
+			a = that.axis,
+			grid = typeof o.grid === "number" ? [o.grid, o.grid] : o.grid,
+			gridX = (grid[0]||1),
+			gridY = (grid[1]||1),
+			ox = Math.round((cs.width - os.width) / gridX) * gridX,
+			oy = Math.round((cs.height - os.height) / gridY) * gridY,
+			newWidth = os.width + ox,
+			newHeight = os.height + oy,
+			isMaxWidth = o.maxWidth && (o.maxWidth < newWidth),
+			isMaxHeight = o.maxHeight && (o.maxHeight < newHeight),
+			isMinWidth = o.minWidth && (o.minWidth > newWidth),
+			isMinHeight = o.minHeight && (o.minHeight > newHeight);
+
+		o.grid = grid;
+
+		if (isMinWidth) {
+			newWidth = newWidth + gridX;
+		}
+		if (isMinHeight) {
+			newHeight = newHeight + gridY;
+		}
+		if (isMaxWidth) {
+			newWidth = newWidth - gridX;
+		}
+		if (isMaxHeight) {
+			newHeight = newHeight - gridY;
+		}
+
+		if (/^(se|s|e)$/.test(a)) {
+			that.size.width = newWidth;
+			that.size.height = newHeight;
+		} else if (/^(ne)$/.test(a)) {
+			that.size.width = newWidth;
+			that.size.height = newHeight;
+			that.position.top = op.top - oy;
+		} else if (/^(sw)$/.test(a)) {
+			that.size.width = newWidth;
+			that.size.height = newHeight;
+			that.position.left = op.left - ox;
+		} else {
+			that.size.width = newWidth;
+			that.size.height = newHeight;
+			that.position.top = op.top - oy;
+			that.position.left = op.left - ox;
+		}
+	}
+
+});
+
+})(jQuery);
diff --git a/data/treeio/treeio/static/js/jquery-ui-1.10.3/ui/jquery.ui.slider.js b/data/treeio/treeio/static/js/jquery-ui-1.10.3/ui/jquery.ui.slider.js
new file mode 100644
index 0000000..b2c4aa3
--- /dev/null
+++ b/data/treeio/treeio/static/js/jquery-ui-1.10.3/ui/jquery.ui.slider.js
@@ -0,0 +1,672 @@
+/*!
+ * jQuery UI Slider 1.10.3
+ * http://jqueryui.com
+ *
+ * Copyright 2013 jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ *
+ * http://api.jqueryui.com/slider/
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+(function( $, undefined ) {
+
+// number of pages in a slider
+// (how many times can you page up/down to go through the whole range)
+var numPages = 5;
+
+$.widget( "ui.slider", $.ui.mouse, {
+	version: "1.10.3",
+	widgetEventPrefix: "slide",
+
+	options: {
+		animate: false,
+		distance: 0,
+		max: 100,
+		min: 0,
+		orientation: "horizontal",
+		range: false,
+		step: 1,
+		value: 0,
+		values: null,
+
+		// callbacks
+		change: null,
+		slide: null,
+		start: null,
+		stop: null
+	},
+
+	_create: function() {
+		this._keySliding = false;
+		this._mouseSliding = false;
+		this._animateOff = true;
+		this._handleIndex = null;
+		this._detectOrientation();
+		this._mouseInit();
+
+		this.element
+			.addClass( "ui-slider" +
+				" ui-slider-" + this.orientation +
+				" ui-widget" +
+				" ui-widget-content" +
+				" ui-corner-all");
+
+		this._refresh();
+		this._setOption( "disabled", this.options.disabled );
+
+		this._animateOff = false;
+	},
+
+	_refresh: function() {
+		this._createRange();
+		this._createHandles();
+		this._setupEvents();
+		this._refreshValue();
+	},
+
+	_createHandles: function() {
+		var i, handleCount,
+			options = this.options,
+			existingHandles = this.element.find( ".ui-slider-handle" ).addClass( "ui-state-default ui-corner-all" ),
+			handle = "<a class='ui-slider-handle ui-state-default ui-corner-all' href='#'></a>",
+			handles = [];
+
+		handleCount = ( options.values && options.values.length ) || 1;
+
+		if ( existingHandles.length > handleCount ) {
+			existingHandles.slice( handleCount ).remove();
+			existingHandles = existingHandles.slice( 0, handleCount );
+		}
+
+		for ( i = existingHandles.length; i < handleCount; i++ ) {
+			handles.push( handle );
+		}
+
+		this.handles = existingHandles.add( $( handles.join( "" ) ).appendTo( this.element ) );
+
+		this.handle = this.handles.eq( 0 );
+
+		this.handles.each(function( i ) {
+			$( this ).data( "ui-slider-handle-index", i );
+		});
+	},
+
+	_createRange: function() {
+		var options = this.options,
+			classes = "";
+
+		if ( options.range ) {
+			if ( options.range === true ) {
+				if ( !options.values ) {
+					options.values = [ this._valueMin(), this._valueMin() ];
+				} else if ( options.values.length && options.values.length !== 2 ) {
+					options.values = [ options.values[0], options.values[0] ];
+				} else if ( $.isArray( options.values ) ) {
+					options.values = options.values.slice(0);
+				}
+			}
+
+			if ( !this.range || !this.range.length ) {
+				this.range = $( "<div></div>" )
+					.appendTo( this.element );
+
+				classes = "ui-slider-range" +
+				// note: this isn't the most fittingly semantic framework class for this element,
+				// but worked best visually with a variety of themes
+				" ui-widget-header ui-corner-all";
+			} else {
+				this.range.removeClass( "ui-slider-range-min ui-slider-range-max" )
+					// Handle range switching from true to min/max
+					.css({
+						"left": "",
+						"bottom": ""
+					});
+			}
+
+			this.range.addClass( classes +
+				( ( options.range === "min" || options.range === "max" ) ? " ui-slider-range-" + options.range : "" ) );
+		} else {
+			this.range = $([]);
+		}
+	},
+
+	_setupEvents: function() {
+		var elements = this.handles.add( this.range ).filter( "a" );
+		this._off( elements );
+		this._on( elements, this._handleEvents );
+		this._hoverable( elements );
+		this._focusable( elements );
+	},
+
+	_destroy: function() {
+		this.handles.remove();
+		this.range.remove();
+
+		this.element
+			.removeClass( "ui-slider" +
+				" ui-slider-horizontal" +
+				" ui-slider-vertical" +
+				" ui-widget" +
+				" ui-widget-content" +
+				" ui-corner-all" );
+
+		this._mouseDestroy();
+	},
+
+	_mouseCapture: function( event ) {
+		var position, normValue, distance, closestHandle, index, allowed, offset, mouseOverHandle,
+			that = this,
+			o = this.options;
+
+		if ( o.disabled ) {
+			return false;
+		}
+
+		this.elementSize = {
+			width: this.element.outerWidth(),
+			height: this.element.outerHeight()
+		};
+		this.elementOffset = this.element.offset();
+
+		position = { x: event.pageX, y: event.pageY };
+		normValue = this._normValueFromMouse( position );
+		distance = this._valueMax() - this._valueMin() + 1;
+		this.handles.each(function( i ) {
+			var thisDistance = Math.abs( normValue - that.values(i) );
+			if (( distance > thisDistance ) ||
+				( distance === thisDistance &&
+					(i === that._lastChangedValue || that.values(i) === o.min ))) {
+				distance = thisDistance;
+				closestHandle = $( this );
+				index = i;
+			}
+		});
+
+		allowed = this._start( event, index );
+		if ( allowed === false ) {
+			return false;
+		}
+		this._mouseSliding = true;
+
+		this._handleIndex = index;
+
+		closestHandle
+			.addClass( "ui-state-active" )
+			.focus();
+
+		offset = closestHandle.offset();
+		mouseOverHandle = !$( event.target ).parents().addBack().is( ".ui-slider-handle" );
+		this._clickOffset = mouseOverHandle ? { left: 0, top: 0 } : {
+			left: event.pageX - offset.left - ( closestHandle.width() / 2 ),
+			top: event.pageY - offset.top -
+				( closestHandle.height() / 2 ) -
+				( parseInt( closestHandle.css("borderTopWidth"), 10 ) || 0 ) -
+				( parseInt( closestHandle.css("borderBottomWidth"), 10 ) || 0) +
+				( parseInt( closestHandle.css("marginTop"), 10 ) || 0)
+		};
+
+		if ( !this.handles.hasClass( "ui-state-hover" ) ) {
+			this._slide( event, index, normValue );
+		}
+		this._animateOff = true;
+		return true;
+	},
+
+	_mouseStart: function() {
+		return true;
+	},
+
+	_mouseDrag: function( event ) {
+		var position = { x: event.pageX, y: event.pageY },
+			normValue = this._normValueFromMouse( position );
+
+		this._slide( event, this._handleIndex, normValue );
+
+		return false;
+	},
+
+	_mouseStop: function( event ) {
+		this.handles.removeClass( "ui-state-active" );
+		this._mouseSliding = false;
+
+		this._stop( event, this._handleIndex );
+		this._change( event, this._handleIndex );
+
+		this._handleIndex = null;
+		this._clickOffset = null;
+		this._animateOff = false;
+
+		return false;
+	},
+
+	_detectOrientation: function() {
+		this.orientation = ( this.options.orientation === "vertical" ) ? "vertical" : "horizontal";
+	},
+
+	_normValueFromMouse: function( position ) {
+		var pixelTotal,
+			pixelMouse,
+			percentMouse,
+			valueTotal,
+			valueMouse;
+
+		if ( this.orientation === "horizontal" ) {
+			pixelTotal = this.elementSize.width;
+			pixelMouse = position.x - this.elementOffset.left - ( this._clickOffset ? this._clickOffset.left : 0 );
+		} else {
+			pixelTotal = this.elementSize.height;
+			pixelMouse = position.y - this.elementOffset.top - ( this._clickOffset ? this._clickOffset.top : 0 );
+		}
+
+		percentMouse = ( pixelMouse / pixelTotal );
+		if ( percentMouse > 1 ) {
+			percentMouse = 1;
+		}
+		if ( percentMouse < 0 ) {
+			percentMouse = 0;
+		}
+		if ( this.orientation === "vertical" ) {
+			percentMouse = 1 - percentMouse;
+		}
+
+		valueTotal = this._valueMax() - this._valueMin();
+		valueMouse = this._valueMin() + percentMouse * valueTotal;
+
+		return this._trimAlignValue( valueMouse );
+	},
+
+	_start: function( event, index ) {
+		var uiHash = {
+			handle: this.handles[ index ],
+			value: this.value()
+		};
+		if ( this.options.values && this.options.values.length ) {
+			uiHash.value = this.values( index );
+			uiHash.values = this.values();
+		}
+		return this._trigger( "start", event, uiHash );
+	},
+
+	_slide: function( event, index, newVal ) {
+		var otherVal,
+			newValues,
+			allowed;
+
+		if ( this.options.values && this.options.values.length ) {
+			otherVal = this.values( index ? 0 : 1 );
+
+			if ( ( this.options.values.length === 2 && this.options.range === true ) &&
+					( ( index === 0 && newVal > otherVal) || ( index === 1 && newVal < otherVal ) )
+				) {
+				newVal = otherVal;
+			}
+
+			if ( newVal !== this.values( index ) ) {
+				newValues = this.values();
+				newValues[ index ] = newVal;
+				// A slide can be canceled by returning false from the slide callback
+				allowed = this._trigger( "slide", event, {
+					handle: this.handles[ index ],
+					value: newVal,
+					values: newValues
+				} );
+				otherVal = this.values( index ? 0 : 1 );
+				if ( allowed !== false ) {
+					this.values( index, newVal, true );
+				}
+			}
+		} else {
+			if ( newVal !== this.value() ) {
+				// A slide can be canceled by returning false from the slide callback
+				allowed = this._trigger( "slide", event, {
+					handle: this.handles[ index ],
+					value: newVal
+				} );
+				if ( allowed !== false ) {
+					this.value( newVal );
+				}
+			}
+		}
+	},
+
+	_stop: function( event, index ) {
+		var uiHash = {
+			handle: this.handles[ index ],
+			value: this.value()
+		};
+		if ( this.options.values && this.options.values.length ) {
+			uiHash.value = this.values( index );
+			uiHash.values = this.values();
+		}
+
+		this._trigger( "stop", event, uiHash );
+	},
+
+	_change: function( event, index ) {
+		if ( !this._keySliding && !this._mouseSliding ) {
+			var uiHash = {
+				handle: this.handles[ index ],
+				value: this.value()
+			};
+			if ( this.options.values && this.options.values.length ) {
+				uiHash.value = this.values( index );
+				uiHash.values = this.values();
+			}
+
+			//store the last changed value index for reference when handles overlap
+			this._lastChangedValue = index;
+
+			this._trigger( "change", event, uiHash );
+		}
+	},
+
+	value: function( newValue ) {
+		if ( arguments.length ) {
+			this.options.value = this._trimAlignValue( newValue );
+			this._refreshValue();
+			this._change( null, 0 );
+			return;
+		}
+
+		return this._value();
+	},
+
+	values: function( index, newValue ) {
+		var vals,
+			newValues,
+			i;
+
+		if ( arguments.length > 1 ) {
+			this.options.values[ index ] = this._trimAlignValue( newValue );
+			this._refreshValue();
+			this._change( null, index );
+			return;
+		}
+
+		if ( arguments.length ) {
+			if ( $.isArray( arguments[ 0 ] ) ) {
+				vals = this.options.values;
+				newValues = arguments[ 0 ];
+				for ( i = 0; i < vals.length; i += 1 ) {
+					vals[ i ] = this._trimAlignValue( newValues[ i ] );
+					this._change( null, i );
+				}
+				this._refreshValue();
+			} else {
+				if ( this.options.values && this.options.values.length ) {
+					return this._values( index );
+				} else {
+					return this.value();
+				}
+			}
+		} else {
+			return this._values();
+		}
+	},
+
+	_setOption: function( key, value ) {
+		var i,
+			valsLength = 0;
+
+		if ( key === "range" && this.options.range === true ) {
+			if ( value === "min" ) {
+				this.options.value = this._values( 0 );
+				this.options.values = null;
+			} else if ( value === "max" ) {
+				this.options.value = this._values( this.options.values.length-1 );
+				this.options.values = null;
+			}
+		}
+
+		if ( $.isArray( this.options.values ) ) {
+			valsLength = this.options.values.length;
+		}
+
+		$.Widget.prototype._setOption.apply( this, arguments );
+
+		switch ( key ) {
+			case "orientation":
+				this._detectOrientation();
+				this.element
+					.removeClass( "ui-slider-horizontal ui-slider-vertical" )
+					.addClass( "ui-slider-" + this.orientation );
+				this._refreshValue();
+				break;
+			case "value":
+				this._animateOff = true;
+				this._refreshValue();
+				this._change( null, 0 );
+				this._animateOff = false;
+				break;
+			case "values":
+				this._animateOff = true;
+				this._refreshValue();
+				for ( i = 0; i < valsLength; i += 1 ) {
+					this._change( null, i );
+				}
+				this._animateOff = false;
+				break;
+			case "min":
+			case "max":
+				this._animateOff = true;
+				this._refreshValue();
+				this._animateOff = false;
+				break;
+			case "range":
+				this._animateOff = true;
+				this._refresh();
+				this._animateOff = false;
+				break;
+		}
+	},
+
+	//internal value getter
+	// _value() returns value trimmed by min and max, aligned by step
+	_value: function() {
+		var val = this.options.value;
+		val = this._trimAlignValue( val );
+
+		return val;
+	},
+
+	//internal values getter
+	// _values() returns array of values trimmed by min and max, aligned by step
+	// _values( index ) returns single value trimmed by min and max, aligned by step
+	_values: function( index ) {
+		var val,
+			vals,
+			i;
+
+		if ( arguments.length ) {
+			val = this.options.values[ index ];
+			val = this._trimAlignValue( val );
+
+			return val;
+		} else if ( this.options.values && this.options.values.length ) {
+			// .slice() creates a copy of the array
+			// this copy gets trimmed by min and max and then returned
+			vals = this.options.values.slice();
+			for ( i = 0; i < vals.length; i+= 1) {
+				vals[ i ] = this._trimAlignValue( vals[ i ] );
+			}
+
+			return vals;
+		} else {
+			return [];
+		}
+	},
+
+	// returns the step-aligned value that val is closest to, between (inclusive) min and max
+	_trimAlignValue: function( val ) {
+		if ( val <= this._valueMin() ) {
+			return this._valueMin();
+		}
+		if ( val >= this._valueMax() ) {
+			return this._valueMax();
+		}
+		var step = ( this.options.step > 0 ) ? this.options.step : 1,
+			valModStep = (val - this._valueMin()) % step,
+			alignValue = val - valModStep;
+
+		if ( Math.abs(valModStep) * 2 >= step ) {
+			alignValue += ( valModStep > 0 ) ? step : ( -step );
+		}
+
+		// Since JavaScript has problems with large floats, round
+		// the final value to 5 digits after the decimal point (see #4124)
+		return parseFloat( alignValue.toFixed(5) );
+	},
+
+	_valueMin: function() {
+		return this.options.min;
+	},
+
+	_valueMax: function() {
+		return this.options.max;
+	},
+
+	_refreshValue: function() {
+		var lastValPercent, valPercent, value, valueMin, valueMax,
+			oRange = this.options.range,
+			o = this.options,
+			that = this,
+			animate = ( !this._animateOff ) ? o.animate : false,
+			_set = {};
+
+		if ( this.options.values && this.options.values.length ) {
+			this.handles.each(function( i ) {
+				valPercent = ( that.values(i) - that._valueMin() ) / ( that._valueMax() - that._valueMin() ) * 100;
+				_set[ that.orientation === "horizontal" ? "left" : "bottom" ] = valPercent + "%";
+				$( this ).stop( 1, 1 )[ animate ? "animate" : "css" ]( _set, o.animate );
+				if ( that.options.range === true ) {
+					if ( that.orientation === "horizontal" ) {
+						if ( i === 0 ) {
+							that.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( { left: valPercent + "%" }, o.animate );
+						}
+						if ( i === 1 ) {
+							that.range[ animate ? "animate" : "css" ]( { width: ( valPercent - lastValPercent ) + "%" }, { queue: false, duration: o.animate } );
+						}
+					} else {
+						if ( i === 0 ) {
+							that.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( { bottom: ( valPercent ) + "%" }, o.animate );
+						}
+						if ( i === 1 ) {
+							that.range[ animate ? "animate" : "css" ]( { height: ( valPercent - lastValPercent ) + "%" }, { queue: false, duration: o.animate } );
+						}
+					}
+				}
+				lastValPercent = valPercent;
+			});
+		} else {
+			value = this.value();
+			valueMin = this._valueMin();
+			valueMax = this._valueMax();
+			valPercent = ( valueMax !== valueMin ) ?
+					( value - valueMin ) / ( valueMax - valueMin ) * 100 :
+					0;
+			_set[ this.orientation === "horizontal" ? "left" : "bottom" ] = valPercent + "%";
+			this.handle.stop( 1, 1 )[ animate ? "animate" : "css" ]( _set, o.animate );
+
+			if ( oRange === "min" && this.orientation === "horizontal" ) {
+				this.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( { width: valPercent + "%" }, o.animate );
+			}
+			if ( oRange === "max" && this.orientation === "horizontal" ) {
+				this.range[ animate ? "animate" : "css" ]( { width: ( 100 - valPercent ) + "%" }, { queue: false, duration: o.animate } );
+			}
+			if ( oRange === "min" && this.orientation === "vertical" ) {
+				this.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( { height: valPercent + "%" }, o.animate );
+			}
+			if ( oRange === "max" && this.orientation === "vertical" ) {
+				this.range[ animate ? "animate" : "css" ]( { height: ( 100 - valPercent ) + "%" }, { queue: false, duration: o.animate } );
+			}
+		}
+	},
+
+	_handleEvents: {
+		keydown: function( event ) {
+			/*jshint maxcomplexity:25*/
+			var allowed, curVal, newVal, step,
+				index = $( event.target ).data( "ui-slider-handle-index" );
+
+			switch ( event.keyCode ) {
+				case $.ui.keyCode.HOME:
+				case $.ui.keyCode.END:
+				case $.ui.keyCode.PAGE_UP:
+				case $.ui.keyCode.PAGE_DOWN:
+				case $.ui.keyCode.UP:
+				case $.ui.keyCode.RIGHT:
+				case $.ui.keyCode.DOWN:
+				case $.ui.keyCode.LEFT:
+					event.preventDefault();
+					if ( !this._keySliding ) {
+						this._keySliding = true;
+						$( event.target ).addClass( "ui-state-active" );
+						allowed = this._start( event, index );
+						if ( allowed === false ) {
+							return;
+						}
+					}
+					break;
+			}
+
+			step = this.options.step;
+			if ( this.options.values && this.options.values.length ) {
+				curVal = newVal = this.values( index );
+			} else {
+				curVal = newVal = this.value();
+			}
+
+			switch ( event.keyCode ) {
+				case $.ui.keyCode.HOME:
+					newVal = this._valueMin();
+					break;
+				case $.ui.keyCode.END:
+					newVal = this._valueMax();
+					break;
+				case $.ui.keyCode.PAGE_UP:
+					newVal = this._trimAlignValue( curVal + ( (this._valueMax() - this._valueMin()) / numPages ) );
+					break;
+				case $.ui.keyCode.PAGE_DOWN:
+					newVal = this._trimAlignValue( curVal - ( (this._valueMax() - this._valueMin()) / numPages ) );
+					break;
+				case $.ui.keyCode.UP:
+				case $.ui.keyCode.RIGHT:
+					if ( curVal === this._valueMax() ) {
+						return;
+					}
+					newVal = this._trimAlignValue( curVal + step );
+					break;
+				case $.ui.keyCode.DOWN:
+				case $.ui.keyCode.LEFT:
+					if ( curVal === this._valueMin() ) {
+						return;
+					}
+					newVal = this._trimAlignValue( curVal - step );
+					break;
+			}
+
+			this._slide( event, index, newVal );
+		},
+		click: function( event ) {
+			event.preventDefault();
+		},
+		keyup: function( event ) {
+			var index = $( event.target ).data( "ui-slider-handle-index" );
+
+			if ( this._keySliding ) {
+				this._keySliding = false;
+				this._stop( event, index );
+				this._change( event, index );
+				$( event.target ).removeClass( "ui-state-active" );
+			}
+		}
+	}
+
+});
+
+}(jQuery));
diff --git a/data/treeio/treeio/static/js/jquery-ui-1.10.3/ui/jquery.ui.sortable.js b/data/treeio/treeio/static/js/jquery-ui-1.10.3/ui/jquery.ui.sortable.js
new file mode 100644
index 0000000..c9f2c90
--- /dev/null
+++ b/data/treeio/treeio/static/js/jquery-ui-1.10.3/ui/jquery.ui.sortable.js
@@ -0,0 +1,1285 @@
+/*!
+ * jQuery UI Sortable 1.10.3
+ * http://jqueryui.com
+ *
+ * Copyright 2013 jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ *
+ * http://api.jqueryui.com/sortable/
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+(function( $, undefined ) {
+
+/*jshint loopfunc: true */
+
+function isOverAxis( x, reference, size ) {
+	return ( x > reference ) && ( x < ( reference + size ) );
+}
+
+function isFloating(item) {
+	return (/left|right/).test(item.css("float")) || (/inline|table-cell/).test(item.css("display"));
+}
+
+$.widget("ui.sortable", $.ui.mouse, {
+	version: "1.10.3",
+	widgetEventPrefix: "sort",
+	ready: false,
+	options: {
+		appendTo: "parent",
+		axis: false,
+		connectWith: false,
+		containment: false,
+		cursor: "auto",
+		cursorAt: false,
+		dropOnEmpty: true,
+		forcePlaceholderSize: false,
+		forceHelperSize: false,
+		grid: false,
+		handle: false,
+		helper: "original",
+		items: "> *",
+		opacity: false,
+		placeholder: false,
+		revert: false,
+		scroll: true,
+		scrollSensitivity: 20,
+		scrollSpeed: 20,
+		scope: "default",
+		tolerance: "intersect",
+		zIndex: 1000,
+
+		// callbacks
+		activate: null,
+		beforeStop: null,
+		change: null,
+		deactivate: null,
+		out: null,
+		over: null,
+		receive: null,
+		remove: null,
+		sort: null,
+		start: null,
+		stop: null,
+		update: null
+	},
+	_create: function() {
+
+		var o = this.options;
+		this.containerCache = {};
+		this.element.addClass("ui-sortable");
+
+		//Get the items
+		this.refresh();
+
+		//Let's determine if the items are being displayed horizontally
+		this.floating = this.items.length ? o.axis === "x" || isFloating(this.items[0].item) : false;
+
+		//Let's determine the parent's offset
+		this.offset = this.element.offset();
+
+		//Initialize mouse events for interaction
+		this._mouseInit();
+
+		//We're ready to go
+		this.ready = true;
+
+	},
+
+	_destroy: function() {
+		this.element
+			.removeClass("ui-sortable ui-sortable-disabled");
+		this._mouseDestroy();
+
+		for ( var i = this.items.length - 1; i >= 0; i-- ) {
+			this.items[i].item.removeData(this.widgetName + "-item");
+		}
+
+		return this;
+	},
+
+	_setOption: function(key, value){
+		if ( key === "disabled" ) {
+			this.options[ key ] = value;
+
+			this.widget().toggleClass( "ui-sortable-disabled", !!value );
+		} else {
+			// Don't call widget base _setOption for disable as it adds ui-state-disabled class
+			$.Widget.prototype._setOption.apply(this, arguments);
+		}
+	},
+
+	_mouseCapture: function(event, overrideHandle) {
+		var currentItem = null,
+			validHandle = false,
+			that = this;
+
+		if (this.reverting) {
+			return false;
+		}
+
+		if(this.options.disabled || this.options.type === "static") {
+			return false;
+		}
+
+		//We have to refresh the items data once first
+		this._refreshItems(event);
+
+		//Find out if the clicked node (or one of its parents) is a actual item in this.items
+		$(event.target).parents().each(function() {
+			if($.data(this, that.widgetName + "-item") === that) {
+				currentItem = $(this);
+				return false;
+			}
+		});
+		if($.data(event.target, that.widgetName + "-item") === that) {
+			currentItem = $(event.target);
+		}
+
+		if(!currentItem) {
+			return false;
+		}
+		if(this.options.handle && !overrideHandle) {
+			$(this.options.handle, currentItem).find("*").addBack().each(function() {
+				if(this === event.target) {
+					validHandle = true;
+				}
+			});
+			if(!validHandle) {
+				return false;
+			}
+		}
+
+		this.currentItem = currentItem;
+		this._removeCurrentsFromItems();
+		return true;
+
+	},
+
+	_mouseStart: function(event, overrideHandle, noActivation) {
+
+		var i, body,
+			o = this.options;
+
+		this.currentContainer = this;
+
+		//We only need to call refreshPositions, because the refreshItems call has been moved to mouseCapture
+		this.refreshPositions();
+
+		//Create and append the visible helper
+		this.helper = this._createHelper(event);
+
+		//Cache the helper size
+		this._cacheHelperProportions();
+
+		/*
+		 * - Position generation -
+		 * This block generates everything position related - it's the core of draggables.
+		 */
+
+		//Cache the margins of the original element
+		this._cacheMargins();
+
+		//Get the next scrolling parent
+		this.scrollParent = this.helper.scrollParent();
+
+		//The element's absolute position on the page minus margins
+		this.offset = this.currentItem.offset();
+		this.offset = {
+			top: this.offset.top - this.margins.top,
+			left: this.offset.left - this.margins.left
+		};
+
+		$.extend(this.offset, {
+			click: { //Where the click happened, relative to the element
+				left: event.pageX - this.offset.left,
+				top: event.pageY - this.offset.top
+			},
+			parent: this._getParentOffset(),
+			relative: this._getRelativeOffset() //This is a relative to absolute position minus the actual position calculation - only used for relative positioned helper
+		});
+
+		// Only after we got the offset, we can change the helper's position to absolute
+		// TODO: Still need to figure out a way to make relative sorting possible
+		this.helper.css("position", "absolute");
+		this.cssPosition = this.helper.css("position");
+
+		//Generate the original position
+		this.originalPosition = this._generatePosition(event);
+		this.originalPageX = event.pageX;
+		this.originalPageY = event.pageY;
+
+		//Adjust the mouse offset relative to the helper if "cursorAt" is supplied
+		(o.cursorAt && this._adjustOffsetFromHelper(o.cursorAt));
+
+		//Cache the former DOM position
+		this.domPosition = { prev: this.currentItem.prev()[0], parent: this.currentItem.parent()[0] };
+
+		//If the helper is not the original, hide the original so it's not playing any role during the drag, won't cause anything bad this way
+		if(this.helper[0] !== this.currentItem[0]) {
+			this.currentItem.hide();
+		}
+
+		//Create the placeholder
+		this._createPlaceholder();
+
+		//Set a containment if given in the options
+		if(o.containment) {
+			this._setContainment();
+		}
+
+		if( o.cursor && o.cursor !== "auto" ) { // cursor option
+			body = this.document.find( "body" );
+
+			// support: IE
+			this.storedCursor = body.css( "cursor" );
+			body.css( "cursor", o.cursor );
+
+			this.storedStylesheet = $( "<style>*{ cursor: "+o.cursor+" !important; }</style>" ).appendTo( body );
+		}
+
+		if(o.opacity) { // opacity option
+			if (this.helper.css("opacity")) {
+				this._storedOpacity = this.helper.css("opacity");
+			}
+			this.helper.css("opacity", o.opacity);
+		}
+
+		if(o.zIndex) { // zIndex option
+			if (this.helper.css("zIndex")) {
+				this._storedZIndex = this.helper.css("zIndex");
+			}
+			this.helper.css("zIndex", o.zIndex);
+		}
+
+		//Prepare scrolling
+		if(this.scrollParent[0] !== document && this.scrollParent[0].tagName !== "HTML") {
+			this.overflowOffset = this.scrollParent.offset();
+		}
+
+		//Call callbacks
+		this._trigger("start", event, this._uiHash());
+
+		//Recache the helper size
+		if(!this._preserveHelperProportions) {
+			this._cacheHelperProportions();
+		}
+
+
+		//Post "activate" events to possible containers
+		if( !noActivation ) {
+			for ( i = this.containers.length - 1; i >= 0; i-- ) {
+				this.containers[ i ]._trigger( "activate", event, this._uiHash( this ) );
+			}
+		}
+
+		//Prepare possible droppables
+		if($.ui.ddmanager) {
+			$.ui.ddmanager.current = this;
+		}
+
+		if ($.ui.ddmanager && !o.dropBehaviour) {
+			$.ui.ddmanager.prepareOffsets(this, event);
+		}
+
+		this.dragging = true;
+
+		this.helper.addClass("ui-sortable-helper");
+		this._mouseDrag(event); //Execute the drag once - this causes the helper not to be visible before getting its correct position
+		return true;
+
+	},
+
+	_mouseDrag: function(event) {
+		var i, item, itemElement, intersection,
+			o = this.options,
+			scrolled = false;
+
+		//Compute the helpers position
+		this.position = this._generatePosition(event);
+		this.positionAbs = this._convertPositionTo("absolute");
+
+		if (!this.lastPositionAbs) {
+			this.lastPositionAbs = this.positionAbs;
+		}
+
+		//Do scrolling
+		if(this.options.scroll) {
+			if(this.scrollParent[0] !== document && this.scrollParent[0].tagName !== "HTML") {
+
+				if((this.overflowOffset.top + this.scrollParent[0].offsetHeight) - event.pageY < o.scrollSensitivity) {
+					this.scrollParent[0].scrollTop = scrolled = this.scrollParent[0].scrollTop + o.scrollSpeed;
+				} else if(event.pageY - this.overflowOffset.top < o.scrollSensitivity) {
+					this.scrollParent[0].scrollTop = scrolled = this.scrollParent[0].scrollTop - o.scrollSpeed;
+				}
+
+				if((this.overflowOffset.left + this.scrollParent[0].offsetWidth) - event.pageX < o.scrollSensitivity) {
+					this.scrollParent[0].scrollLeft = scrolled = this.scrollParent[0].scrollLeft + o.scrollSpeed;
+				} else if(event.pageX - this.overflowOffset.left < o.scrollSensitivity) {
+					this.scrollParent[0].scrollLeft = scrolled = this.scrollParent[0].scrollLeft - o.scrollSpeed;
+				}
+
+			} else {
+
+				if(event.pageY - $(document).scrollTop() < o.scrollSensitivity) {
+					scrolled = $(document).scrollTop($(document).scrollTop() - o.scrollSpeed);
+				} else if($(window).height() - (event.pageY - $(document).scrollTop()) < o.scrollSensitivity) {
+					scrolled = $(document).scrollTop($(document).scrollTop() + o.scrollSpeed);
+				}
+
+				if(event.pageX - $(document).scrollLeft() < o.scrollSensitivity) {
+					scrolled = $(document).scrollLeft($(document).scrollLeft() - o.scrollSpeed);
+				} else if($(window).width() - (event.pageX - $(document).scrollLeft()) < o.scrollSensitivity) {
+					scrolled = $(document).scrollLeft($(document).scrollLeft() + o.scrollSpeed);
+				}
+
+			}
+
+			if(scrolled !== false && $.ui.ddmanager && !o.dropBehaviour) {
+				$.ui.ddmanager.prepareOffsets(this, event);
+			}
+		}
+
+		//Regenerate the absolute position used for position checks
+		this.positionAbs = this._convertPositionTo("absolute");
+
+		//Set the helper position
+		if(!this.options.axis || this.options.axis !== "y") {
+			this.helper[0].style.left = this.position.left+"px";
+		}
+		if(!this.options.axis || this.options.axis !== "x") {
+			this.helper[0].style.top = this.position.top+"px";
+		}
+
+		//Rearrange
+		for (i = this.items.length - 1; i >= 0; i--) {
+
+			//Cache variables and intersection, continue if no intersection
+			item = this.items[i];
+			itemElement = item.item[0];
+			intersection = this._intersectsWithPointer(item);
+			if (!intersection) {
+				continue;
+			}
+
+			// Only put the placeholder inside the current Container, skip all
+			// items form other containers. This works because when moving
+			// an item from one container to another the
+			// currentContainer is switched before the placeholder is moved.
+			//
+			// Without this moving items in "sub-sortables" can cause the placeholder to jitter
+			// beetween the outer and inner container.
+			if (item.instance !== this.currentContainer) {
+				continue;
+			}
+
+			// cannot intersect with itself
+			// no useless actions that have been done before
+			// no action if the item moved is the parent of the item checked
+			if (itemElement !== this.currentItem[0] &&
+				this.placeholder[intersection === 1 ? "next" : "prev"]()[0] !== itemElement &&
+				!$.contains(this.placeholder[0], itemElement) &&
+				(this.options.type === "semi-dynamic" ? !$.contains(this.element[0], itemElement) : true)
+			) {
+
+				this.direction = intersection === 1 ? "down" : "up";
+
+				if (this.options.tolerance === "pointer" || this._intersectsWithSides(item)) {
+					this._rearrange(event, item);
+				} else {
+					break;
+				}
+
+				this._trigger("change", event, this._uiHash());
+				break;
+			}
+		}
+
+		//Post events to containers
+		this._contactContainers(event);
+
+		//Interconnect with droppables
+		if($.ui.ddmanager) {
+			$.ui.ddmanager.drag(this, event);
+		}
+
+		//Call callbacks
+		this._trigger("sort", event, this._uiHash());
+
+		this.lastPositionAbs = this.positionAbs;
+		return false;
+
+	},
+
+	_mouseStop: function(event, noPropagation) {
+
+		if(!event) {
+			return;
+		}
+
+		//If we are using droppables, inform the manager about the drop
+		if ($.ui.ddmanager && !this.options.dropBehaviour) {
+			$.ui.ddmanager.drop(this, event);
+		}
+
+		if(this.options.revert) {
+			var that = this,
+				cur = this.placeholder.offset(),
+				axis = this.options.axis,
+				animation = {};
+
+			if ( !axis || axis === "x" ) {
+				animation.left = cur.left - this.offset.parent.left - this.margins.left + (this.offsetParent[0] === document.body ? 0 : this.offsetParent[0].scrollLeft);
+			}
+			if ( !axis || axis === "y" ) {
+				animation.top = cur.top - this.offset.parent.top - this.margins.top + (this.offsetParent[0] === document.body ? 0 : this.offsetParent[0].scrollTop);
+			}
+			this.reverting = true;
+			$(this.helper).animate( animation, parseInt(this.options.revert, 10) || 500, function() {
+				that._clear(event);
+			});
+		} else {
+			this._clear(event, noPropagation);
+		}
+
+		return false;
+
+	},
+
+	cancel: function() {
+
+		if(this.dragging) {
+
+			this._mouseUp({ target: null });
+
+			if(this.options.helper === "original") {
+				this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper");
+			} else {
+				this.currentItem.show();
+			}
+
+			//Post deactivating events to containers
+			for (var i = this.containers.length - 1; i >= 0; i--){
+				this.containers[i]._trigger("deactivate", null, this._uiHash(this));
+				if(this.containers[i].containerCache.over) {
+					this.containers[i]._trigger("out", null, this._uiHash(this));
+					this.containers[i].containerCache.over = 0;
+				}
+			}
+
+		}
+
+		if (this.placeholder) {
+			//$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately, it unbinds ALL events from the original node!
+			if(this.placeholder[0].parentNode) {
+				this.placeholder[0].parentNode.removeChild(this.placeholder[0]);
+			}
+			if(this.options.helper !== "original" && this.helper && this.helper[0].parentNode) {
+				this.helper.remove();
+			}
+
+			$.extend(this, {
+				helper: null,
+				dragging: false,
+				reverting: false,
+				_noFinalSort: null
+			});
+
+			if(this.domPosition.prev) {
+				$(this.domPosition.prev).after(this.currentItem);
+			} else {
+				$(this.domPosition.parent).prepend(this.currentItem);
+			}
+		}
+
+		return this;
+
+	},
+
+	serialize: function(o) {
+
+		var items = this._getItemsAsjQuery(o && o.connected),
+			str = [];
+		o = o || {};
+
+		$(items).each(function() {
+			var res = ($(o.item || this).attr(o.attribute || "id") || "").match(o.expression || (/(.+)[\-=_](.+)/));
+			if (res) {
+				str.push((o.key || res[1]+"[]")+"="+(o.key && o.expression ? res[1] : res[2]));
+			}
+		});
+
+		if(!str.length && o.key) {
+			str.push(o.key + "=");
+		}
+
+		return str.join("&");
+
+	},
+
+	toArray: function(o) {
+
+		var items = this._getItemsAsjQuery(o && o.connected),
+			ret = [];
+
+		o = o || {};
+
+		items.each(function() { ret.push($(o.item || this).attr(o.attribute || "id") || ""); });
+		return ret;
+
+	},
+
+	/* Be careful with the following core functions */
+	_intersectsWith: function(item) {
+
+		var x1 = this.positionAbs.left,
+			x2 = x1 + this.helperProportions.width,
+			y1 = this.positionAbs.top,
+			y2 = y1 + this.helperProportions.height,
+			l = item.left,
+			r = l + item.width,
+			t = item.top,
+			b = t + item.height,
+			dyClick = this.offset.click.top,
+			dxClick = this.offset.click.left,
+			isOverElementHeight = ( this.options.axis === "x" ) || ( ( y1 + dyClick ) > t && ( y1 + dyClick ) < b ),
+			isOverElementWidth = ( this.options.axis === "y" ) || ( ( x1 + dxClick ) > l && ( x1 + dxClick ) < r ),
+			isOverElement = isOverElementHeight && isOverElementWidth;
+
+		if ( this.options.tolerance === "pointer" ||
+			this.options.forcePointerForContainers ||
+			(this.options.tolerance !== "pointer" && this.helperProportions[this.floating ? "width" : "height"] > item[this.floating ? "width" : "height"])
+		) {
+			return isOverElement;
+		} else {
+
+			return (l < x1 + (this.helperProportions.width / 2) && // Right Half
+				x2 - (this.helperProportions.width / 2) < r && // Left Half
+				t < y1 + (this.helperProportions.height / 2) && // Bottom Half
+				y2 - (this.helperProportions.height / 2) < b ); // Top Half
+
+		}
+	},
+
+	_intersectsWithPointer: function(item) {
+
+		var isOverElementHeight = (this.options.axis === "x") || isOverAxis(this.positionAbs.top + this.offset.click.top, item.top, item.height),
+			isOverElementWidth = (this.options.axis === "y") || isOverAxis(this.positionAbs.left + this.offset.click.left, item.left, item.width),
+			isOverElement = isOverElementHeight && isOverElementWidth,
+			verticalDirection = this._getDragVerticalDirection(),
+			horizontalDirection = this._getDragHorizontalDirection();
+
+		if (!isOverElement) {
+			return false;
+		}
+
+		return this.floating ?
+			( ((horizontalDirection && horizontalDirection === "right") || verticalDirection === "down") ? 2 : 1 )
+			: ( verticalDirection && (verticalDirection === "down" ? 2 : 1) );
+
+	},
+
+	_intersectsWithSides: function(item) {
+
+		var isOverBottomHalf = isOverAxis(this.positionAbs.top + this.offset.click.top, item.top + (item.height/2), item.height),
+			isOverRightHalf = isOverAxis(this.positionAbs.left + this.offset.click.left, item.left + (item.width/2), item.width),
+			verticalDirection = this._getDragVerticalDirection(),
+			horizontalDirection = this._getDragHorizontalDirection();
+
+		if (this.floating && horizontalDirection) {
+			return ((horizontalDirection === "right" && isOverRightHalf) || (horizontalDirection === "left" && !isOverRightHalf));
+		} else {
+			return verticalDirection && ((verticalDirection === "down" && isOverBottomHalf) || (verticalDirection === "up" && !isOverBottomHalf));
+		}
+
+	},
+
+	_getDragVerticalDirection: function() {
+		var delta = this.positionAbs.top - this.lastPositionAbs.top;
+		return delta !== 0 && (delta > 0 ? "down" : "up");
+	},
+
+	_getDragHorizontalDirection: function() {
+		var delta = this.positionAbs.left - this.lastPositionAbs.left;
+		return delta !== 0 && (delta > 0 ? "right" : "left");
+	},
+
+	refresh: function(event) {
+		this._refreshItems(event);
+		this.refreshPositions();
+		return this;
+	},
+
+	_connectWith: function() {
+		var options = this.options;
+		return options.connectWith.constructor === String ? [options.connectWith] : options.connectWith;
+	},
+
+	_getItemsAsjQuery: function(connected) {
+
+		var i, j, cur, inst,
+			items = [],
+			queries = [],
+			connectWith = this._connectWith();
+
+		if(connectWith && connected) {
+			for (i = connectWith.length - 1; i >= 0; i--){
+				cur = $(connectWith[i]);
+				for ( j = cur.length - 1; j >= 0; j--){
+					inst = $.data(cur[j], this.widgetFullName);
+					if(inst && inst !== this && !inst.options.disabled) {
+						queries.push([$.isFunction(inst.options.items) ? inst.options.items.call(inst.element) : $(inst.options.items, inst.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"), inst]);
+					}
+				}
+			}
+		}
+
+		queries.push([$.isFunction(this.options.items) ? this.options.items.call(this.element, null, { options: this.options, item: this.currentItem }) : $(this.options.items, this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"), this]);
+
+		for (i = queries.length - 1; i >= 0; i--){
+			queries[i][0].each(function() {
+				items.push(this);
+			});
+		}
+
+		return $(items);
+
+	},
+
+	_removeCurrentsFromItems: function() {
+
+		var list = this.currentItem.find(":data(" + this.widgetName + "-item)");
+
+		this.items = $.grep(this.items, function (item) {
+			for (var j=0; j < list.length; j++) {
+				if(list[j] === item.item[0]) {
+					return false;
+				}
+			}
+			return true;
+		});
+
+	},
+
+	_refreshItems: function(event) {
+
+		this.items = [];
+		this.containers = [this];
+
+		var i, j, cur, inst, targetData, _queries, item, queriesLength,
+			items = this.items,
+			queries = [[$.isFunction(this.options.items) ? this.options.items.call(this.element[0], event, { item: this.currentItem }) : $(this.options.items, this.element), this]],
+			connectWith = this._connectWith();
+
+		if(connectWith && this.ready) { //Shouldn't be run the first time through due to massive slow-down
+			for (i = connectWith.length - 1; i >= 0; i--){
+				cur = $(connectWith[i]);
+				for (j = cur.length - 1; j >= 0; j--){
+					inst = $.data(cur[j], this.widgetFullName);
+					if(inst && inst !== this && !inst.options.disabled) {
+						queries.push([$.isFunction(inst.options.items) ? inst.options.items.call(inst.element[0], event, { item: this.currentItem }) : $(inst.options.items, inst.element), inst]);
+						this.containers.push(inst);
+					}
+				}
+			}
+		}
+
+		for (i = queries.length - 1; i >= 0; i--) {
+			targetData = queries[i][1];
+			_queries = queries[i][0];
+
+			for (j=0, queriesLength = _queries.length; j < queriesLength; j++) {
+				item = $(_queries[j]);
+
+				item.data(this.widgetName + "-item", targetData); // Data for target checking (mouse manager)
+
+				items.push({
+					item: item,
+					instance: targetData,
+					width: 0, height: 0,
+					left: 0, top: 0
+				});
+			}
+		}
+
+	},
+
+	refreshPositions: function(fast) {
+
+		//This has to be redone because due to the item being moved out/into the offsetParent, the offsetParent's position will change
+		if(this.offsetParent && this.helper) {
+			this.offset.parent = this._getParentOffset();
+		}
+
+		var i, item, t, p;
+
+		for (i = this.items.length - 1; i >= 0; i--){
+			item = this.items[i];
+
+			//We ignore calculating positions of all connected containers when we're not over them
+			if(item.instance !== this.currentContainer && this.currentContainer && item.item[0] !== this.currentItem[0]) {
+				continue;
+			}
+
+			t = this.options.toleranceElement ? $(this.options.toleranceElement, item.item) : item.item;
+
+			if (!fast) {
+				item.width = t.outerWidth();
+				item.height = t.outerHeight();
+			}
+
+			p = t.offset();
+			item.left = p.left;
+			item.top = p.top;
+		}
+
+		if(this.options.custom && this.options.custom.refreshContainers) {
+			this.options.custom.refreshContainers.call(this);
+		} else {
+			for (i = this.containers.length - 1; i >= 0; i--){
+				p = this.containers[i].element.offset();
+				this.containers[i].containerCache.left = p.left;
+				this.containers[i].containerCache.top = p.top;
+				this.containers[i].containerCache.width	= this.containers[i].element.outerWidth();
+				this.containers[i].containerCache.height = this.containers[i].element.outerHeight();
+			}
+		}
+
+		return this;
+	},
+
+	_createPlaceholder: function(that) {
+		that = that || this;
+		var className,
+			o = that.options;
+
+		if(!o.placeholder || o.placeholder.constructor === String) {
+			className = o.placeholder;
+			o.placeholder = {
+				element: function() {
+
+					var nodeName = that.currentItem[0].nodeName.toLowerCase(),
+						element = $( "<" + nodeName + ">", that.document[0] )
+							.addClass(className || that.currentItem[0].className+" ui-sortable-placeholder")
+							.removeClass("ui-sortable-helper");
+
+					if ( nodeName === "tr" ) {
+						that.currentItem.children().each(function() {
+							$( "<td>&#160;</td>", that.document[0] )
+								.attr( "colspan", $( this ).attr( "colspan" ) || 1 )
+								.appendTo( element );
+						});
+					} else if ( nodeName === "img" ) {
+						element.attr( "src", that.currentItem.attr( "src" ) );
+					}
+
+					if ( !className ) {
+						element.css( "visibility", "hidden" );
+					}
+
+					return element;
+				},
+				update: function(container, p) {
+
+					// 1. If a className is set as 'placeholder option, we don't force sizes - the class is responsible for that
+					// 2. The option 'forcePlaceholderSize can be enabled to force it even if a class name is specified
+					if(className && !o.forcePlaceholderSize) {
+						return;
+					}
+
+					//If the element doesn't have a actual height by itself (without styles coming from a stylesheet), it receives the inline height from the dragged item
+					if(!p.height()) { p.height(that.currentItem.innerHeight() - parseInt(that.currentItem.css("paddingTop")||0, 10) - parseInt(that.currentItem.css("paddingBottom")||0, 10)); }
+					if(!p.width()) { p.width(that.currentItem.innerWidth() - parseInt(that.currentItem.css("paddingLeft")||0, 10) - parseInt(that.currentItem.css("paddingRight")||0, 10)); }
+				}
+			};
+		}
+
+		//Create the placeholder
+		that.placeholder = $(o.placeholder.element.call(that.element, that.currentItem));
+
+		//Append it after the actual current item
+		that.currentItem.after(that.placeholder);
+
+		//Update the size of the placeholder (TODO: Logic to fuzzy, see line 316/317)
+		o.placeholder.update(that, that.placeholder);
+
+	},
+
+	_contactContainers: function(event) {
+		var i, j, dist, itemWithLeastDistance, posProperty, sizeProperty, base, cur, nearBottom, floating,
+			innermostContainer = null,
+			innermostIndex = null;
+
+		// get innermost container that intersects with item
+		for (i = this.containers.length - 1; i >= 0; i--) {
+
+			// never consider a container that's located within the item itself
+			if($.contains(this.currentItem[0], this.containers[i].element[0])) {
+				continue;
+			}
+
+			if(this._intersectsWith(this.containers[i].containerCache)) {
+
+				// if we've already found a container and it's more "inner" than this, then continue
+				if(innermostContainer && $.contains(this.containers[i].element[0], innermostContainer.element[0])) {
+					continue;
+				}
+
+				innermostContainer = this.containers[i];
+				innermostIndex = i;
+
+			} else {
+				// container doesn't intersect. trigger "out" event if necessary
+				if(this.containers[i].containerCache.over) {
+					this.containers[i]._trigger("out", event, this._uiHash(this));
+					this.containers[i].containerCache.over = 0;
+				}
+			}
+
+		}
+
+		// if no intersecting containers found, return
+		if(!innermostContainer) {
+			return;
+		}
+
+		// move the item into the container if it's not there already
+		if(this.containers.length === 1) {
+			if (!this.containers[innermostIndex].containerCache.over) {
+				this.containers[innermostIndex]._trigger("over", event, this._uiHash(this));
+				this.containers[innermostIndex].containerCache.over = 1;
+			}
+		} else {
+
+			//When entering a new container, we will find the item with the least distance and append our item near it
+			dist = 10000;
+			itemWithLeastDistance = null;
+			floating = innermostContainer.floating || isFloating(this.currentItem);
+			posProperty = floating ? "left" : "top";
+			sizeProperty = floating ? "width" : "height";
+			base = this.positionAbs[posProperty] + this.offset.click[posProperty];
+			for (j = this.items.length - 1; j >= 0; j--) {
+				if(!$.contains(this.containers[innermostIndex].element[0], this.items[j].item[0])) {
+					continue;
+				}
+				if(this.items[j].item[0] === this.currentItem[0]) {
+					continue;
+				}
+				if (floating && !isOverAxis(this.positionAbs.top + this.offset.click.top, this.items[j].top, this.items[j].height)) {
+					continue;
+				}
+				cur = this.items[j].item.offset()[posProperty];
+				nearBottom = false;
+				if(Math.abs(cur - base) > Math.abs(cur + this.items[j][sizeProperty] - base)){
+					nearBottom = true;
+					cur += this.items[j][sizeProperty];
+				}
+
+				if(Math.abs(cur - base) < dist) {
+					dist = Math.abs(cur - base); itemWithLeastDistance = this.items[j];
+					this.direction = nearBottom ? "up": "down";
+				}
+			}
+
+			//Check if dropOnEmpty is enabled
+			if(!itemWithLeastDistance && !this.options.dropOnEmpty) {
+				return;
+			}
+
+			if(this.currentContainer === this.containers[innermostIndex]) {
+				return;
+			}
+
+			itemWithLeastDistance ? this._rearrange(event, itemWithLeastDistance, null, true) : this._rearrange(event, null, this.containers[innermostIndex].element, true);
+			this._trigger("change", event, this._uiHash());
+			this.containers[innermostIndex]._trigger("change", event, this._uiHash(this));
+			this.currentContainer = this.containers[innermostIndex];
+
+			//Update the placeholder
+			this.options.placeholder.update(this.currentContainer, this.placeholder);
+
+			this.containers[innermostIndex]._trigger("over", event, this._uiHash(this));
+			this.containers[innermostIndex].containerCache.over = 1;
+		}
+
+
+	},
+
+	_createHelper: function(event) {
+
+		var o = this.options,
+			helper = $.isFunction(o.helper) ? $(o.helper.apply(this.element[0], [event, this.currentItem])) : (o.helper === "clone" ? this.currentItem.clone() : this.currentItem);
+
+		//Add the helper to the DOM if that didn't happen already
+		if(!helper.parents("body").length) {
+			$(o.appendTo !== "parent" ? o.appendTo : this.currentItem[0].parentNode)[0].appendChild(helper[0]);
+		}
+
+		if(helper[0] === this.currentItem[0]) {
+			this._storedCSS = { width: this.currentItem[0].style.width, height: this.currentItem[0].style.height, position: this.currentItem.css("position"), top: this.currentItem.css("top"), left: this.currentItem.css("left") };
+		}
+
+		if(!helper[0].style.width || o.forceHelperSize) {
+			helper.width(this.currentItem.width());
+		}
+		if(!helper[0].style.height || o.forceHelperSize) {
+			helper.height(this.currentItem.height());
+		}
+
+		return helper;
+
+	},
+
+	_adjustOffsetFromHelper: function(obj) {
+		if (typeof obj === "string") {
+			obj = obj.split(" ");
+		}
+		if ($.isArray(obj)) {
+			obj = {left: +obj[0], top: +obj[1] || 0};
+		}
+		if ("left" in obj) {
+			this.offset.click.left = obj.left + this.margins.left;
+		}
+		if ("right" in obj) {
+			this.offset.click.left = this.helperProportions.width - obj.right + this.margins.left;
+		}
+		if ("top" in obj) {
+			this.offset.click.top = obj.top + this.margins.top;
+		}
+		if ("bottom" in obj) {
+			this.offset.click.top = this.helperProportions.height - obj.bottom + this.margins.top;
+		}
+	},
+
+	_getParentOffset: function() {
+
+
+		//Get the offsetParent and cache its position
+		this.offsetParent = this.helper.offsetParent();
+		var po = this.offsetParent.offset();
+
+		// This is a special case where we need to modify a offset calculated on start, since the following happened:
+		// 1. The position of the helper is absolute, so it's position is calculated based on the next positioned parent
+		// 2. The actual offset parent is a child of the scroll parent, and the scroll parent isn't the document, which means that
+		//    the scroll is included in the initial calculation of the offset of the parent, and never recalculated upon drag
+		if(this.cssPosition === "absolute" && this.scrollParent[0] !== document && $.contains(this.scrollParent[0], this.offsetParent[0])) {
+			po.left += this.scrollParent.scrollLeft();
+			po.top += this.scrollParent.scrollTop();
+		}
+
+		// This needs to be actually done for all browsers, since pageX/pageY includes this information
+		// with an ugly IE fix
+		if( this.offsetParent[0] === document.body || (this.offsetParent[0].tagName && this.offsetParent[0].tagName.toLowerCase() === "html" && $.ui.ie)) {
+			po = { top: 0, left: 0 };
+		}
+
+		return {
+			top: po.top + (parseInt(this.offsetParent.css("borderTopWidth"),10) || 0),
+			left: po.left + (parseInt(this.offsetParent.css("borderLeftWidth"),10) || 0)
+		};
+
+	},
+
+	_getRelativeOffset: function() {
+
+		if(this.cssPosition === "relative") {
+			var p = this.currentItem.position();
+			return {
+				top: p.top - (parseInt(this.helper.css("top"),10) || 0) + this.scrollParent.scrollTop(),
+				left: p.left - (parseInt(this.helper.css("left"),10) || 0) + this.scrollParent.scrollLeft()
+			};
+		} else {
+			return { top: 0, left: 0 };
+		}
+
+	},
+
+	_cacheMargins: function() {
+		this.margins = {
+			left: (parseInt(this.currentItem.css("marginLeft"),10) || 0),
+			top: (parseInt(this.currentItem.css("marginTop"),10) || 0)
+		};
+	},
+
+	_cacheHelperProportions: function() {
+		this.helperProportions = {
+			width: this.helper.outerWidth(),
+			height: this.helper.outerHeight()
+		};
+	},
+
+	_setContainment: function() {
+
+		var ce, co, over,
+			o = this.options;
+		if(o.containment === "parent") {
+			o.containment = this.helper[0].parentNode;
+		}
+		if(o.containment === "document" || o.containment === "window") {
+			this.containment = [
+				0 - this.offset.relative.left - this.offset.parent.left,
+				0 - this.offset.relative.top - this.offset.parent.top,
+				$(o.containment === "document" ? document : window).width() - this.helperProportions.width - this.margins.left,
+				($(o.containment === "document" ? document : window).height() || document.body.parentNode.scrollHeight) - this.helperProportions.height - this.margins.top
+			];
+		}
+
+		if(!(/^(document|window|parent)$/).test(o.containment)) {
+			ce = $(o.containment)[0];
+			co = $(o.containment).offset();
+			over = ($(ce).css("overflow") !== "hidden");
+
+			this.containment = [
+				co.left + (parseInt($(ce).css("borderLeftWidth"),10) || 0) + (parseInt($(ce).css("paddingLeft"),10) || 0) - this.margins.left,
+				co.top + (parseInt($(ce).css("borderTopWidth"),10) || 0) + (parseInt($(ce).css("paddingTop"),10) || 0) - this.margins.top,
+				co.left+(over ? Math.max(ce.scrollWidth,ce.offsetWidth) : ce.offsetWidth) - (parseInt($(ce).css("borderLeftWidth"),10) || 0) - (parseInt($(ce).css("paddingRight"),10) || 0) - this.helperProportions.width - this.margins.left,
+				co.top+(over ? Math.max(ce.scrollHeight,ce.offsetHeight) : ce.offsetHeight) - (parseInt($(ce).css("borderTopWidth"),10) || 0) - (parseInt($(ce).css("paddingBottom"),10) || 0) - this.helperProportions.height - this.margins.top
+			];
+		}
+
+	},
+
+	_convertPositionTo: function(d, pos) {
+
+		if(!pos) {
+			pos = this.position;
+		}
+		var mod = d === "absolute" ? 1 : -1,
+			scroll = this.cssPosition === "absolute" && !(this.scrollParent[0] !== document && $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent,
+			scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
+
+		return {
+			top: (
+				pos.top	+																// The absolute mouse position
+				this.offset.relative.top * mod +										// Only for relative positioned nodes: Relative offset from element to offset parent
+				this.offset.parent.top * mod -											// The offsetParent's offset without borders (offset + border)
+				( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ) * mod)
+			),
+			left: (
+				pos.left +																// The absolute mouse position
+				this.offset.relative.left * mod +										// Only for relative positioned nodes: Relative offset from element to offset parent
+				this.offset.parent.left * mod	-										// The offsetParent's offset without borders (offset + border)
+				( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ) * mod)
+			)
+		};
+
+	},
+
+	_generatePosition: function(event) {
+
+		var top, left,
+			o = this.options,
+			pageX = event.pageX,
+			pageY = event.pageY,
+			scroll = this.cssPosition === "absolute" && !(this.scrollParent[0] !== document && $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
+
+		// This is another very weird special case that only happens for relative elements:
+		// 1. If the css position is relative
+		// 2. and the scroll parent is the document or similar to the offset parent
+		// we have to refresh the relative offset during the scroll so there are no jumps
+		if(this.cssPosition === "relative" && !(this.scrollParent[0] !== document && this.scrollParent[0] !== this.offsetParent[0])) {
+			this.offset.relative = this._getRelativeOffset();
+		}
+
+		/*
+		 * - Position constraining -
+		 * Constrain the position to a mix of grid, containment.
+		 */
+
+		if(this.originalPosition) { //If we are not dragging yet, we won't check for options
+
+			if(this.containment) {
+				if(event.pageX - this.offset.click.left < this.containment[0]) {
+					pageX = this.containment[0] + this.offset.click.left;
+				}
+				if(event.pageY - this.offset.click.top < this.containment[1]) {
+					pageY = this.containment[1] + this.offset.click.top;
+				}
+				if(event.pageX - this.offset.click.left > this.containment[2]) {
+					pageX = this.containment[2] + this.offset.click.left;
+				}
+				if(event.pageY - this.offset.click.top > this.containment[3]) {
+					pageY = this.containment[3] + this.offset.click.top;
+				}
+			}
+
+			if(o.grid) {
+				top = this.originalPageY + Math.round((pageY - this.originalPageY) / o.grid[1]) * o.grid[1];
+				pageY = this.containment ? ( (top - this.offset.click.top >= this.containment[1] && top - this.offset.click.top <= this.containment[3]) ? top : ((top - this.offset.click.top >= this.containment[1]) ? top - o.grid[1] : top + o.grid[1])) : top;
+
+				left = this.originalPageX + Math.round((pageX - this.originalPageX) / o.grid[0]) * o.grid[0];
+				pageX = this.containment ? ( (left - this.offset.click.left >= this.containment[0] && left - this.offset.click.left <= this.containment[2]) ? left : ((left - this.offset.click.left >= this.containment[0]) ? left - o.grid[0] : left + o.grid[0])) : left;
+			}
+
+		}
+
+		return {
+			top: (
+				pageY -																// The absolute mouse position
+				this.offset.click.top -													// Click offset (relative to the element)
+				this.offset.relative.top	-											// Only for relative positioned nodes: Relative offset from element to offset parent
+				this.offset.parent.top +												// The offsetParent's offset without borders (offset + border)
+				( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ))
+			),
+			left: (
+				pageX -																// The absolute mouse position
+				this.offset.click.left -												// Click offset (relative to the element)
+				this.offset.relative.left	-											// Only for relative positioned nodes: Relative offset from element to offset parent
+				this.offset.parent.left +												// The offsetParent's offset without borders (offset + border)
+				( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ))
+			)
+		};
+
+	},
+
+	_rearrange: function(event, i, a, hardRefresh) {
+
+		a ? a[0].appendChild(this.placeholder[0]) : i.item[0].parentNode.insertBefore(this.placeholder[0], (this.direction === "down" ? i.item[0] : i.item[0].nextSibling));
+
+		//Various things done here to improve the performance:
+		// 1. we create a setTimeout, that calls refreshPositions
+		// 2. on the instance, we have a counter variable, that get's higher after every append
+		// 3. on the local scope, we copy the counter variable, and check in the timeout, if it's still the same
+		// 4. this lets only the last addition to the timeout stack through
+		this.counter = this.counter ? ++this.counter : 1;
+		var counter = this.counter;
+
+		this._delay(function() {
+			if(counter === this.counter) {
+				this.refreshPositions(!hardRefresh); //Precompute after each DOM insertion, NOT on mousemove
+			}
+		});
+
+	},
+
+	_clear: function(event, noPropagation) {
+
+		this.reverting = false;
+		// We delay all events that have to be triggered to after the point where the placeholder has been removed and
+		// everything else normalized again
+		var i,
+			delayedTriggers = [];
+
+		// We first have to update the dom position of the actual currentItem
+		// Note: don't do it if the current item is already removed (by a user), or it gets reappended (see #4088)
+		if(!this._noFinalSort && this.currentItem.parent().length) {
+			this.placeholder.before(this.currentItem);
+		}
+		this._noFinalSort = null;
+
+		if(this.helper[0] === this.currentItem[0]) {
+			for(i in this._storedCSS) {
+				if(this._storedCSS[i] === "auto" || this._storedCSS[i] === "static") {
+					this._storedCSS[i] = "";
+				}
+			}
+			this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper");
+		} else {
+			this.currentItem.show();
+		}
+
+		if(this.fromOutside && !noPropagation) {
+			delayedTriggers.push(function(event) { this._trigger("receive", event, this._uiHash(this.fromOutside)); });
+		}
+		if((this.fromOutside || this.domPosition.prev !== this.currentItem.prev().not(".ui-sortable-helper")[0] || this.domPosition.parent !== this.currentItem.parent()[0]) && !noPropagation) {
+			delayedTriggers.push(function(event) { this._trigger("update", event, this._uiHash()); }); //Trigger update callback if the DOM position has changed
+		}
+
+		// Check if the items Container has Changed and trigger appropriate
+		// events.
+		if (this !== this.currentContainer) {
+			if(!noPropagation) {
+				delayedTriggers.push(function(event) { this._trigger("remove", event, this._uiHash()); });
+				delayedTriggers.push((function(c) { return function(event) { c._trigger("receive", event, this._uiHash(this)); };  }).call(this, this.currentContainer));
+				delayedTriggers.push((function(c) { return function(event) { c._trigger("update", event, this._uiHash(this));  }; }).call(this, this.currentContainer));
+			}
+		}
+
+
+		//Post events to containers
+		for (i = this.containers.length - 1; i >= 0; i--){
+			if(!noPropagation) {
+				delayedTriggers.push((function(c) { return function(event) { c._trigger("deactivate", event, this._uiHash(this)); };  }).call(this, this.containers[i]));
+			}
+			if(this.containers[i].containerCache.over) {
+				delayedTriggers.push((function(c) { return function(event) { c._trigger("out", event, this._uiHash(this)); };  }).call(this, this.containers[i]));
+				this.containers[i].containerCache.over = 0;
+			}
+		}
+
+		//Do what was originally in plugins
+		if ( this.storedCursor ) {
+			this.document.find( "body" ).css( "cursor", this.storedCursor );
+			this.storedStylesheet.remove();
+		}
+		if(this._storedOpacity) {
+			this.helper.css("opacity", this._storedOpacity);
+		}
+		if(this._storedZIndex) {
+			this.helper.css("zIndex", this._storedZIndex === "auto" ? "" : this._storedZIndex);
+		}
+
+		this.dragging = false;
+		if(this.cancelHelperRemoval) {
+			if(!noPropagation) {
+				this._trigger("beforeStop", event, this._uiHash());
+				for (i=0; i < delayedTriggers.length; i++) {
+					delayedTriggers[i].call(this, event);
+				} //Trigger all delayed events
+				this._trigger("stop", event, this._uiHash());
+			}
+
+			this.fromOutside = false;
+			return false;
+		}
+
+		if(!noPropagation) {
+			this._trigger("beforeStop", event, this._uiHash());
+		}
+
+		//$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately, it unbinds ALL events from the original node!
+		this.placeholder[0].parentNode.removeChild(this.placeholder[0]);
+
+		if(this.helper[0] !== this.currentItem[0]) {
+			this.helper.remove();
+		}
+		this.helper = null;
+
+		if(!noPropagation) {
+			for (i=0; i < delayedTriggers.length; i++) {
+				delayedTriggers[i].call(this, event);
+			} //Trigger all delayed events
+			this._trigger("stop", event, this._uiHash());
+		}
+
+		this.fromOutside = false;
+		return true;
+
+	},
+
+	_trigger: function() {
+		if ($.Widget.prototype._trigger.apply(this, arguments) === false) {
+			this.cancel();
+		}
+	},
+
+	_uiHash: function(_inst) {
+		var inst = _inst || this;
+		return {
+			helper: inst.helper,
+			placeholder: inst.placeholder || $([]),
+			position: inst.position,
+			originalPosition: inst.originalPosition,
+			offset: inst.positionAbs,
+			item: inst.currentItem,
+			sender: _inst ? _inst.element : null
+		};
+	}
+
+});
+
+})(jQuery);
diff --git a/data/treeio/treeio/static/js/jquery-ui-1.10.3/ui/jquery.ui.tabs.js b/data/treeio/treeio/static/js/jquery-ui-1.10.3/ui/jquery.ui.tabs.js
new file mode 100644
index 0000000..b37858e
--- /dev/null
+++ b/data/treeio/treeio/static/js/jquery-ui-1.10.3/ui/jquery.ui.tabs.js
@@ -0,0 +1,846 @@
+/*!
+ * jQuery UI Tabs 1.10.3
+ * http://jqueryui.com
+ *
+ * Copyright 2013 jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ *
+ * http://api.jqueryui.com/tabs/
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ */
+(function( $, undefined ) {
+
+var tabId = 0,
+	rhash = /#.*$/;
+
+function getNextTabId() {
+	return ++tabId;
+}
+
+function isLocal( anchor ) {
+	return anchor.hash.length > 1 &&
+		decodeURIComponent( anchor.href.replace( rhash, "" ) ) ===
+			decodeURIComponent( location.href.replace( rhash, "" ) );
+}
+
+$.widget( "ui.tabs", {
+	version: "1.10.3",
+	delay: 300,
+	options: {
+		active: null,
+		collapsible: false,
+		event: "click",
+		heightStyle: "content",
+		hide: null,
+		show: null,
+
+		// callbacks
+		activate: null,
+		beforeActivate: null,
+		beforeLoad: null,
+		load: null
+	},
+
+	_create: function() {
+		var that = this,
+			options = this.options;
+
+		this.running = false;
+
+		this.element
+			.addClass( "ui-tabs ui-widget ui-widget-content ui-corner-all" )
+			.toggleClass( "ui-tabs-collapsible", options.collapsible )
+			// Prevent users from focusing disabled tabs via click
+			.delegate( ".ui-tabs-nav > li", "mousedown" + this.eventNamespace, function( event ) {
+				if ( $( this ).is( ".ui-state-disabled" ) ) {
+					event.preventDefault();
+				}
+			})
+			// support: IE <9
+			// Preventing the default action in mousedown doesn't prevent IE
+			// from focusing the element, so if the anchor gets focused, blur.
+			// We don't have to worry about focusing the previously focused
+			// element since clicking on a non-focusable element should focus
+			// the body anyway.
+			.delegate( ".ui-tabs-anchor", "focus" + this.eventNamespace, function() {
+				if ( $( this ).closest( "li" ).is( ".ui-state-disabled" ) ) {
+					this.blur();
+				}
+			});
+
+		this._processTabs();
+		options.active = this._initialActive();
+
+		// Take disabling tabs via class attribute from HTML
+		// into account and update option properly.
+		if ( $.isArray( options.disabled ) ) {
+			options.disabled = $.unique( options.disabled.concat(
+				$.map( this.tabs.filter( ".ui-state-disabled" ), function( li ) {
+					return that.tabs.index( li );
+				})
+			) ).sort();
+		}
+
+		// check for length avoids error when initializing empty list
+		if ( this.options.active !== false && this.anchors.length ) {
+			this.active = this._findActive( options.active );
+		} else {
+			this.active = $();
+		}
+
+		this._refresh();
+
+		if ( this.active.length ) {
+			this.load( options.active );
+		}
+	},
+
+	_initialActive: function() {
+		var active = this.options.active,
+			collapsible = this.options.collapsible,
+			locationHash = location.hash.substring( 1 );
+
+		if ( active === null ) {
+			// check the fragment identifier in the URL
+			if ( locationHash ) {
+				this.tabs.each(function( i, tab ) {
+					if ( $( tab ).attr( "aria-controls" ) === locationHash ) {
+						active = i;
+						return false;
+					}
+				});
+			}
+
+			// check for a tab marked active via a class
+			if ( active === null ) {
+				active = this.tabs.index( this.tabs.filter( ".ui-tabs-active" ) );
+			}
+
+			// no active tab, set to false
+			if ( active === null || active === -1 ) {
+				active = this.tabs.length ? 0 : false;
+			}
+		}
+
+		// handle numbers: negative, out of range
+		if ( active !== false ) {
+			active = this.tabs.index( this.tabs.eq( active ) );
+			if ( active === -1 ) {
+				active = collapsible ? false : 0;
+			}
+		}
+
+		// don't allow collapsible: false and active: false
+		if ( !collapsible && active === false && this.anchors.length ) {
+			active = 0;
+		}
+
+		return active;
+	},
+
+	_getCreateEventData: function() {
+		return {
+			tab: this.active,
+			panel: !this.active.length ? $() : this._getPanelForTab( this.active )
+		};
+	},
+
+	_tabKeydown: function( event ) {
+		/*jshint maxcomplexity:15*/
+		var focusedTab = $( this.document[0].activeElement ).closest( "li" ),
+			selectedIndex = this.tabs.index( focusedTab ),
+			goingForward = true;
+
+		if ( this._handlePageNav( event ) ) {
+			return;
+		}
+
+		switch ( event.keyCode ) {
+			case $.ui.keyCode.RIGHT:
+			case $.ui.keyCode.DOWN:
+				selectedIndex++;
+				break;
+			case $.ui.keyCode.UP:
+			case $.ui.keyCode.LEFT:
+				goingForward = false;
+				selectedIndex--;
+				break;
+			case $.ui.keyCode.END:
+				selectedIndex = this.anchors.length - 1;
+				break;
+			case $.ui.keyCode.HOME:
+				selectedIndex = 0;
+				break;
+			case $.ui.keyCode.SPACE:
+				// Activate only, no collapsing
+				event.preventDefault();
+				clearTimeout( this.activating );
+				this._activate( selectedIndex );
+				return;
+			case $.ui.keyCode.ENTER:
+				// Toggle (cancel delayed activation, allow collapsing)
+				event.preventDefault();
+				clearTimeout( this.activating );
+				// Determine if we should collapse or activate
+				this._activate( selectedIndex === this.options.active ? false : selectedIndex );
+				return;
+			default:
+				return;
+		}
+
+		// Focus the appropriate tab, based on which key was pressed
+		event.preventDefault();
+		clearTimeout( this.activating );
+		selectedIndex = this._focusNextTab( selectedIndex, goingForward );
+
+		// Navigating with control key will prevent automatic activation
+		if ( !event.ctrlKey ) {
+			// Update aria-selected immediately so that AT think the tab is already selected.
+			// Otherwise AT may confuse the user by stating that they need to activate the tab,
+			// but the tab will already be activated by the time the announcement finishes.
+			focusedTab.attr( "aria-selected", "false" );
+			this.tabs.eq( selectedIndex ).attr( "aria-selected", "true" );
+
+			this.activating = this._delay(function() {
+				this.option( "active", selectedIndex );
+			}, this.delay );
+		}
+	},
+
+	_panelKeydown: function( event ) {
+		if ( this._handlePageNav( event ) ) {
+			return;
+		}
+
+		// Ctrl+up moves focus to the current tab
+		if ( event.ctrlKey && event.keyCode === $.ui.keyCode.UP ) {
+			event.preventDefault();
+			this.active.focus();
+		}
+	},
+
+	// Alt+page up/down moves focus to the previous/next tab (and activates)
+	_handlePageNav: function( event ) {
+		if ( event.altKey && event.keyCode === $.ui.keyCode.PAGE_UP ) {
+			this._activate( this._focusNextTab( this.options.active - 1, false ) );
+			return true;
+		}
+		if ( event.altKey && event.keyCode === $.ui.keyCode.PAGE_DOWN ) {
+			this._activate( this._focusNextTab( this.options.active + 1, true ) );
+			return true;
+		}
+	},
+
+	_findNextTab: function( index, goingForward ) {
+		var lastTabIndex = this.tabs.length - 1;
+
+		function constrain() {
+			if ( index > lastTabIndex ) {
+				index = 0;
+			}
+			if ( index < 0 ) {
+				index = lastTabIndex;
+			}
+			return index;
+		}
+
+		while ( $.inArray( constrain(), this.options.disabled ) !== -1 ) {
+			index = goingForward ? index + 1 : index - 1;
+		}
+
+		return index;
+	},
+
+	_focusNextTab: function( index, goingForward ) {
+		index = this._findNextTab( index, goingForward );
+		this.tabs.eq( index ).focus();
+		return index;
+	},
+
+	_setOption: function( key, value ) {
+		if ( key === "active" ) {
+			// _activate() will handle invalid values and update this.options
+			this._activate( value );
+			return;
+		}
+
+		if ( key === "disabled" ) {
+			// don't use the widget factory's disabled handling
+			this._setupDisabled( value );
+			return;
+		}
+
+		this._super( key, value);
+
+		if ( key === "collapsible" ) {
+			this.element.toggleClass( "ui-tabs-collapsible", value );
+			// Setting collapsible: false while collapsed; open first panel
+			if ( !value && this.options.active === false ) {
+				this._activate( 0 );
+			}
+		}
+
+		if ( key === "event" ) {
+			this._setupEvents( value );
+		}
+
+		if ( key === "heightStyle" ) {
+			this._setupHeightStyle( value );
+		}
+	},
+
+	_tabId: function( tab ) {
+		return tab.attr( "aria-controls" ) || "ui-tabs-" + getNextTabId();
+	},
+
+	_sanitizeSelector: function( hash ) {
+		return hash ? hash.replace( /[!"$%&'()*+,.\/:;<=>?@\[\]\^`{|}~]/g, "\\$&" ) : "";
+	},
+
+	refresh: function() {
+		var options = this.options,
+			lis = this.tablist.children( ":has(a[href])" );
+
+		// get disabled tabs from class attribute from HTML
+		// this will get converted to a boolean if needed in _refresh()
+		options.disabled = $.map( lis.filter( ".ui-state-disabled" ), function( tab ) {
+			return lis.index( tab );
+		});
+
+		this._processTabs();
+
+		// was collapsed or no tabs
+		if ( options.active === false || !this.anchors.length ) {
+			options.active = false;
+			this.active = $();
+		// was active, but active tab is gone
+		} else if ( this.active.length && !$.contains( this.tablist[ 0 ], this.active[ 0 ] ) ) {
+			// all remaining tabs are disabled
+			if ( this.tabs.length === options.disabled.length ) {
+				options.active = false;
+				this.active = $();
+			// activate previous tab
+			} else {
+				this._activate( this._findNextTab( Math.max( 0, options.active - 1 ), false ) );
+			}
+		// was active, active tab still exists
+		} else {
+			// make sure active index is correct
+			options.active = this.tabs.index( this.active );
+		}
+
+		this._refresh();
+	},
+
+	_refresh: function() {
+		this._setupDisabled( this.options.disabled );
+		this._setupEvents( this.options.event );
+		this._setupHeightStyle( this.options.heightStyle );
+
+		this.tabs.not( this.active ).attr({
+			"aria-selected": "false",
+			tabIndex: -1
+		});
+		this.panels.not( this._getPanelForTab( this.active ) )
+			.hide()
+			.attr({
+				"aria-expanded": "false",
+				"aria-hidden": "true"
+			});
+
+		// Make sure one tab is in the tab order
+		if ( !this.active.length ) {
+			this.tabs.eq( 0 ).attr( "tabIndex", 0 );
+		} else {
+			this.active
+				.addClass( "ui-tabs-active ui-state-active" )
+				.attr({
+					"aria-selected": "true",
+					tabIndex: 0
+				});
+			this._getPanelForTab( this.active )
+				.show()
+				.attr({
+					"aria-expanded": "true",
+					"aria-hidden": "false"
+				});
+		}
+	},
+
+	_processTabs: function() {
+		var that = this;
+
+		this.tablist = this._getList()
+			.addClass( "ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all" )
+			.attr( "role", "tablist" );
+
+		this.tabs = this.tablist.find( "> li:has(a[href])" )
+			.addClass( "ui-state-default ui-corner-top" )
+			.attr({
+				role: "tab",
+				tabIndex: -1
+			});
+
+		this.anchors = this.tabs.map(function() {
+				return $( "a", this )[ 0 ];
+			})
+			.addClass( "ui-tabs-anchor" )
+			.attr({
+				role: "presentation",
+				tabIndex: -1
+			});
+
+		this.panels = $();
+
+		this.anchors.each(function( i, anchor ) {
+			var selector, panel, panelId,
+				anchorId = $( anchor ).uniqueId().attr( "id" ),
+				tab = $( anchor ).closest( "li" ),
+				originalAriaControls = tab.attr( "aria-controls" );
+
+			// inline tab
+			if ( isLocal( anchor ) ) {
+				selector = anchor.hash;
+				panel = that.element.find( that._sanitizeSelector( selector ) );
+			// remote tab
+			} else {
+				panelId = that._tabId( tab );
+				selector = "#" + panelId;
+				panel = that.element.find( selector );
+				if ( !panel.length ) {
+					panel = that._createPanel( panelId );
+					panel.insertAfter( that.panels[ i - 1 ] || that.tablist );
+				}
+				panel.attr( "aria-live", "polite" );
+			}
+
+			if ( panel.length) {
+				that.panels = that.panels.add( panel );
+			}
+			if ( originalAriaControls ) {
+				tab.data( "ui-tabs-aria-controls", originalAriaControls );
+			}
+			tab.attr({
+				"aria-controls": selector.substring( 1 ),
+				"aria-labelledby": anchorId
+			});
+			panel.attr( "aria-labelledby", anchorId );
+		});
+
+		this.panels
+			.addClass( "ui-tabs-panel ui-widget-content ui-corner-bottom" )
+			.attr( "role", "tabpanel" );
+	},
+
+	// allow overriding how to find the list for rare usage scenarios (#7715)
+	_getList: function() {
+		return this.element.find( "ol,ul" ).eq( 0 );
+	},
+
+	_createPanel: function( id ) {
+		return $( "<div>" )
+			.attr( "id", id )
+			.addClass( "ui-tabs-panel ui-widget-content ui-corner-bottom" )
+			.data( "ui-tabs-destroy", true );
+	},
+
+	_setupDisabled: function( disabled ) {
+		if ( $.isArray( disabled ) ) {
+			if ( !disabled.length ) {
+				disabled = false;
+			} else if ( disabled.length === this.anchors.length ) {
+				disabled = true;
+			}
+		}
+
+		// disable tabs
+		for ( var i = 0, li; ( li = this.tabs[ i ] ); i++ ) {
+			if ( disabled === true || $.inArray( i, disabled ) !== -1 ) {
+				$( li )
+					.addClass( "ui-state-disabled" )
+					.attr( "aria-disabled", "true" );
+			} else {
+				$( li )
+					.removeClass( "ui-state-disabled" )
+					.removeAttr( "aria-disabled" );
+			}
+		}
+
+		this.options.disabled = disabled;
+	},
+
+	_setupEvents: function( event ) {
+		var events = {
+			click: function( event ) {
+				event.preventDefault();
+			}
+		};
+		if ( event ) {
+			$.each( event.split(" "), function( index, eventName ) {
+				events[ eventName ] = "_eventHandler";
+			});
+		}
+
+		this._off( this.anchors.add( this.tabs ).add( this.panels ) );
+		this._on( this.anchors, events );
+		this._on( this.tabs, { keydown: "_tabKeydown" } );
+		this._on( this.panels, { keydown: "_panelKeydown" } );
+
+		this._focusable( this.tabs );
+		this._hoverable( this.tabs );
+	},
+
+	_setupHeightStyle: function( heightStyle ) {
+		var maxHeight,
+			parent = this.element.parent();
+
+		if ( heightStyle === "fill" ) {
+			maxHeight = parent.height();
+			maxHeight -= this.element.outerHeight() - this.element.height();
+
+			this.element.siblings( ":visible" ).each(function() {
+				var elem = $( this ),
+					position = elem.css( "position" );
+
+				if ( position === "absolute" || position === "fixed" ) {
+					return;
+				}
+				maxHeight -= elem.outerHeight( true );
+			});
+
+			this.element.children().not( this.panels ).each(function() {
+				maxHeight -= $( this ).outerHeight( true );
+			});
+
+			this.panels.each(function() {
+				$( this ).height( Math.max( 0, maxHeight -
+					$( this ).innerHeight() + $( this ).height() ) );
+			})
+			.css( "overflow", "auto" );
+		} else if ( heightStyle === "auto" ) {
+			maxHeight = 0;
+			this.panels.each(function() {
+				maxHeight = Math.max( maxHeight, $( this ).height( "" ).height() );
+			}).height( maxHeight );
+		}
+	},
+
+	_eventHandler: function( event ) {
+		var options = this.options,
+			active = this.active,
+			anchor = $( event.currentTarget ),
+			tab = anchor.closest( "li" ),
+			clickedIsActive = tab[ 0 ] === active[ 0 ],
+			collapsing = clickedIsActive && options.collapsible,
+			toShow = collapsing ? $() : this._getPanelForTab( tab ),
+			toHide = !active.length ? $() : this._getPanelForTab( active ),
+			eventData = {
+				oldTab: active,
+				oldPanel: toHide,
+				newTab: collapsing ? $() : tab,
+				newPanel: toShow
+			};
+
+		event.preventDefault();
+
+		if ( tab.hasClass( "ui-state-disabled" ) ||
+				// tab is already loading
+				tab.hasClass( "ui-tabs-loading" ) ||
+				// can't switch durning an animation
+				this.running ||
+				// click on active header, but not collapsible
+				( clickedIsActive && !options.collapsible ) ||
+				// allow canceling activation
+				( this._trigger( "beforeActivate", event, eventData ) === false ) ) {
+			return;
+		}
+
+		options.active = collapsing ? false : this.tabs.index( tab );
+
+		this.active = clickedIsActive ? $() : tab;
+		if ( this.xhr ) {
+			this.xhr.abort();
+		}
+
+		if ( !toHide.length && !toShow.length ) {
+			$.error( "jQuery UI Tabs: Mismatching fragment identifier." );
+		}
+
+		if ( toShow.length ) {
+			this.load( this.tabs.index( tab ), event );
+		}
+		this._toggle( event, eventData );
+	},
+
+	// handles show/hide for selecting tabs
+	_toggle: function( event, eventData ) {
+		var that = this,
+			toShow = eventData.newPanel,
+			toHide = eventData.oldPanel;
+
+		this.running = true;
+
+		function complete() {
+			that.running = false;
+			that._trigger( "activate", event, eventData );
+		}
+
+		function show() {
+			eventData.newTab.closest( "li" ).addClass( "ui-tabs-active ui-state-active" );
+
+			if ( toShow.length && that.options.show ) {
+				that._show( toShow, that.options.show, complete );
+			} else {
+				toShow.show();
+				complete();
+			}
+		}
+
+		// start out by hiding, then showing, then completing
+		if ( toHide.length && this.options.hide ) {
+			this._hide( toHide, this.options.hide, function() {
+				eventData.oldTab.closest( "li" ).removeClass( "ui-tabs-active ui-state-active" );
+				show();
+			});
+		} else {
+			eventData.oldTab.closest( "li" ).removeClass( "ui-tabs-active ui-state-active" );
+			toHide.hide();
+			show();
+		}
+
+		toHide.attr({
+			"aria-expanded": "false",
+			"aria-hidden": "true"
+		});
+		eventData.oldTab.attr( "aria-selected", "false" );
+		// If we're switching tabs, remove the old tab from the tab order.
+		// If we're opening from collapsed state, remove the previous tab from the tab order.
+		// If we're collapsing, then keep the collapsing tab in the tab order.
+		if ( toShow.length && toHide.length ) {
+			eventData.oldTab.attr( "tabIndex", -1 );
+		} else if ( toShow.length ) {
+			this.tabs.filter(function() {
+				return $( this ).attr( "tabIndex" ) === 0;
+			})
+			.attr( "tabIndex", -1 );
+		}
+
+		toShow.attr({
+			"aria-expanded": "true",
+			"aria-hidden": "false"
+		});
+		eventData.newTab.attr({
+			"aria-selected": "true",
+			tabIndex: 0
+		});
+	},
+
+	_activate: function( index ) {
+		var anchor,
+			active = this._findActive( index );
+
+		// trying to activate the already active panel
+		if ( active[ 0 ] === this.active[ 0 ] ) {
+			return;
+		}
+
+		// trying to collapse, simulate a click on the current active header
+		if ( !active.length ) {
+			active = this.active;
+		}
+
+		anchor = active.find( ".ui-tabs-anchor" )[ 0 ];
+		this._eventHandler({
+			target: anchor,
+			currentTarget: anchor,
+			preventDefault: $.noop
+		});
+	},
+
+	_findActive: function( index ) {
+		return index === false ? $() : this.tabs.eq( index );
+	},
+
+	_getIndex: function( index ) {
+		// meta-function to give users option to provide a href string instead of a numerical index.
+		if ( typeof index === "string" ) {
+			index = this.anchors.index( this.anchors.filter( "[href$='" + index + "']" ) );
+		}
+
+		return index;
+	},
+
+	_destroy: function() {
+		if ( this.xhr ) {
+			this.xhr.abort();
+		}
+
+		this.element.removeClass( "ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible" );
+
+		this.tablist
+			.removeClass( "ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all" )
+			.removeAttr( "role" );
+
+		this.anchors
+			.removeClass( "ui-tabs-anchor" )
+			.removeAttr( "role" )
+			.removeAttr( "tabIndex" )
+			.removeUniqueId();
+
+		this.tabs.add( this.panels ).each(function() {
+			if ( $.data( this, "ui-tabs-destroy" ) ) {
+				$( this ).remove();
+			} else {
+				$( this )
+					.removeClass( "ui-state-default ui-state-active ui-state-disabled " +
+						"ui-corner-top ui-corner-bottom ui-widget-content ui-tabs-active ui-tabs-panel" )
+					.removeAttr( "tabIndex" )
+					.removeAttr( "aria-live" )
+					.removeAttr( "aria-busy" )
+					.removeAttr( "aria-selected" )
+					.removeAttr( "aria-labelledby" )
+					.removeAttr( "aria-hidden" )
+					.removeAttr( "aria-expanded" )
+					.removeAttr( "role" );
+			}
+		});
+
+		this.tabs.each(function() {
+			var li = $( this ),
+				prev = li.data( "ui-tabs-aria-controls" );
+			if ( prev ) {
+				li
+					.attr( "aria-controls", prev )
+					.removeData( "ui-tabs-aria-controls" );
+			} else {
+				li.removeAttr( "aria-controls" );
+			}
+		});
+
+		this.panels.show();
+
+		if ( this.options.heightStyle !== "content" ) {
+			this.panels.css( "height", "" );
+		}
+	},
+
+	enable: function( index ) {
+		var disabled = this.options.disabled;
+		if ( disabled === false ) {
+			return;
+		}
+
+		if ( index === undefined ) {
+			disabled = false;
+		} else {
+			index = this._getIndex( index );
+			if ( $.isArray( disabled ) ) {
+				disabled = $.map( disabled, function( num ) {
+					return num !== index ? num : null;
+				});
+			} else {
+				disabled = $.map( this.tabs, function( li, num ) {
+					return num !== index ? num : null;
+				});
+			}
+		}
+		this._setupDisabled( disabled );
+	},
+
+	disable: function( index ) {
+		var disabled = this.options.disabled;
+		if ( disabled === true ) {
+			return;
+		}
+
+		if ( index === undefined ) {
+			disabled = true;
+		} else {
+			index = this._getIndex( index );
+			if ( $.inArray( index, disabled ) !== -1 ) {
+				return;
+			}
+			if ( $.isArray( disabled ) ) {
+				disabled = $.merge( [ index ], disabled ).sort();
+			} else {
+				disabled = [ index ];
+			}
+		}
+		this._setupDisabled( disabled );
+	},
+
+	load: function( index, event ) {
+		index = this._getIndex( index );
+		var that = this,
+			tab = this.tabs.eq( index ),
+			anchor = tab.find( ".ui-tabs-anchor" ),
+			panel = this._getPanelForTab( tab ),
+			eventData = {
+				tab: tab,
+				panel: panel
+			};
+
+		// not remote
+		if ( isLocal( anchor[ 0 ] ) ) {
+			return;
+		}
+
+		this.xhr = $.ajax( this._ajaxSettings( anchor, event, eventData ) );
+
+		// support: jQuery <1.8
+		// jQuery <1.8 returns false if the request is canceled in beforeSend,
+		// but as of 1.8, $.ajax() always returns a jqXHR object.
+		if ( this.xhr && this.xhr.statusText !== "canceled" ) {
+			tab.addClass( "ui-tabs-loading" );
+			panel.attr( "aria-busy", "true" );
+
+			this.xhr
+				.success(function( response ) {
+					// support: jQuery <1.8
+					// http://bugs.jquery.com/ticket/11778
+					setTimeout(function() {
+						panel.html( response );
+						that._trigger( "load", event, eventData );
+					}, 1 );
+				})
+				.complete(function( jqXHR, status ) {
+					// support: jQuery <1.8
+					// http://bugs.jquery.com/ticket/11778
+					setTimeout(function() {
+						if ( status === "abort" ) {
+							that.panels.stop( false, true );
+						}
+
+						tab.removeClass( "ui-tabs-loading" );
+						panel.removeAttr( "aria-busy" );
+
+						if ( jqXHR === that.xhr ) {
+							delete that.xhr;
+						}
+					}, 1 );
+				});
+		}
+	},
+
+	_ajaxSettings: function( anchor, event, eventData ) {
+		var that = this;
+		return {
+			url: anchor.attr( "href" ),
+			beforeSend: function( jqXHR, settings ) {
+				return that._trigger( "beforeLoad", event,
+					$.extend( { jqXHR : jqXHR, ajaxSettings: settings }, eventData ) );
+			}
+		};
+	},
+
+	_getPanelForTab: function( tab ) {
+		var id = $( tab ).attr( "aria-controls" );
+		return this.element.find( this._sanitizeSelector( "#" + id ) );
+	}
+});
+
+})( jQuery );
diff --git a/data/treeio/treeio/static/js/jquery-ui-custom.js b/data/treeio/treeio/static/js/jquery-ui-custom.js
new file mode 100644
index 0000000..a674ee3
--- /dev/null
+++ b/data/treeio/treeio/static/js/jquery-ui-custom.js
@@ -0,0 +1,778 @@
+/*!
+ * jQuery UI 1.8.5
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI
+ */
+(function(c,j){function k(a){return!c(a).parents().andSelf().filter(function(){return c.curCSS(this,"visibility")==="hidden"||c.expr.filters.hidden(this)}).length}c.ui=c.ui||{};if(!c.ui.version){c.extend(c.ui,{version:"1.8.5",keyCode:{ALT:18,BACKSPACE:8,CAPS_LOCK:20,COMMA:188,COMMAND:91,COMMAND_LEFT:91,COMMAND_RIGHT:93,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,MENU:93,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,
+NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38,WINDOWS:91}});c.fn.extend({_focus:c.fn.focus,focus:function(a,b){return typeof a==="number"?this.each(function(){var d=this;setTimeout(function(){c(d).focus();b&&b.call(d)},a)}):this._focus.apply(this,arguments)},scrollParent:function(){var a;a=c.browser.msie&&/(static|relative)/.test(this.css("position"))||/absolute/.test(this.css("position"))?this.parents().filter(function(){return/(relative|absolute|fixed)/.test(c.curCSS(this,
+"position",1))&&/(auto|scroll)/.test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0):this.parents().filter(function(){return/(auto|scroll)/.test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0);return/fixed/.test(this.css("position"))||!a.length?c(document):a},zIndex:function(a){if(a!==j)return this.css("zIndex",a);if(this.length){a=c(this[0]);for(var b;a.length&&a[0]!==document;){b=a.css("position");
+if(b==="absolute"||b==="relative"||b==="fixed"){b=parseInt(a.css("zIndex"));if(!isNaN(b)&&b!=0)return b}a=a.parent()}}return 0},disableSelection:function(){return this.bind("mousedown.ui-disableSelection selectstart.ui-disableSelection",function(a){a.preventDefault()})},enableSelection:function(){return this.unbind(".ui-disableSelection")}});c.each(["Width","Height"],function(a,b){function d(f,g,l,m){c.each(e,function(){g-=parseFloat(c.curCSS(f,"padding"+this,true))||0;if(l)g-=parseFloat(c.curCSS(f,
+"border"+this+"Width",true))||0;if(m)g-=parseFloat(c.curCSS(f,"margin"+this,true))||0});return g}var e=b==="Width"?["Left","Right"]:["Top","Bottom"],h=b.toLowerCase(),i={innerWidth:c.fn.innerWidth,innerHeight:c.fn.innerHeight,outerWidth:c.fn.outerWidth,outerHeight:c.fn.outerHeight};c.fn["inner"+b]=function(f){if(f===j)return i["inner"+b].call(this);return this.each(function(){c.style(this,h,d(this,f)+"px")})};c.fn["outer"+b]=function(f,g){if(typeof f!=="number")return i["outer"+b].call(this,f);return this.each(function(){c.style(this,
+h,d(this,f,true,g)+"px")})}});c.extend(c.expr[":"],{data:function(a,b,d){return!!c.data(a,d[3])},focusable:function(a){var b=a.nodeName.toLowerCase(),d=c.attr(a,"tabindex");if("area"===b){b=a.parentNode;d=b.name;if(!a.href||!d||b.nodeName.toLowerCase()!=="map")return false;a=c("img[usemap=#"+d+"]")[0];return!!a&&k(a)}return(/input|select|textarea|button|object/.test(b)?!a.disabled:"a"==b?a.href||!isNaN(d):!isNaN(d))&&k(a)},tabbable:function(a){var b=c.attr(a,"tabindex");return(isNaN(b)||b>=0)&&c(a).is(":focusable")}});
+c(function(){var a=document.createElement("div"),b=document.body;c.extend(a.style,{minHeight:"100px",height:"auto",padding:0,borderWidth:0});c.support.minHeight=b.appendChild(a).offsetHeight===100;b.removeChild(a).style.display="none"});c.extend(c.ui,{plugin:{add:function(a,b,d){a=c.ui[a].prototype;for(var e in d){a.plugins[e]=a.plugins[e]||[];a.plugins[e].push([b,d[e]])}},call:function(a,b,d){if((b=a.plugins[b])&&a.element[0].parentNode)for(var e=0;e<b.length;e++)a.options[b[e][0]]&&b[e][1].apply(a.element,
+d)}},contains:function(a,b){return document.compareDocumentPosition?a.compareDocumentPosition(b)&16:a!==b&&a.contains(b)},hasScroll:function(a,b){if(c(a).css("overflow")==="hidden")return false;b=b&&b==="left"?"scrollLeft":"scrollTop";var d=false;if(a[b]>0)return true;a[b]=1;d=a[b]>0;a[b]=0;return d},isOverAxis:function(a,b,d){return a>b&&a<b+d},isOver:function(a,b,d,e,h,i){return c.ui.isOverAxis(a,d,h)&&c.ui.isOverAxis(b,e,i)}})}})(jQuery);
+;/*!
+ * jQuery UI Widget 1.8.5
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Widget
+ */
+(function(b,j){if(b.cleanData){var k=b.cleanData;b.cleanData=function(a){for(var c=0,d;(d=a[c])!=null;c++)b(d).triggerHandler("remove");k(a)}}else{var l=b.fn.remove;b.fn.remove=function(a,c){return this.each(function(){if(!c)if(!a||b.filter(a,[this]).length)b("*",this).add([this]).each(function(){b(this).triggerHandler("remove")});return l.call(b(this),a,c)})}}b.widget=function(a,c,d){var e=a.split(".")[0],f;a=a.split(".")[1];f=e+"-"+a;if(!d){d=c;c=b.Widget}b.expr[":"][f]=function(h){return!!b.data(h,
+a)};b[e]=b[e]||{};b[e][a]=function(h,g){arguments.length&&this._createWidget(h,g)};c=new c;c.options=b.extend(true,{},c.options);b[e][a].prototype=b.extend(true,c,{namespace:e,widgetName:a,widgetEventPrefix:b[e][a].prototype.widgetEventPrefix||a,widgetBaseClass:f},d);b.widget.bridge(a,b[e][a])};b.widget.bridge=function(a,c){b.fn[a]=function(d){var e=typeof d==="string",f=Array.prototype.slice.call(arguments,1),h=this;d=!e&&f.length?b.extend.apply(null,[true,d].concat(f)):d;if(e&&d.substring(0,1)===
+"_")return h;e?this.each(function(){var g=b.data(this,a);if(!g)throw"cannot call methods on "+a+" prior to initialization; attempted to call method '"+d+"'";if(!b.isFunction(g[d]))throw"no such method '"+d+"' for "+a+" widget instance";var i=g[d].apply(g,f);if(i!==g&&i!==j){h=i;return false}}):this.each(function(){var g=b.data(this,a);g?g.option(d||{})._init():b.data(this,a,new c(d,this))});return h}};b.Widget=function(a,c){arguments.length&&this._createWidget(a,c)};b.Widget.prototype={widgetName:"widget",
+widgetEventPrefix:"",options:{disabled:false},_createWidget:function(a,c){b.data(c,this.widgetName,this);this.element=b(c);this.options=b.extend(true,{},this.options,b.metadata&&b.metadata.get(c)[this.widgetName],a);var d=this;this.element.bind("remove."+this.widgetName,function(){d.destroy()});this._create();this._init()},_create:function(){},_init:function(){},destroy:function(){this.element.unbind("."+this.widgetName).removeData(this.widgetName);this.widget().unbind("."+this.widgetName).removeAttr("aria-disabled").removeClass(this.widgetBaseClass+
+"-disabled ui-state-disabled")},widget:function(){return this.element},option:function(a,c){var d=a,e=this;if(arguments.length===0)return b.extend({},e.options);if(typeof a==="string"){if(c===j)return this.options[a];d={};d[a]=c}b.each(d,function(f,h){e._setOption(f,h)});return e},_setOption:function(a,c){this.options[a]=c;if(a==="disabled")this.widget()[c?"addClass":"removeClass"](this.widgetBaseClass+"-disabled ui-state-disabled").attr("aria-disabled",c);return this},enable:function(){return this._setOption("disabled",
+false)},disable:function(){return this._setOption("disabled",true)},_trigger:function(a,c,d){var e=this.options[a];c=b.Event(c);c.type=(a===this.widgetEventPrefix?a:this.widgetEventPrefix+a).toLowerCase();d=d||{};if(c.originalEvent){a=b.event.props.length;for(var f;a;){f=b.event.props[--a];c[f]=c.originalEvent[f]}}this.element.trigger(c,d);return!(b.isFunction(e)&&e.call(this.element[0],c,d)===false||c.isDefaultPrevented())}}})(jQuery);
+;/*!
+ * jQuery UI Mouse 1.8.5
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Mouse
+ *
+ * Depends:
+ *	jquery.ui.widget.js
+ */
+(function(c){c.widget("ui.mouse",{options:{cancel:":input,option",distance:1,delay:0},_mouseInit:function(){var a=this;this.element.bind("mousedown."+this.widgetName,function(b){return a._mouseDown(b)}).bind("click."+this.widgetName,function(b){if(a._preventClickEvent){a._preventClickEvent=false;b.stopImmediatePropagation();return false}});this.started=false},_mouseDestroy:function(){this.element.unbind("."+this.widgetName)},_mouseDown:function(a){a.originalEvent=a.originalEvent||{};if(!a.originalEvent.mouseHandled){this._mouseStarted&&
+this._mouseUp(a);this._mouseDownEvent=a;var b=this,e=a.which==1,f=typeof this.options.cancel=="string"?c(a.target).parents().add(a.target).filter(this.options.cancel).length:false;if(!e||f||!this._mouseCapture(a))return true;this.mouseDelayMet=!this.options.delay;if(!this.mouseDelayMet)this._mouseDelayTimer=setTimeout(function(){b.mouseDelayMet=true},this.options.delay);if(this._mouseDistanceMet(a)&&this._mouseDelayMet(a)){this._mouseStarted=this._mouseStart(a)!==false;if(!this._mouseStarted){a.preventDefault();
+return true}}this._mouseMoveDelegate=function(d){return b._mouseMove(d)};this._mouseUpDelegate=function(d){return b._mouseUp(d)};c(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate);c.browser.safari||a.preventDefault();return a.originalEvent.mouseHandled=true}},_mouseMove:function(a){if(c.browser.msie&&!a.button)return this._mouseUp(a);if(this._mouseStarted){this._mouseDrag(a);return a.preventDefault()}if(this._mouseDistanceMet(a)&&
+this._mouseDelayMet(a))(this._mouseStarted=this._mouseStart(this._mouseDownEvent,a)!==false)?this._mouseDrag(a):this._mouseUp(a);return!this._mouseStarted},_mouseUp:function(a){c(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate);if(this._mouseStarted){this._mouseStarted=false;this._preventClickEvent=a.target==this._mouseDownEvent.target;this._mouseStop(a)}return false},_mouseDistanceMet:function(a){return Math.max(Math.abs(this._mouseDownEvent.pageX-
+a.pageX),Math.abs(this._mouseDownEvent.pageY-a.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return true}})})(jQuery);
+;/*
+ * jQuery UI Position 1.8.5
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Position
+ */
+(function(c){c.ui=c.ui||{};var n=/left|center|right/,o=/top|center|bottom/,t=c.fn.position,u=c.fn.offset;c.fn.position=function(b){if(!b||!b.of)return t.apply(this,arguments);b=c.extend({},b);var a=c(b.of),d=a[0],g=(b.collision||"flip").split(" "),e=b.offset?b.offset.split(" "):[0,0],h,k,j;if(d.nodeType===9){h=a.width();k=a.height();j={top:0,left:0}}else if(d.scrollTo&&d.document){h=a.width();k=a.height();j={top:a.scrollTop(),left:a.scrollLeft()}}else if(d.preventDefault){b.at="left top";h=k=0;j=
+{top:b.of.pageY,left:b.of.pageX}}else{h=a.outerWidth();k=a.outerHeight();j=a.offset()}c.each(["my","at"],function(){var f=(b[this]||"").split(" ");if(f.length===1)f=n.test(f[0])?f.concat(["center"]):o.test(f[0])?["center"].concat(f):["center","center"];f[0]=n.test(f[0])?f[0]:"center";f[1]=o.test(f[1])?f[1]:"center";b[this]=f});if(g.length===1)g[1]=g[0];e[0]=parseInt(e[0],10)||0;if(e.length===1)e[1]=e[0];e[1]=parseInt(e[1],10)||0;if(b.at[0]==="right")j.left+=h;else if(b.at[0]==="center")j.left+=h/
+2;if(b.at[1]==="bottom")j.top+=k;else if(b.at[1]==="center")j.top+=k/2;j.left+=e[0];j.top+=e[1];return this.each(function(){var f=c(this),l=f.outerWidth(),m=f.outerHeight(),p=parseInt(c.curCSS(this,"marginLeft",true))||0,q=parseInt(c.curCSS(this,"marginTop",true))||0,v=l+p+parseInt(c.curCSS(this,"marginRight",true))||0,w=m+q+parseInt(c.curCSS(this,"marginBottom",true))||0,i=c.extend({},j),r;if(b.my[0]==="right")i.left-=l;else if(b.my[0]==="center")i.left-=l/2;if(b.my[1]==="bottom")i.top-=m;else if(b.my[1]===
+"center")i.top-=m/2;i.left=parseInt(i.left);i.top=parseInt(i.top);r={left:i.left-p,top:i.top-q};c.each(["left","top"],function(s,x){c.ui.position[g[s]]&&c.ui.position[g[s]][x](i,{targetWidth:h,targetHeight:k,elemWidth:l,elemHeight:m,collisionPosition:r,collisionWidth:v,collisionHeight:w,offset:e,my:b.my,at:b.at})});c.fn.bgiframe&&f.bgiframe();f.offset(c.extend(i,{using:b.using}))})};c.ui.position={fit:{left:function(b,a){var d=c(window);d=a.collisionPosition.left+a.collisionWidth-d.width()-d.scrollLeft();
+b.left=d>0?b.left-d:Math.max(b.left-a.collisionPosition.left,b.left)},top:function(b,a){var d=c(window);d=a.collisionPosition.top+a.collisionHeight-d.height()-d.scrollTop();b.top=d>0?b.top-d:Math.max(b.top-a.collisionPosition.top,b.top)}},flip:{left:function(b,a){if(a.at[0]!=="center"){var d=c(window);d=a.collisionPosition.left+a.collisionWidth-d.width()-d.scrollLeft();var g=a.my[0]==="left"?-a.elemWidth:a.my[0]==="right"?a.elemWidth:0,e=a.at[0]==="left"?a.targetWidth:-a.targetWidth,h=-2*a.offset[0];
+b.left+=a.collisionPosition.left<0?g+e+h:d>0?g+e+h:0}},top:function(b,a){if(a.at[1]!=="center"){var d=c(window);d=a.collisionPosition.top+a.collisionHeight-d.height()-d.scrollTop();var g=a.my[1]==="top"?-a.elemHeight:a.my[1]==="bottom"?a.elemHeight:0,e=a.at[1]==="top"?a.targetHeight:-a.targetHeight,h=-2*a.offset[1];b.top+=a.collisionPosition.top<0?g+e+h:d>0?g+e+h:0}}}};if(!c.offset.setOffset){c.offset.setOffset=function(b,a){if(/static/.test(c.curCSS(b,"position")))b.style.position="relative";var d=
+c(b),g=d.offset(),e=parseInt(c.curCSS(b,"top",true),10)||0,h=parseInt(c.curCSS(b,"left",true),10)||0;g={top:a.top-g.top+e,left:a.left-g.left+h};"using"in a?a.using.call(b,g):d.css(g)};c.fn.offset=function(b){var a=this[0];if(!a||!a.ownerDocument)return null;if(b)return this.each(function(){c.offset.setOffset(this,b)});return u.call(this)}}})(jQuery);
+;/*
+ * jQuery UI Draggable 1.8.5
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Draggables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+(function(d){d.widget("ui.draggable",d.ui.mouse,{widgetEventPrefix:"drag",options:{addClasses:true,appendTo:"parent",axis:false,connectToSortable:false,containment:false,cursor:"auto",cursorAt:false,grid:false,handle:false,helper:"original",iframeFix:false,opacity:false,refreshPositions:false,revert:false,revertDuration:500,scope:"default",scroll:true,scrollSensitivity:20,scrollSpeed:20,snap:false,snapMode:"both",snapTolerance:20,stack:false,zIndex:false},_create:function(){if(this.options.helper==
+"original"&&!/^(?:r|a|f)/.test(this.element.css("position")))this.element[0].style.position="relative";this.options.addClasses&&this.element.addClass("ui-draggable");this.options.disabled&&this.element.addClass("ui-draggable-disabled");this._mouseInit()},destroy:function(){if(this.element.data("draggable")){this.element.removeData("draggable").unbind(".draggable").removeClass("ui-draggable ui-draggable-dragging ui-draggable-disabled");this._mouseDestroy();return this}},_mouseCapture:function(a){var b=
+this.options;if(this.helper||b.disabled||d(a.target).is(".ui-resizable-handle"))return false;this.handle=this._getHandle(a);if(!this.handle)return false;return true},_mouseStart:function(a){var b=this.options;this.helper=this._createHelper(a);this._cacheHelperProportions();if(d.ui.ddmanager)d.ui.ddmanager.current=this;this._cacheMargins();this.cssPosition=this.helper.css("position");this.scrollParent=this.helper.scrollParent();this.offset=this.positionAbs=this.element.offset();this.offset={top:this.offset.top-
+this.margins.top,left:this.offset.left-this.margins.left};d.extend(this.offset,{click:{left:a.pageX-this.offset.left,top:a.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()});this.originalPosition=this.position=this._generatePosition(a);this.originalPageX=a.pageX;this.originalPageY=a.pageY;b.cursorAt&&this._adjustOffsetFromHelper(b.cursorAt);b.containment&&this._setContainment();if(this._trigger("start",a)===false){this._clear();return false}this._cacheHelperProportions();
+d.ui.ddmanager&&!b.dropBehaviour&&d.ui.ddmanager.prepareOffsets(this,a);this.helper.addClass("ui-draggable-dragging");this._mouseDrag(a,true);return true},_mouseDrag:function(a,b){this.position=this._generatePosition(a);this.positionAbs=this._convertPositionTo("absolute");if(!b){b=this._uiHash();if(this._trigger("drag",a,b)===false){this._mouseUp({});return false}this.position=b.position}if(!this.options.axis||this.options.axis!="y")this.helper[0].style.left=this.position.left+"px";if(!this.options.axis||
+this.options.axis!="x")this.helper[0].style.top=this.position.top+"px";d.ui.ddmanager&&d.ui.ddmanager.drag(this,a);return false},_mouseStop:function(a){var b=false;if(d.ui.ddmanager&&!this.options.dropBehaviour)b=d.ui.ddmanager.drop(this,a);if(this.dropped){b=this.dropped;this.dropped=false}if(!this.element[0]||!this.element[0].parentNode)return false;if(this.options.revert=="invalid"&&!b||this.options.revert=="valid"&&b||this.options.revert===true||d.isFunction(this.options.revert)&&this.options.revert.call(this.element,
+b)){var c=this;d(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,10),function(){c._trigger("stop",a)!==false&&c._clear()})}else this._trigger("stop",a)!==false&&this._clear();return false},cancel:function(){this.helper.is(".ui-draggable-dragging")?this._mouseUp({}):this._clear();return this},_getHandle:function(a){var b=!this.options.handle||!d(this.options.handle,this.element).length?true:false;d(this.options.handle,this.element).find("*").andSelf().each(function(){if(this==
+a.target)b=true});return b},_createHelper:function(a){var b=this.options;a=d.isFunction(b.helper)?d(b.helper.apply(this.element[0],[a])):b.helper=="clone"?this.element.clone():this.element;a.parents("body").length||a.appendTo(b.appendTo=="parent"?this.element[0].parentNode:b.appendTo);a[0]!=this.element[0]&&!/(fixed|absolute)/.test(a.css("position"))&&a.css("position","absolute");return a},_adjustOffsetFromHelper:function(a){if(typeof a=="string")a=a.split(" ");if(d.isArray(a))a={left:+a[0],top:+a[1]||
+0};if("left"in a)this.offset.click.left=a.left+this.margins.left;if("right"in a)this.offset.click.left=this.helperProportions.width-a.right+this.margins.left;if("top"in a)this.offset.click.top=a.top+this.margins.top;if("bottom"in a)this.offset.click.top=this.helperProportions.height-a.bottom+this.margins.top},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var a=this.offsetParent.offset();if(this.cssPosition=="absolute"&&this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],
+this.offsetParent[0])){a.left+=this.scrollParent.scrollLeft();a.top+=this.scrollParent.scrollTop()}if(this.offsetParent[0]==document.body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&d.browser.msie)a={top:0,left:0};return{top:a.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:a.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=="relative"){var a=this.element.position();return{top:a.top-
+(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:a.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}else return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var a=this.options;if(a.containment==
+"parent")a.containment=this.helper[0].parentNode;if(a.containment=="document"||a.containment=="window")this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,d(a.containment=="document"?document:window).width()-this.helperProportions.width-this.margins.left,(d(a.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top];if(!/^(document|window|parent)$/.test(a.containment)&&
+a.containment.constructor!=Array){var b=d(a.containment)[0];if(b){a=d(a.containment).offset();var c=d(b).css("overflow")!="hidden";this.containment=[a.left+(parseInt(d(b).css("borderLeftWidth"),10)||0)+(parseInt(d(b).css("paddingLeft"),10)||0)-this.margins.left,a.top+(parseInt(d(b).css("borderTopWidth"),10)||0)+(parseInt(d(b).css("paddingTop"),10)||0)-this.margins.top,a.left+(c?Math.max(b.scrollWidth,b.offsetWidth):b.offsetWidth)-(parseInt(d(b).css("borderLeftWidth"),10)||0)-(parseInt(d(b).css("paddingRight"),
+10)||0)-this.helperProportions.width-this.margins.left,a.top+(c?Math.max(b.scrollHeight,b.offsetHeight):b.offsetHeight)-(parseInt(d(b).css("borderTopWidth"),10)||0)-(parseInt(d(b).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top]}}else if(a.containment.constructor==Array)this.containment=a.containment},_convertPositionTo:function(a,b){if(!b)b=this.position;a=a=="absolute"?1:-1;var c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],
+this.offsetParent[0]))?this.offsetParent:this.scrollParent,f=/(html|body)/i.test(c[0].tagName);return{top:b.top+this.offset.relative.top*a+this.offset.parent.top*a-(d.browser.safari&&d.browser.version<526&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():f?0:c.scrollTop())*a),left:b.left+this.offset.relative.left*a+this.offset.parent.left*a-(d.browser.safari&&d.browser.version<526&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():
+f?0:c.scrollLeft())*a)}},_generatePosition:function(a){var b=this.options,c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,f=/(html|body)/i.test(c[0].tagName),e=a.pageX,g=a.pageY;if(this.originalPosition){if(this.containment){if(a.pageX-this.offset.click.left<this.containment[0])e=this.containment[0]+this.offset.click.left;if(a.pageY-this.offset.click.top<this.containment[1])g=this.containment[1]+
+this.offset.click.top;if(a.pageX-this.offset.click.left>this.containment[2])e=this.containment[2]+this.offset.click.left;if(a.pageY-this.offset.click.top>this.containment[3])g=this.containment[3]+this.offset.click.top}if(b.grid){g=this.originalPageY+Math.round((g-this.originalPageY)/b.grid[1])*b.grid[1];g=this.containment?!(g-this.offset.click.top<this.containment[1]||g-this.offset.click.top>this.containment[3])?g:!(g-this.offset.click.top<this.containment[1])?g-b.grid[1]:g+b.grid[1]:g;e=this.originalPageX+
+Math.round((e-this.originalPageX)/b.grid[0])*b.grid[0];e=this.containment?!(e-this.offset.click.left<this.containment[0]||e-this.offset.click.left>this.containment[2])?e:!(e-this.offset.click.left<this.containment[0])?e-b.grid[0]:e+b.grid[0]:e}}return{top:g-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(d.browser.safari&&d.browser.version<526&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollTop():f?0:c.scrollTop()),left:e-this.offset.click.left-
+this.offset.relative.left-this.offset.parent.left+(d.browser.safari&&d.browser.version<526&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():f?0:c.scrollLeft())}},_clear:function(){this.helper.removeClass("ui-draggable-dragging");this.helper[0]!=this.element[0]&&!this.cancelHelperRemoval&&this.helper.remove();this.helper=null;this.cancelHelperRemoval=false},_trigger:function(a,b,c){c=c||this._uiHash();d.ui.plugin.call(this,a,[b,c]);if(a=="drag")this.positionAbs=
+this._convertPositionTo("absolute");return d.Widget.prototype._trigger.call(this,a,b,c)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}});d.extend(d.ui.draggable,{version:"1.8.5"});d.ui.plugin.add("draggable","connectToSortable",{start:function(a,b){var c=d(this).data("draggable"),f=c.options,e=d.extend({},b,{item:c.element});c.sortables=[];d(f.connectToSortable).each(function(){var g=d.data(this,"sortable");
+if(g&&!g.options.disabled){c.sortables.push({instance:g,shouldRevert:g.options.revert});g._refreshItems();g._trigger("activate",a,e)}})},stop:function(a,b){var c=d(this).data("draggable"),f=d.extend({},b,{item:c.element});d.each(c.sortables,function(){if(this.instance.isOver){this.instance.isOver=0;c.cancelHelperRemoval=true;this.instance.cancelHelperRemoval=false;if(this.shouldRevert)this.instance.options.revert=true;this.instance._mouseStop(a);this.instance.options.helper=this.instance.options._helper;
+c.options.helper=="original"&&this.instance.currentItem.css({top:"auto",left:"auto"})}else{this.instance.cancelHelperRemoval=false;this.instance._trigger("deactivate",a,f)}})},drag:function(a,b){var c=d(this).data("draggable"),f=this;d.each(c.sortables,function(){this.instance.positionAbs=c.positionAbs;this.instance.helperProportions=c.helperProportions;this.instance.offset.click=c.offset.click;if(this.instance._intersectsWith(this.instance.containerCache)){if(!this.instance.isOver){this.instance.isOver=
+1;this.instance.currentItem=d(f).clone().appendTo(this.instance.element).data("sortable-item",true);this.instance.options._helper=this.instance.options.helper;this.instance.options.helper=function(){return b.helper[0]};a.target=this.instance.currentItem[0];this.instance._mouseCapture(a,true);this.instance._mouseStart(a,true,true);this.instance.offset.click.top=c.offset.click.top;this.instance.offset.click.left=c.offset.click.left;this.instance.offset.parent.left-=c.offset.parent.left-this.instance.offset.parent.left;
+this.instance.offset.parent.top-=c.offset.parent.top-this.instance.offset.parent.top;c._trigger("toSortable",a);c.dropped=this.instance.element;c.currentItem=c.element;this.instance.fromOutside=c}this.instance.currentItem&&this.instance._mouseDrag(a)}else if(this.instance.isOver){this.instance.isOver=0;this.instance.cancelHelperRemoval=true;this.instance.options.revert=false;this.instance._trigger("out",a,this.instance._uiHash(this.instance));this.instance._mouseStop(a,true);this.instance.options.helper=
+this.instance.options._helper;this.instance.currentItem.remove();this.instance.placeholder&&this.instance.placeholder.remove();c._trigger("fromSortable",a);c.dropped=false}})}});d.ui.plugin.add("draggable","cursor",{start:function(){var a=d("body"),b=d(this).data("draggable").options;if(a.css("cursor"))b._cursor=a.css("cursor");a.css("cursor",b.cursor)},stop:function(){var a=d(this).data("draggable").options;a._cursor&&d("body").css("cursor",a._cursor)}});d.ui.plugin.add("draggable","iframeFix",{start:function(){var a=
+d(this).data("draggable").options;d(a.iframeFix===true?"iframe":a.iframeFix).each(function(){d('<div class="ui-draggable-iframeFix" style="background: #fff;"></div>').css({width:this.offsetWidth+"px",height:this.offsetHeight+"px",position:"absolute",opacity:"0.001",zIndex:1E3}).css(d(this).offset()).appendTo("body")})},stop:function(){d("div.ui-draggable-iframeFix").each(function(){this.parentNode.removeChild(this)})}});d.ui.plugin.add("draggable","opacity",{start:function(a,b){a=d(b.helper);b=d(this).data("draggable").options;
+if(a.css("opacity"))b._opacity=a.css("opacity");a.css("opacity",b.opacity)},stop:function(a,b){a=d(this).data("draggable").options;a._opacity&&d(b.helper).css("opacity",a._opacity)}});d.ui.plugin.add("draggable","scroll",{start:function(){var a=d(this).data("draggable");if(a.scrollParent[0]!=document&&a.scrollParent[0].tagName!="HTML")a.overflowOffset=a.scrollParent.offset()},drag:function(a){var b=d(this).data("draggable"),c=b.options,f=false;if(b.scrollParent[0]!=document&&b.scrollParent[0].tagName!=
+"HTML"){if(!c.axis||c.axis!="x")if(b.overflowOffset.top+b.scrollParent[0].offsetHeight-a.pageY<c.scrollSensitivity)b.scrollParent[0].scrollTop=f=b.scrollParent[0].scrollTop+c.scrollSpeed;else if(a.pageY-b.overflowOffset.top<c.scrollSensitivity)b.scrollParent[0].scrollTop=f=b.scrollParent[0].scrollTop-c.scrollSpeed;if(!c.axis||c.axis!="y")if(b.overflowOffset.left+b.scrollParent[0].offsetWidth-a.pageX<c.scrollSensitivity)b.scrollParent[0].scrollLeft=f=b.scrollParent[0].scrollLeft+c.scrollSpeed;else if(a.pageX-
+b.overflowOffset.left<c.scrollSensitivity)b.scrollParent[0].scrollLeft=f=b.scrollParent[0].scrollLeft-c.scrollSpeed}else{if(!c.axis||c.axis!="x")if(a.pageY-d(document).scrollTop()<c.scrollSensitivity)f=d(document).scrollTop(d(document).scrollTop()-c.scrollSpeed);else if(d(window).height()-(a.pageY-d(document).scrollTop())<c.scrollSensitivity)f=d(document).scrollTop(d(document).scrollTop()+c.scrollSpeed);if(!c.axis||c.axis!="y")if(a.pageX-d(document).scrollLeft()<c.scrollSensitivity)f=d(document).scrollLeft(d(document).scrollLeft()-
+c.scrollSpeed);else if(d(window).width()-(a.pageX-d(document).scrollLeft())<c.scrollSensitivity)f=d(document).scrollLeft(d(document).scrollLeft()+c.scrollSpeed)}f!==false&&d.ui.ddmanager&&!c.dropBehaviour&&d.ui.ddmanager.prepareOffsets(b,a)}});d.ui.plugin.add("draggable","snap",{start:function(){var a=d(this).data("draggable"),b=a.options;a.snapElements=[];d(b.snap.constructor!=String?b.snap.items||":data(draggable)":b.snap).each(function(){var c=d(this),f=c.offset();this!=a.element[0]&&a.snapElements.push({item:this,
+width:c.outerWidth(),height:c.outerHeight(),top:f.top,left:f.left})})},drag:function(a,b){for(var c=d(this).data("draggable"),f=c.options,e=f.snapTolerance,g=b.offset.left,n=g+c.helperProportions.width,m=b.offset.top,o=m+c.helperProportions.height,h=c.snapElements.length-1;h>=0;h--){var i=c.snapElements[h].left,k=i+c.snapElements[h].width,j=c.snapElements[h].top,l=j+c.snapElements[h].height;if(i-e<g&&g<k+e&&j-e<m&&m<l+e||i-e<g&&g<k+e&&j-e<o&&o<l+e||i-e<n&&n<k+e&&j-e<m&&m<l+e||i-e<n&&n<k+e&&j-e<o&&
+o<l+e){if(f.snapMode!="inner"){var p=Math.abs(j-o)<=e,q=Math.abs(l-m)<=e,r=Math.abs(i-n)<=e,s=Math.abs(k-g)<=e;if(p)b.position.top=c._convertPositionTo("relative",{top:j-c.helperProportions.height,left:0}).top-c.margins.top;if(q)b.position.top=c._convertPositionTo("relative",{top:l,left:0}).top-c.margins.top;if(r)b.position.left=c._convertPositionTo("relative",{top:0,left:i-c.helperProportions.width}).left-c.margins.left;if(s)b.position.left=c._convertPositionTo("relative",{top:0,left:k}).left-c.margins.left}var t=
+p||q||r||s;if(f.snapMode!="outer"){p=Math.abs(j-m)<=e;q=Math.abs(l-o)<=e;r=Math.abs(i-g)<=e;s=Math.abs(k-n)<=e;if(p)b.position.top=c._convertPositionTo("relative",{top:j,left:0}).top-c.margins.top;if(q)b.position.top=c._convertPositionTo("relative",{top:l-c.helperProportions.height,left:0}).top-c.margins.top;if(r)b.position.left=c._convertPositionTo("relative",{top:0,left:i}).left-c.margins.left;if(s)b.position.left=c._convertPositionTo("relative",{top:0,left:k-c.helperProportions.width}).left-c.margins.left}if(!c.snapElements[h].snapping&&
+(p||q||r||s||t))c.options.snap.snap&&c.options.snap.snap.call(c.element,a,d.extend(c._uiHash(),{snapItem:c.snapElements[h].item}));c.snapElements[h].snapping=p||q||r||s||t}else{c.snapElements[h].snapping&&c.options.snap.release&&c.options.snap.release.call(c.element,a,d.extend(c._uiHash(),{snapItem:c.snapElements[h].item}));c.snapElements[h].snapping=false}}}});d.ui.plugin.add("draggable","stack",{start:function(){var a=d(this).data("draggable").options;a=d.makeArray(d(a.stack)).sort(function(c,f){return(parseInt(d(c).css("zIndex"),
+10)||0)-(parseInt(d(f).css("zIndex"),10)||0)});if(a.length){var b=parseInt(a[0].style.zIndex)||0;d(a).each(function(c){this.style.zIndex=b+c});this[0].style.zIndex=b+a.length}}});d.ui.plugin.add("draggable","zIndex",{start:function(a,b){a=d(b.helper);b=d(this).data("draggable").options;if(a.css("zIndex"))b._zIndex=a.css("zIndex");a.css("zIndex",b.zIndex)},stop:function(a,b){a=d(this).data("draggable").options;a._zIndex&&d(b.helper).css("zIndex",a._zIndex)}})})(jQuery);
+;/*
+ * jQuery UI Droppable 1.8.5
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Droppables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.draggable.js
+ */
+(function(d){d.widget("ui.droppable",{widgetEventPrefix:"drop",options:{accept:"*",activeClass:false,addClasses:true,greedy:false,hoverClass:false,scope:"default",tolerance:"intersect"},_create:function(){var a=this.options,b=a.accept;this.isover=0;this.isout=1;this.accept=d.isFunction(b)?b:function(c){return c.is(b)};this.proportions={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight};d.ui.ddmanager.droppables[a.scope]=d.ui.ddmanager.droppables[a.scope]||[];d.ui.ddmanager.droppables[a.scope].push(this);
+a.addClasses&&this.element.addClass("ui-droppable")},destroy:function(){for(var a=d.ui.ddmanager.droppables[this.options.scope],b=0;b<a.length;b++)a[b]==this&&a.splice(b,1);this.element.removeClass("ui-droppable ui-droppable-disabled").removeData("droppable").unbind(".droppable");return this},_setOption:function(a,b){if(a=="accept")this.accept=d.isFunction(b)?b:function(c){return c.is(b)};d.Widget.prototype._setOption.apply(this,arguments)},_activate:function(a){var b=d.ui.ddmanager.current;this.options.activeClass&&
+this.element.addClass(this.options.activeClass);b&&this._trigger("activate",a,this.ui(b))},_deactivate:function(a){var b=d.ui.ddmanager.current;this.options.activeClass&&this.element.removeClass(this.options.activeClass);b&&this._trigger("deactivate",a,this.ui(b))},_over:function(a){var b=d.ui.ddmanager.current;if(!(!b||(b.currentItem||b.element)[0]==this.element[0]))if(this.accept.call(this.element[0],b.currentItem||b.element)){this.options.hoverClass&&this.element.addClass(this.options.hoverClass);
+this._trigger("over",a,this.ui(b))}},_out:function(a){var b=d.ui.ddmanager.current;if(!(!b||(b.currentItem||b.element)[0]==this.element[0]))if(this.accept.call(this.element[0],b.currentItem||b.element)){this.options.hoverClass&&this.element.removeClass(this.options.hoverClass);this._trigger("out",a,this.ui(b))}},_drop:function(a,b){var c=b||d.ui.ddmanager.current;if(!c||(c.currentItem||c.element)[0]==this.element[0])return false;var e=false;this.element.find(":data(droppable)").not(".ui-draggable-dragging").each(function(){var g=
+d.data(this,"droppable");if(g.options.greedy&&!g.options.disabled&&g.options.scope==c.options.scope&&g.accept.call(g.element[0],c.currentItem||c.element)&&d.ui.intersect(c,d.extend(g,{offset:g.element.offset()}),g.options.tolerance)){e=true;return false}});if(e)return false;if(this.accept.call(this.element[0],c.currentItem||c.element)){this.options.activeClass&&this.element.removeClass(this.options.activeClass);this.options.hoverClass&&this.element.removeClass(this.options.hoverClass);this._trigger("drop",
+a,this.ui(c));return this.element}return false},ui:function(a){return{draggable:a.currentItem||a.element,helper:a.helper,position:a.position,offset:a.positionAbs}}});d.extend(d.ui.droppable,{version:"1.8.5"});d.ui.intersect=function(a,b,c){if(!b.offset)return false;var e=(a.positionAbs||a.position.absolute).left,g=e+a.helperProportions.width,f=(a.positionAbs||a.position.absolute).top,h=f+a.helperProportions.height,i=b.offset.left,k=i+b.proportions.width,j=b.offset.top,l=j+b.proportions.height;
+switch(c){case "fit":return i<=e&&g<=k&&j<=f&&h<=l;case "intersect":return i<e+a.helperProportions.width/2&&g-a.helperProportions.width/2<k&&j<f+a.helperProportions.height/2&&h-a.helperProportions.height/2<l;case "pointer":return d.ui.isOver((a.positionAbs||a.position.absolute).top+(a.clickOffset||a.offset.click).top,(a.positionAbs||a.position.absolute).left+(a.clickOffset||a.offset.click).left,j,i,b.proportions.height,b.proportions.width);case "touch":return(f>=j&&f<=l||h>=j&&h<=l||f<j&&h>l)&&(e>=
+i&&e<=k||g>=i&&g<=k||e<i&&g>k);default:return false}};d.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(a,b){var c=d.ui.ddmanager.droppables[a.options.scope]||[],e=b?b.type:null,g=(a.currentItem||a.element).find(":data(droppable)").andSelf(),f=0;a:for(;f<c.length;f++)if(!(c[f].options.disabled||a&&!c[f].accept.call(c[f].element[0],a.currentItem||a.element))){for(var h=0;h<g.length;h++)if(g[h]==c[f].element[0]){c[f].proportions.height=0;continue a}c[f].visible=c[f].element.css("display")!=
+"none";if(c[f].visible){c[f].offset=c[f].element.offset();c[f].proportions={width:c[f].element[0].offsetWidth,height:c[f].element[0].offsetHeight};e=="mousedown"&&c[f]._activate.call(c[f],b)}}},drop:function(a,b){var c=false;d.each(d.ui.ddmanager.droppables[a.options.scope]||[],function(){if(this.options){if(!this.options.disabled&&this.visible&&d.ui.intersect(a,this,this.options.tolerance))c=c||this._drop.call(this,b);if(!this.options.disabled&&this.visible&&this.accept.call(this.element[0],a.currentItem||
+a.element)){this.isout=1;this.isover=0;this._deactivate.call(this,b)}}});return c},drag:function(a,b){a.options.refreshPositions&&d.ui.ddmanager.prepareOffsets(a,b);d.each(d.ui.ddmanager.droppables[a.options.scope]||[],function(){if(!(this.options.disabled||this.greedyChild||!this.visible)){var c=d.ui.intersect(a,this,this.options.tolerance);if(c=!c&&this.isover==1?"isout":c&&this.isover==0?"isover":null){var e;if(this.options.greedy){var g=this.element.parents(":data(droppable):eq(0)");if(g.length){e=
+d.data(g[0],"droppable");e.greedyChild=c=="isover"?1:0}}if(e&&c=="isover"){e.isover=0;e.isout=1;e._out.call(e,b)}this[c]=1;this[c=="isout"?"isover":"isout"]=0;this[c=="isover"?"_over":"_out"].call(this,b);if(e&&c=="isout"){e.isout=0;e.isover=1;e._over.call(e,b)}}}})}}})(jQuery);
+;/*
+ * jQuery UI Resizable 1.8.5
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Resizables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+(function(e){e.widget("ui.resizable",e.ui.mouse,{widgetEventPrefix:"resize",options:{alsoResize:false,animate:false,animateDuration:"slow",animateEasing:"swing",aspectRatio:false,autoHide:false,containment:false,ghost:false,grid:false,handles:"e,s,se",helper:false,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:1E3},_create:function(){var b=this,a=this.options;this.element.addClass("ui-resizable");e.extend(this,{_aspectRatio:!!a.aspectRatio,aspectRatio:a.aspectRatio,originalElement:this.element,
+_proportionallyResizeElements:[],_helper:a.helper||a.ghost||a.animate?a.helper||"ui-resizable-helper":null});if(this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)){/relative/.test(this.element.css("position"))&&e.browser.opera&&this.element.css({position:"relative",top:"auto",left:"auto"});this.element.wrap(e('<div class="ui-wrapper" style="overflow: hidden;"></div>').css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),
+top:this.element.css("top"),left:this.element.css("left")}));this.element=this.element.parent().data("resizable",this.element.data("resizable"));this.elementIsWrapper=true;this.element.css({marginLeft:this.originalElement.css("marginLeft"),marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom")});this.originalElement.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0});this.originalResizeStyle=
+this.originalElement.css("resize");this.originalElement.css("resize","none");this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"}));this.originalElement.css({margin:this.originalElement.css("margin")});this._proportionallyResize()}this.handles=a.handles||(!e(".ui-resizable-handle",this.element).length?"e,s,se":{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",
+nw:".ui-resizable-nw"});if(this.handles.constructor==String){if(this.handles=="all")this.handles="n,e,s,w,se,sw,ne,nw";var c=this.handles.split(",");this.handles={};for(var d=0;d<c.length;d++){var f=e.trim(c[d]),g=e('<div class="ui-resizable-handle '+("ui-resizable-"+f)+'"></div>');/sw|se|ne|nw/.test(f)&&g.css({zIndex:++a.zIndex});"se"==f&&g.addClass("ui-icon ui-icon-gripsmall-diagonal-se");this.handles[f]=".ui-resizable-"+f;this.element.append(g)}}this._renderAxis=function(h){h=h||this.element;for(var i in this.handles){if(this.handles[i].constructor==
+String)this.handles[i]=e(this.handles[i],this.element).show();if(this.elementIsWrapper&&this.originalElement[0].nodeName.match(/textarea|input|select|button/i)){var j=e(this.handles[i],this.element),k=0;k=/sw|ne|nw|se|n|s/.test(i)?j.outerHeight():j.outerWidth();j=["padding",/ne|nw|n/.test(i)?"Top":/se|sw|s/.test(i)?"Bottom":/^e$/.test(i)?"Right":"Left"].join("");h.css(j,k);this._proportionallyResize()}e(this.handles[i])}};this._renderAxis(this.element);this._handles=e(".ui-resizable-handle",this.element).disableSelection();
+this._handles.mouseover(function(){if(!b.resizing){if(this.className)var h=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i);b.axis=h&&h[1]?h[1]:"se"}});if(a.autoHide){this._handles.hide();e(this.element).addClass("ui-resizable-autohide").hover(function(){e(this).removeClass("ui-resizable-autohide");b._handles.show()},function(){if(!b.resizing){e(this).addClass("ui-resizable-autohide");b._handles.hide()}})}this._mouseInit()},destroy:function(){this._mouseDestroy();var b=function(c){e(c).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing").removeData("resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};
+if(this.elementIsWrapper){b(this.element);var a=this.element;a.after(this.originalElement.css({position:a.css("position"),width:a.outerWidth(),height:a.outerHeight(),top:a.css("top"),left:a.css("left")})).remove()}this.originalElement.css("resize",this.originalResizeStyle);b(this.originalElement);return this},_mouseCapture:function(b){var a=false;for(var c in this.handles)if(e(this.handles[c])[0]==b.target)a=true;return!this.options.disabled&&a},_mouseStart:function(b){var a=this.options,c=this.element.position(),
+d=this.element;this.resizing=true;this.documentScroll={top:e(document).scrollTop(),left:e(document).scrollLeft()};if(d.is(".ui-draggable")||/absolute/.test(d.css("position")))d.css({position:"absolute",top:c.top,left:c.left});e.browser.opera&&/relative/.test(d.css("position"))&&d.css({position:"relative",top:"auto",left:"auto"});this._renderProxy();c=m(this.helper.css("left"));var f=m(this.helper.css("top"));if(a.containment){c+=e(a.containment).scrollLeft()||0;f+=e(a.containment).scrollTop()||0}this.offset=
+this.helper.offset();this.position={left:c,top:f};this.size=this._helper?{width:d.outerWidth(),height:d.outerHeight()}:{width:d.width(),height:d.height()};this.originalSize=this._helper?{width:d.outerWidth(),height:d.outerHeight()}:{width:d.width(),height:d.height()};this.originalPosition={left:c,top:f};this.sizeDiff={width:d.outerWidth()-d.width(),height:d.outerHeight()-d.height()};this.originalMousePosition={left:b.pageX,top:b.pageY};this.aspectRatio=typeof a.aspectRatio=="number"?a.aspectRatio:
+this.originalSize.width/this.originalSize.height||1;a=e(".ui-resizable-"+this.axis).css("cursor");e("body").css("cursor",a=="auto"?this.axis+"-resize":a);d.addClass("ui-resizable-resizing");this._propagate("start",b);return true},_mouseDrag:function(b){var a=this.helper,c=this.originalMousePosition,d=this._change[this.axis];if(!d)return false;c=d.apply(this,[b,b.pageX-c.left||0,b.pageY-c.top||0]);if(this._aspectRatio||b.shiftKey)c=this._updateRatio(c,b);c=this._respectSize(c,b);this._propagate("resize",
+b);a.css({top:this.position.top+"px",left:this.position.left+"px",width:this.size.width+"px",height:this.size.height+"px"});!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize();this._updateCache(c);this._trigger("resize",b,this.ui());return false},_mouseStop:function(b){this.resizing=false;var a=this.options,c=this;if(this._helper){var d=this._proportionallyResizeElements,f=d.length&&/textarea/i.test(d[0].nodeName);d=f&&e.ui.hasScroll(d[0],"left")?0:c.sizeDiff.height;
+f={width:c.size.width-(f?0:c.sizeDiff.width),height:c.size.height-d};d=parseInt(c.element.css("left"),10)+(c.position.left-c.originalPosition.left)||null;var g=parseInt(c.element.css("top"),10)+(c.position.top-c.originalPosition.top)||null;a.animate||this.element.css(e.extend(f,{top:g,left:d}));c.helper.height(c.size.height);c.helper.width(c.size.width);this._helper&&!a.animate&&this._proportionallyResize()}e("body").css("cursor","auto");this.element.removeClass("ui-resizable-resizing");this._propagate("stop",
+b);this._helper&&this.helper.remove();return false},_updateCache:function(b){this.offset=this.helper.offset();if(l(b.left))this.position.left=b.left;if(l(b.top))this.position.top=b.top;if(l(b.height))this.size.height=b.height;if(l(b.width))this.size.width=b.width},_updateRatio:function(b){var a=this.position,c=this.size,d=this.axis;if(b.height)b.width=c.height*this.aspectRatio;else if(b.width)b.height=c.width/this.aspectRatio;if(d=="sw"){b.left=a.left+(c.width-b.width);b.top=null}if(d=="nw"){b.top=
+a.top+(c.height-b.height);b.left=a.left+(c.width-b.width)}return b},_respectSize:function(b){var a=this.options,c=this.axis,d=l(b.width)&&a.maxWidth&&a.maxWidth<b.width,f=l(b.height)&&a.maxHeight&&a.maxHeight<b.height,g=l(b.width)&&a.minWidth&&a.minWidth>b.width,h=l(b.height)&&a.minHeight&&a.minHeight>b.height;if(g)b.width=a.minWidth;if(h)b.height=a.minHeight;if(d)b.width=a.maxWidth;if(f)b.height=a.maxHeight;var i=this.originalPosition.left+this.originalSize.width,j=this.position.top+this.size.height,
+k=/sw|nw|w/.test(c);c=/nw|ne|n/.test(c);if(g&&k)b.left=i-a.minWidth;if(d&&k)b.left=i-a.maxWidth;if(h&&c)b.top=j-a.minHeight;if(f&&c)b.top=j-a.maxHeight;if((a=!b.width&&!b.height)&&!b.left&&b.top)b.top=null;else if(a&&!b.top&&b.left)b.left=null;return b},_proportionallyResize:function(){if(this._proportionallyResizeElements.length)for(var b=this.helper||this.element,a=0;a<this._proportionallyResizeElements.length;a++){var c=this._proportionallyResizeElements[a];if(!this.borderDif){var d=[c.css("borderTopWidth"),
+c.css("borderRightWidth"),c.css("borderBottomWidth"),c.css("borderLeftWidth")],f=[c.css("paddingTop"),c.css("paddingRight"),c.css("paddingBottom"),c.css("paddingLeft")];this.borderDif=e.map(d,function(g,h){g=parseInt(g,10)||0;h=parseInt(f[h],10)||0;return g+h})}e.browser.msie&&(e(b).is(":hidden")||e(b).parents(":hidden").length)||c.css({height:b.height()-this.borderDif[0]-this.borderDif[2]||0,width:b.width()-this.borderDif[1]-this.borderDif[3]||0})}},_renderProxy:function(){var b=this.options;this.elementOffset=
+this.element.offset();if(this._helper){this.helper=this.helper||e('<div style="overflow:hidden;"></div>');var a=e.browser.msie&&e.browser.version<7,c=a?1:0;a=a?2:-1;this.helper.addClass(this._helper).css({width:this.element.outerWidth()+a,height:this.element.outerHeight()+a,position:"absolute",left:this.elementOffset.left-c+"px",top:this.elementOffset.top-c+"px",zIndex:++b.zIndex});this.helper.appendTo("body").disableSelection()}else this.helper=this.element},_change:{e:function(b,a){return{width:this.originalSize.width+
+a}},w:function(b,a){return{left:this.originalPosition.left+a,width:this.originalSize.width-a}},n:function(b,a,c){return{top:this.originalPosition.top+c,height:this.originalSize.height-c}},s:function(b,a,c){return{height:this.originalSize.height+c}},se:function(b,a,c){return e.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[b,a,c]))},sw:function(b,a,c){return e.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[b,a,c]))},ne:function(b,a,c){return e.extend(this._change.n.apply(this,
+arguments),this._change.e.apply(this,[b,a,c]))},nw:function(b,a,c){return e.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[b,a,c]))}},_propagate:function(b,a){e.ui.plugin.call(this,b,[a,this.ui()]);b!="resize"&&this._trigger(b,a,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}});e.extend(e.ui.resizable,
+{version:"1.8.5"});e.ui.plugin.add("resizable","alsoResize",{start:function(){var b=e(this).data("resizable").options,a=function(c){e(c).each(function(){var d=e(this);d.data("resizable-alsoresize",{width:parseInt(d.width(),10),height:parseInt(d.height(),10),left:parseInt(d.css("left"),10),top:parseInt(d.css("top"),10),position:d.css("position")})})};if(typeof b.alsoResize=="object"&&!b.alsoResize.parentNode)if(b.alsoResize.length){b.alsoResize=b.alsoResize[0];a(b.alsoResize)}else e.each(b.alsoResize,
+function(c){a(c)});else a(b.alsoResize)},resize:function(b,a){var c=e(this).data("resizable");b=c.options;var d=c.originalSize,f=c.originalPosition,g={height:c.size.height-d.height||0,width:c.size.width-d.width||0,top:c.position.top-f.top||0,left:c.position.left-f.left||0},h=function(i,j){e(i).each(function(){var k=e(this),q=e(this).data("resizable-alsoresize"),p={},r=j&&j.length?j:k.parents(a.originalElement[0]).length?["width","height"]:["width","height","top","left"];e.each(r,function(n,o){if((n=
+(q[o]||0)+(g[o]||0))&&n>=0)p[o]=n||null});if(e.browser.opera&&/relative/.test(k.css("position"))){c._revertToRelativePosition=true;k.css({position:"absolute",top:"auto",left:"auto"})}k.css(p)})};typeof b.alsoResize=="object"&&!b.alsoResize.nodeType?e.each(b.alsoResize,function(i,j){h(i,j)}):h(b.alsoResize)},stop:function(){var b=e(this).data("resizable"),a=b.options,c=function(d){e(d).each(function(){var f=e(this);f.css({position:f.data("resizable-alsoresize").position})})};if(b._revertToRelativePosition){b._revertToRelativePosition=
+false;typeof a.alsoResize=="object"&&!a.alsoResize.nodeType?e.each(a.alsoResize,function(d){c(d)}):c(a.alsoResize)}e(this).removeData("resizable-alsoresize")}});e.ui.plugin.add("resizable","animate",{stop:function(b){var a=e(this).data("resizable"),c=a.options,d=a._proportionallyResizeElements,f=d.length&&/textarea/i.test(d[0].nodeName),g=f&&e.ui.hasScroll(d[0],"left")?0:a.sizeDiff.height;f={width:a.size.width-(f?0:a.sizeDiff.width),height:a.size.height-g};g=parseInt(a.element.css("left"),10)+(a.position.left-
+a.originalPosition.left)||null;var h=parseInt(a.element.css("top"),10)+(a.position.top-a.originalPosition.top)||null;a.element.animate(e.extend(f,h&&g?{top:h,left:g}:{}),{duration:c.animateDuration,easing:c.animateEasing,step:function(){var i={width:parseInt(a.element.css("width"),10),height:parseInt(a.element.css("height"),10),top:parseInt(a.element.css("top"),10),left:parseInt(a.element.css("left"),10)};d&&d.length&&e(d[0]).css({width:i.width,height:i.height});a._updateCache(i);a._propagate("resize",
+b)}})}});e.ui.plugin.add("resizable","containment",{start:function(){var b=e(this).data("resizable"),a=b.element,c=b.options.containment;if(a=c instanceof e?c.get(0):/parent/.test(c)?a.parent().get(0):c){b.containerElement=e(a);if(/document/.test(c)||c==document){b.containerOffset={left:0,top:0};b.containerPosition={left:0,top:0};b.parentData={element:e(document),left:0,top:0,width:e(document).width(),height:e(document).height()||document.body.parentNode.scrollHeight}}else{var d=e(a),f=[];e(["Top",
+"Right","Left","Bottom"]).each(function(i,j){f[i]=m(d.css("padding"+j))});b.containerOffset=d.offset();b.containerPosition=d.position();b.containerSize={height:d.innerHeight()-f[3],width:d.innerWidth()-f[1]};c=b.containerOffset;var g=b.containerSize.height,h=b.containerSize.width;h=e.ui.hasScroll(a,"left")?a.scrollWidth:h;g=e.ui.hasScroll(a)?a.scrollHeight:g;b.parentData={element:a,left:c.left,top:c.top,width:h,height:g}}}},resize:function(b){var a=e(this).data("resizable"),c=a.options,d=a.containerOffset,
+f=a.position;b=a._aspectRatio||b.shiftKey;var g={top:0,left:0},h=a.containerElement;if(h[0]!=document&&/static/.test(h.css("position")))g=d;if(f.left<(a._helper?d.left:0)){a.size.width+=a._helper?a.position.left-d.left:a.position.left-g.left;if(b)a.size.height=a.size.width/c.aspectRatio;a.position.left=c.helper?d.left:0}if(f.top<(a._helper?d.top:0)){a.size.height+=a._helper?a.position.top-d.top:a.position.top;if(b)a.size.width=a.size.height*c.aspectRatio;a.position.top=a._helper?d.top:0}a.offset.left=
+a.parentData.left+a.position.left;a.offset.top=a.parentData.top+a.position.top;c=Math.abs((a._helper?a.offset.left-g.left:a.offset.left-g.left)+a.sizeDiff.width);d=Math.abs((a._helper?a.offset.top-g.top:a.offset.top-d.top)+a.sizeDiff.height);f=a.containerElement.get(0)==a.element.parent().get(0);g=/relative|absolute/.test(a.containerElement.css("position"));if(f&&g)c-=a.parentData.left;if(c+a.size.width>=a.parentData.width){a.size.width=a.parentData.width-c;if(b)a.size.height=a.size.width/a.aspectRatio}if(d+
+a.size.height>=a.parentData.height){a.size.height=a.parentData.height-d;if(b)a.size.width=a.size.height*a.aspectRatio}},stop:function(){var b=e(this).data("resizable"),a=b.options,c=b.containerOffset,d=b.containerPosition,f=b.containerElement,g=e(b.helper),h=g.offset(),i=g.outerWidth()-b.sizeDiff.width;g=g.outerHeight()-b.sizeDiff.height;b._helper&&!a.animate&&/relative/.test(f.css("position"))&&e(this).css({left:h.left-d.left-c.left,width:i,height:g});b._helper&&!a.animate&&/static/.test(f.css("position"))&&
+e(this).css({left:h.left-d.left-c.left,width:i,height:g})}});e.ui.plugin.add("resizable","ghost",{start:function(){var b=e(this).data("resizable"),a=b.options,c=b.size;b.ghost=b.originalElement.clone();b.ghost.css({opacity:0.25,display:"block",position:"relative",height:c.height,width:c.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass(typeof a.ghost=="string"?a.ghost:"");b.ghost.appendTo(b.helper)},resize:function(){var b=e(this).data("resizable");b.ghost&&b.ghost.css({position:"relative",
+height:b.size.height,width:b.size.width})},stop:function(){var b=e(this).data("resizable");b.ghost&&b.helper&&b.helper.get(0).removeChild(b.ghost.get(0))}});e.ui.plugin.add("resizable","grid",{resize:function(){var b=e(this).data("resizable"),a=b.options,c=b.size,d=b.originalSize,f=b.originalPosition,g=b.axis;a.grid=typeof a.grid=="number"?[a.grid,a.grid]:a.grid;var h=Math.round((c.width-d.width)/(a.grid[0]||1))*(a.grid[0]||1);a=Math.round((c.height-d.height)/(a.grid[1]||1))*(a.grid[1]||1);if(/^(se|s|e)$/.test(g)){b.size.width=
+d.width+h;b.size.height=d.height+a}else if(/^(ne)$/.test(g)){b.size.width=d.width+h;b.size.height=d.height+a;b.position.top=f.top-a}else{if(/^(sw)$/.test(g)){b.size.width=d.width+h;b.size.height=d.height+a}else{b.size.width=d.width+h;b.size.height=d.height+a;b.position.top=f.top-a}b.position.left=f.left-h}}});var m=function(b){return parseInt(b,10)||0},l=function(b){return!isNaN(parseInt(b,10))}})(jQuery);
+;/*
+ * jQuery UI Selectable 1.8.5
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Selectables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+(function(e){e.widget("ui.selectable",e.ui.mouse,{options:{appendTo:"body",autoRefresh:true,distance:0,filter:"*",tolerance:"touch"},_create:function(){var c=this;this.element.addClass("ui-selectable");this.dragged=false;var f;this.refresh=function(){f=e(c.options.filter,c.element[0]);f.each(function(){var d=e(this),b=d.offset();e.data(this,"selectable-item",{element:this,$element:d,left:b.left,top:b.top,right:b.left+d.outerWidth(),bottom:b.top+d.outerHeight(),startselected:false,selected:d.hasClass("ui-selected"),
+selecting:d.hasClass("ui-selecting"),unselecting:d.hasClass("ui-unselecting")})})};this.refresh();this.selectees=f.addClass("ui-selectee");this._mouseInit();this.helper=e("<div class='ui-selectable-helper'></div>")},destroy:function(){this.selectees.removeClass("ui-selectee").removeData("selectable-item");this.element.removeClass("ui-selectable ui-selectable-disabled").removeData("selectable").unbind(".selectable");this._mouseDestroy();return this},_mouseStart:function(c){var f=this;this.opos=[c.pageX,
+c.pageY];if(!this.options.disabled){var d=this.options;this.selectees=e(d.filter,this.element[0]);this._trigger("start",c);e(d.appendTo).append(this.helper);this.helper.css({left:c.clientX,top:c.clientY,width:0,height:0});d.autoRefresh&&this.refresh();this.selectees.filter(".ui-selected").each(function(){var b=e.data(this,"selectable-item");b.startselected=true;if(!c.metaKey){b.$element.removeClass("ui-selected");b.selected=false;b.$element.addClass("ui-unselecting");b.unselecting=true;f._trigger("unselecting",
+c,{unselecting:b.element})}});e(c.target).parents().andSelf().each(function(){var b=e.data(this,"selectable-item");if(b){var g=!c.metaKey||!b.$element.hasClass("ui-selected");b.$element.removeClass(g?"ui-unselecting":"ui-selected").addClass(g?"ui-selecting":"ui-unselecting");b.unselecting=!g;b.selecting=g;(b.selected=g)?f._trigger("selecting",c,{selecting:b.element}):f._trigger("unselecting",c,{unselecting:b.element});return false}})}},_mouseDrag:function(c){var f=this;this.dragged=true;if(!this.options.disabled){var d=
+this.options,b=this.opos[0],g=this.opos[1],h=c.pageX,i=c.pageY;if(b>h){var j=h;h=b;b=j}if(g>i){j=i;i=g;g=j}this.helper.css({left:b,top:g,width:h-b,height:i-g});this.selectees.each(function(){var a=e.data(this,"selectable-item");if(!(!a||a.element==f.element[0])){var k=false;if(d.tolerance=="touch")k=!(a.left>h||a.right<b||a.top>i||a.bottom<g);else if(d.tolerance=="fit")k=a.left>b&&a.right<h&&a.top>g&&a.bottom<i;if(k){if(a.selected){a.$element.removeClass("ui-selected");a.selected=false}if(a.unselecting){a.$element.removeClass("ui-unselecting");
+a.unselecting=false}if(!a.selecting){a.$element.addClass("ui-selecting");a.selecting=true;f._trigger("selecting",c,{selecting:a.element})}}else{if(a.selecting)if(c.metaKey&&a.startselected){a.$element.removeClass("ui-selecting");a.selecting=false;a.$element.addClass("ui-selected");a.selected=true}else{a.$element.removeClass("ui-selecting");a.selecting=false;if(a.startselected){a.$element.addClass("ui-unselecting");a.unselecting=true}f._trigger("unselecting",c,{unselecting:a.element})}if(a.selected)if(!c.metaKey&&
+!a.startselected){a.$element.removeClass("ui-selected");a.selected=false;a.$element.addClass("ui-unselecting");a.unselecting=true;f._trigger("unselecting",c,{unselecting:a.element})}}}});return false}},_mouseStop:function(c){var f=this;this.dragged=false;e(".ui-unselecting",this.element[0]).each(function(){var d=e.data(this,"selectable-item");d.$element.removeClass("ui-unselecting");d.unselecting=false;d.startselected=false;f._trigger("unselected",c,{unselected:d.element})});e(".ui-selecting",this.element[0]).each(function(){var d=
+e.data(this,"selectable-item");d.$element.removeClass("ui-selecting").addClass("ui-selected");d.selecting=false;d.selected=true;d.startselected=true;f._trigger("selected",c,{selected:d.element})});this._trigger("stop",c);this.helper.remove();return false}});e.extend(e.ui.selectable,{version:"1.8.5"})})(jQuery);
+;/*
+ * jQuery UI Sortable 1.8.5
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Sortables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+(function(d){d.widget("ui.sortable",d.ui.mouse,{widgetEventPrefix:"sort",options:{appendTo:"parent",axis:false,connectWith:false,containment:false,cursor:"auto",cursorAt:false,dropOnEmpty:true,forcePlaceholderSize:false,forceHelperSize:false,grid:false,handle:false,helper:"original",items:"> *",opacity:false,placeholder:false,revert:false,scroll:true,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1E3},_create:function(){this.containerCache={};this.element.addClass("ui-sortable");
+this.refresh();this.floating=this.items.length?/left|right/.test(this.items[0].item.css("float")):false;this.offset=this.element.offset();this._mouseInit()},destroy:function(){this.element.removeClass("ui-sortable ui-sortable-disabled").removeData("sortable").unbind(".sortable");this._mouseDestroy();for(var a=this.items.length-1;a>=0;a--)this.items[a].item.removeData("sortable-item");return this},_setOption:function(a,b){if(a==="disabled"){this.options[a]=b;this.widget()[b?"addClass":"removeClass"]("ui-sortable-disabled")}else d.Widget.prototype._setOption.apply(this,
+arguments)},_mouseCapture:function(a,b){if(this.reverting)return false;if(this.options.disabled||this.options.type=="static")return false;this._refreshItems(a);var c=null,e=this;d(a.target).parents().each(function(){if(d.data(this,"sortable-item")==e){c=d(this);return false}});if(d.data(a.target,"sortable-item")==e)c=d(a.target);if(!c)return false;if(this.options.handle&&!b){var f=false;d(this.options.handle,c).find("*").andSelf().each(function(){if(this==a.target)f=true});if(!f)return false}this.currentItem=
+c;this._removeCurrentsFromItems();return true},_mouseStart:function(a,b,c){b=this.options;var e=this;this.currentContainer=this;this.refreshPositions();this.helper=this._createHelper(a);this._cacheHelperProportions();this._cacheMargins();this.scrollParent=this.helper.scrollParent();this.offset=this.currentItem.offset();this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left};this.helper.css("position","absolute");this.cssPosition=this.helper.css("position");d.extend(this.offset,
+{click:{left:a.pageX-this.offset.left,top:a.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()});this.originalPosition=this._generatePosition(a);this.originalPageX=a.pageX;this.originalPageY=a.pageY;b.cursorAt&&this._adjustOffsetFromHelper(b.cursorAt);this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]};this.helper[0]!=this.currentItem[0]&&this.currentItem.hide();this._createPlaceholder();b.containment&&this._setContainment();
+if(b.cursor){if(d("body").css("cursor"))this._storedCursor=d("body").css("cursor");d("body").css("cursor",b.cursor)}if(b.opacity){if(this.helper.css("opacity"))this._storedOpacity=this.helper.css("opacity");this.helper.css("opacity",b.opacity)}if(b.zIndex){if(this.helper.css("zIndex"))this._storedZIndex=this.helper.css("zIndex");this.helper.css("zIndex",b.zIndex)}if(this.scrollParent[0]!=document&&this.scrollParent[0].tagName!="HTML")this.overflowOffset=this.scrollParent.offset();this._trigger("start",
+a,this._uiHash());this._preserveHelperProportions||this._cacheHelperProportions();if(!c)for(c=this.containers.length-1;c>=0;c--)this.containers[c]._trigger("activate",a,e._uiHash(this));if(d.ui.ddmanager)d.ui.ddmanager.current=this;d.ui.ddmanager&&!b.dropBehaviour&&d.ui.ddmanager.prepareOffsets(this,a);this.dragging=true;this.helper.addClass("ui-sortable-helper");this._mouseDrag(a);return true},_mouseDrag:function(a){this.position=this._generatePosition(a);this.positionAbs=this._convertPositionTo("absolute");
+if(!this.lastPositionAbs)this.lastPositionAbs=this.positionAbs;if(this.options.scroll){var b=this.options,c=false;if(this.scrollParent[0]!=document&&this.scrollParent[0].tagName!="HTML"){if(this.overflowOffset.top+this.scrollParent[0].offsetHeight-a.pageY<b.scrollSensitivity)this.scrollParent[0].scrollTop=c=this.scrollParent[0].scrollTop+b.scrollSpeed;else if(a.pageY-this.overflowOffset.top<b.scrollSensitivity)this.scrollParent[0].scrollTop=c=this.scrollParent[0].scrollTop-b.scrollSpeed;if(this.overflowOffset.left+
+this.scrollParent[0].offsetWidth-a.pageX<b.scrollSensitivity)this.scrollParent[0].scrollLeft=c=this.scrollParent[0].scrollLeft+b.scrollSpeed;else if(a.pageX-this.overflowOffset.left<b.scrollSensitivity)this.scrollParent[0].scrollLeft=c=this.scrollParent[0].scrollLeft-b.scrollSpeed}else{if(a.pageY-d(document).scrollTop()<b.scrollSensitivity)c=d(document).scrollTop(d(document).scrollTop()-b.scrollSpeed);else if(d(window).height()-(a.pageY-d(document).scrollTop())<b.scrollSensitivity)c=d(document).scrollTop(d(document).scrollTop()+
+b.scrollSpeed);if(a.pageX-d(document).scrollLeft()<b.scrollSensitivity)c=d(document).scrollLeft(d(document).scrollLeft()-b.scrollSpeed);else if(d(window).width()-(a.pageX-d(document).scrollLeft())<b.scrollSensitivity)c=d(document).scrollLeft(d(document).scrollLeft()+b.scrollSpeed)}c!==false&&d.ui.ddmanager&&!b.dropBehaviour&&d.ui.ddmanager.prepareOffsets(this,a)}this.positionAbs=this._convertPositionTo("absolute");if(!this.options.axis||this.options.axis!="y")this.helper[0].style.left=this.position.left+
+"px";if(!this.options.axis||this.options.axis!="x")this.helper[0].style.top=this.position.top+"px";for(b=this.items.length-1;b>=0;b--){c=this.items[b];var e=c.item[0],f=this._intersectsWithPointer(c);if(f)if(e!=this.currentItem[0]&&this.placeholder[f==1?"next":"prev"]()[0]!=e&&!d.ui.contains(this.placeholder[0],e)&&(this.options.type=="semi-dynamic"?!d.ui.contains(this.element[0],e):true)){this.direction=f==1?"down":"up";if(this.options.tolerance=="pointer"||this._intersectsWithSides(c))this._rearrange(a,
+c);else break;this._trigger("change",a,this._uiHash());break}}this._contactContainers(a);d.ui.ddmanager&&d.ui.ddmanager.drag(this,a);this._trigger("sort",a,this._uiHash());this.lastPositionAbs=this.positionAbs;return false},_mouseStop:function(a,b){if(a){d.ui.ddmanager&&!this.options.dropBehaviour&&d.ui.ddmanager.drop(this,a);if(this.options.revert){var c=this;b=c.placeholder.offset();c.reverting=true;d(this.helper).animate({left:b.left-this.offset.parent.left-c.margins.left+(this.offsetParent[0]==
+document.body?0:this.offsetParent[0].scrollLeft),top:b.top-this.offset.parent.top-c.margins.top+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollTop)},parseInt(this.options.revert,10)||500,function(){c._clear(a)})}else this._clear(a,b);return false}},cancel:function(){var a=this;if(this.dragging){this._mouseUp();this.options.helper=="original"?this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper"):this.currentItem.show();for(var b=this.containers.length-1;b>=0;b--){this.containers[b]._trigger("deactivate",
+null,a._uiHash(this));if(this.containers[b].containerCache.over){this.containers[b]._trigger("out",null,a._uiHash(this));this.containers[b].containerCache.over=0}}}this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]);this.options.helper!="original"&&this.helper&&this.helper[0].parentNode&&this.helper.remove();d.extend(this,{helper:null,dragging:false,reverting:false,_noFinalSort:null});this.domPosition.prev?d(this.domPosition.prev).after(this.currentItem):
+d(this.domPosition.parent).prepend(this.currentItem);return this},serialize:function(a){var b=this._getItemsAsjQuery(a&&a.connected),c=[];a=a||{};d(b).each(function(){var e=(d(a.item||this).attr(a.attribute||"id")||"").match(a.expression||/(.+)[-=_](.+)/);if(e)c.push((a.key||e[1]+"[]")+"="+(a.key&&a.expression?e[1]:e[2]))});!c.length&&a.key&&c.push(a.key+"=");return c.join("&")},toArray:function(a){var b=this._getItemsAsjQuery(a&&a.connected),c=[];a=a||{};b.each(function(){c.push(d(a.item||this).attr(a.attribute||
+"id")||"")});return c},_intersectsWith:function(a){var b=this.positionAbs.left,c=b+this.helperProportions.width,e=this.positionAbs.top,f=e+this.helperProportions.height,g=a.left,h=g+a.width,i=a.top,k=i+a.height,j=this.offset.click.top,l=this.offset.click.left;j=e+j>i&&e+j<k&&b+l>g&&b+l<h;return this.options.tolerance=="pointer"||this.options.forcePointerForContainers||this.options.tolerance!="pointer"&&this.helperProportions[this.floating?"width":"height"]>a[this.floating?"width":"height"]?j:g<b+
+this.helperProportions.width/2&&c-this.helperProportions.width/2<h&&i<e+this.helperProportions.height/2&&f-this.helperProportions.height/2<k},_intersectsWithPointer:function(a){var b=d.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,a.top,a.height);a=d.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,a.left,a.width);b=b&&a;a=this._getDragVerticalDirection();var c=this._getDragHorizontalDirection();if(!b)return false;return this.floating?c&&c=="right"||a=="down"?2:1:a&&(a=="down"?
+2:1)},_intersectsWithSides:function(a){var b=d.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,a.top+a.height/2,a.height);a=d.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,a.left+a.width/2,a.width);var c=this._getDragVerticalDirection(),e=this._getDragHorizontalDirection();return this.floating&&e?e=="right"&&a||e=="left"&&!a:c&&(c=="down"&&b||c=="up"&&!b)},_getDragVerticalDirection:function(){var a=this.positionAbs.top-this.lastPositionAbs.top;return a!=0&&(a>0?"down":"up")},
+_getDragHorizontalDirection:function(){var a=this.positionAbs.left-this.lastPositionAbs.left;return a!=0&&(a>0?"right":"left")},refresh:function(a){this._refreshItems(a);this.refreshPositions();return this},_connectWith:function(){var a=this.options;return a.connectWith.constructor==String?[a.connectWith]:a.connectWith},_getItemsAsjQuery:function(a){var b=[],c=[],e=this._connectWith();if(e&&a)for(a=e.length-1;a>=0;a--)for(var f=d(e[a]),g=f.length-1;g>=0;g--){var h=d.data(f[g],"sortable");if(h&&h!=
+this&&!h.options.disabled)c.push([d.isFunction(h.options.items)?h.options.items.call(h.element):d(h.options.items,h.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),h])}c.push([d.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):d(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),this]);for(a=c.length-1;a>=0;a--)c[a][0].each(function(){b.push(this)});return d(b)},_removeCurrentsFromItems:function(){for(var a=
+this.currentItem.find(":data(sortable-item)"),b=0;b<this.items.length;b++)for(var c=0;c<a.length;c++)a[c]==this.items[b].item[0]&&this.items.splice(b,1)},_refreshItems:function(a){this.items=[];this.containers=[this];var b=this.items,c=[[d.isFunction(this.options.items)?this.options.items.call(this.element[0],a,{item:this.currentItem}):d(this.options.items,this.element),this]],e=this._connectWith();if(e)for(var f=e.length-1;f>=0;f--)for(var g=d(e[f]),h=g.length-1;h>=0;h--){var i=d.data(g[h],"sortable");
+if(i&&i!=this&&!i.options.disabled){c.push([d.isFunction(i.options.items)?i.options.items.call(i.element[0],a,{item:this.currentItem}):d(i.options.items,i.element),i]);this.containers.push(i)}}for(f=c.length-1;f>=0;f--){a=c[f][1];e=c[f][0];h=0;for(g=e.length;h<g;h++){i=d(e[h]);i.data("sortable-item",a);b.push({item:i,instance:a,width:0,height:0,left:0,top:0})}}},refreshPositions:function(a){if(this.offsetParent&&this.helper)this.offset.parent=this._getParentOffset();for(var b=this.items.length-1;b>=
+0;b--){var c=this.items[b],e=this.options.toleranceElement?d(this.options.toleranceElement,c.item):c.item;if(!a){c.width=e.outerWidth();c.height=e.outerHeight()}e=e.offset();c.left=e.left;c.top=e.top}if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(b=this.containers.length-1;b>=0;b--){e=this.containers[b].element.offset();this.containers[b].containerCache.left=e.left;this.containers[b].containerCache.top=e.top;this.containers[b].containerCache.width=
+this.containers[b].element.outerWidth();this.containers[b].containerCache.height=this.containers[b].element.outerHeight()}return this},_createPlaceholder:function(a){var b=a||this,c=b.options;if(!c.placeholder||c.placeholder.constructor==String){var e=c.placeholder;c.placeholder={element:function(){var f=d(document.createElement(b.currentItem[0].nodeName)).addClass(e||b.currentItem[0].className+" ui-sortable-placeholder").removeClass("ui-sortable-helper")[0];if(!e)f.style.visibility="hidden";return f},
+update:function(f,g){if(!(e&&!c.forcePlaceholderSize)){g.height()||g.height(b.currentItem.innerHeight()-parseInt(b.currentItem.css("paddingTop")||0,10)-parseInt(b.currentItem.css("paddingBottom")||0,10));g.width()||g.width(b.currentItem.innerWidth()-parseInt(b.currentItem.css("paddingLeft")||0,10)-parseInt(b.currentItem.css("paddingRight")||0,10))}}}}b.placeholder=d(c.placeholder.element.call(b.element,b.currentItem));b.currentItem.after(b.placeholder);c.placeholder.update(b,b.placeholder)},_contactContainers:function(a){for(var b=
+null,c=null,e=this.containers.length-1;e>=0;e--)if(!d.ui.contains(this.currentItem[0],this.containers[e].element[0]))if(this._intersectsWith(this.containers[e].containerCache)){if(!(b&&d.ui.contains(this.containers[e].element[0],b.element[0]))){b=this.containers[e];c=e}}else if(this.containers[e].containerCache.over){this.containers[e]._trigger("out",a,this._uiHash(this));this.containers[e].containerCache.over=0}if(b)if(this.containers.length===1){this.containers[c]._trigger("over",a,this._uiHash(this));
+this.containers[c].containerCache.over=1}else if(this.currentContainer!=this.containers[c]){b=1E4;e=null;for(var f=this.positionAbs[this.containers[c].floating?"left":"top"],g=this.items.length-1;g>=0;g--)if(d.ui.contains(this.containers[c].element[0],this.items[g].item[0])){var h=this.items[g][this.containers[c].floating?"left":"top"];if(Math.abs(h-f)<b){b=Math.abs(h-f);e=this.items[g]}}if(e||this.options.dropOnEmpty){this.currentContainer=this.containers[c];e?this._rearrange(a,e,null,true):this._rearrange(a,
+null,this.containers[c].element,true);this._trigger("change",a,this._uiHash());this.containers[c]._trigger("change",a,this._uiHash(this));this.options.placeholder.update(this.currentContainer,this.placeholder);this.containers[c]._trigger("over",a,this._uiHash(this));this.containers[c].containerCache.over=1}}},_createHelper:function(a){var b=this.options;a=d.isFunction(b.helper)?d(b.helper.apply(this.element[0],[a,this.currentItem])):b.helper=="clone"?this.currentItem.clone():this.currentItem;a.parents("body").length||
+d(b.appendTo!="parent"?b.appendTo:this.currentItem[0].parentNode)[0].appendChild(a[0]);if(a[0]==this.currentItem[0])this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")};if(a[0].style.width==""||b.forceHelperSize)a.width(this.currentItem.width());if(a[0].style.height==""||b.forceHelperSize)a.height(this.currentItem.height());return a},_adjustOffsetFromHelper:function(a){if(typeof a==
+"string")a=a.split(" ");if(d.isArray(a))a={left:+a[0],top:+a[1]||0};if("left"in a)this.offset.click.left=a.left+this.margins.left;if("right"in a)this.offset.click.left=this.helperProportions.width-a.right+this.margins.left;if("top"in a)this.offset.click.top=a.top+this.margins.top;if("bottom"in a)this.offset.click.top=this.helperProportions.height-a.bottom+this.margins.top},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var a=this.offsetParent.offset();if(this.cssPosition==
+"absolute"&&this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0])){a.left+=this.scrollParent.scrollLeft();a.top+=this.scrollParent.scrollTop()}if(this.offsetParent[0]==document.body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&d.browser.msie)a={top:0,left:0};return{top:a.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:a.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition==
+"relative"){var a=this.currentItem.position();return{top:a.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:a.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}else return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},
+_setContainment:function(){var a=this.options;if(a.containment=="parent")a.containment=this.helper[0].parentNode;if(a.containment=="document"||a.containment=="window")this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,d(a.containment=="document"?document:window).width()-this.helperProportions.width-this.margins.left,(d(a.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-
+this.margins.top];if(!/^(document|window|parent)$/.test(a.containment)){var b=d(a.containment)[0];a=d(a.containment).offset();var c=d(b).css("overflow")!="hidden";this.containment=[a.left+(parseInt(d(b).css("borderLeftWidth"),10)||0)+(parseInt(d(b).css("paddingLeft"),10)||0)-this.margins.left,a.top+(parseInt(d(b).css("borderTopWidth"),10)||0)+(parseInt(d(b).css("paddingTop"),10)||0)-this.margins.top,a.left+(c?Math.max(b.scrollWidth,b.offsetWidth):b.offsetWidth)-(parseInt(d(b).css("borderLeftWidth"),
+10)||0)-(parseInt(d(b).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,a.top+(c?Math.max(b.scrollHeight,b.offsetHeight):b.offsetHeight)-(parseInt(d(b).css("borderTopWidth"),10)||0)-(parseInt(d(b).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top]}},_convertPositionTo:function(a,b){if(!b)b=this.position;a=a=="absolute"?1:-1;var c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?
+this.offsetParent:this.scrollParent,e=/(html|body)/i.test(c[0].tagName);return{top:b.top+this.offset.relative.top*a+this.offset.parent.top*a-(d.browser.safari&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():e?0:c.scrollTop())*a),left:b.left+this.offset.relative.left*a+this.offset.parent.left*a-(d.browser.safari&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():e?0:c.scrollLeft())*a)}},_generatePosition:function(a){var b=
+this.options,c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,e=/(html|body)/i.test(c[0].tagName);if(this.cssPosition=="relative"&&!(this.scrollParent[0]!=document&&this.scrollParent[0]!=this.offsetParent[0]))this.offset.relative=this._getRelativeOffset();var f=a.pageX,g=a.pageY;if(this.originalPosition){if(this.containment){if(a.pageX-this.offset.click.left<this.containment[0])f=this.containment[0]+
+this.offset.click.left;if(a.pageY-this.offset.click.top<this.containment[1])g=this.containment[1]+this.offset.click.top;if(a.pageX-this.offset.click.left>this.containment[2])f=this.containment[2]+this.offset.click.left;if(a.pageY-this.offset.click.top>this.containment[3])g=this.containment[3]+this.offset.click.top}if(b.grid){g=this.originalPageY+Math.round((g-this.originalPageY)/b.grid[1])*b.grid[1];g=this.containment?!(g-this.offset.click.top<this.containment[1]||g-this.offset.click.top>this.containment[3])?
+g:!(g-this.offset.click.top<this.containment[1])?g-b.grid[1]:g+b.grid[1]:g;f=this.originalPageX+Math.round((f-this.originalPageX)/b.grid[0])*b.grid[0];f=this.containment?!(f-this.offset.click.left<this.containment[0]||f-this.offset.click.left>this.containment[2])?f:!(f-this.offset.click.left<this.containment[0])?f-b.grid[0]:f+b.grid[0]:f}}return{top:g-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(d.browser.safari&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollTop():
+e?0:c.scrollTop()),left:f-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(d.browser.safari&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():e?0:c.scrollLeft())}},_rearrange:function(a,b,c,e){c?c[0].appendChild(this.placeholder[0]):b.item[0].parentNode.insertBefore(this.placeholder[0],this.direction=="down"?b.item[0]:b.item[0].nextSibling);this.counter=this.counter?++this.counter:1;var f=this,g=this.counter;window.setTimeout(function(){g==
+f.counter&&f.refreshPositions(!e)},0)},_clear:function(a,b){this.reverting=false;var c=[];!this._noFinalSort&&this.currentItem[0].parentNode&&this.placeholder.before(this.currentItem);this._noFinalSort=null;if(this.helper[0]==this.currentItem[0]){for(var e in this._storedCSS)if(this._storedCSS[e]=="auto"||this._storedCSS[e]=="static")this._storedCSS[e]="";this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper")}else this.currentItem.show();this.fromOutside&&!b&&c.push(function(f){this._trigger("receive",
+f,this._uiHash(this.fromOutside))});if((this.fromOutside||this.domPosition.prev!=this.currentItem.prev().not(".ui-sortable-helper")[0]||this.domPosition.parent!=this.currentItem.parent()[0])&&!b)c.push(function(f){this._trigger("update",f,this._uiHash())});if(!d.ui.contains(this.element[0],this.currentItem[0])){b||c.push(function(f){this._trigger("remove",f,this._uiHash())});for(e=this.containers.length-1;e>=0;e--)if(d.ui.contains(this.containers[e].element[0],this.currentItem[0])&&!b){c.push(function(f){return function(g){f._trigger("receive",
+g,this._uiHash(this))}}.call(this,this.containers[e]));c.push(function(f){return function(g){f._trigger("update",g,this._uiHash(this))}}.call(this,this.containers[e]))}}for(e=this.containers.length-1;e>=0;e--){b||c.push(function(f){return function(g){f._trigger("deactivate",g,this._uiHash(this))}}.call(this,this.containers[e]));if(this.containers[e].containerCache.over){c.push(function(f){return function(g){f._trigger("out",g,this._uiHash(this))}}.call(this,this.containers[e]));this.containers[e].containerCache.over=
+0}}this._storedCursor&&d("body").css("cursor",this._storedCursor);this._storedOpacity&&this.helper.css("opacity",this._storedOpacity);if(this._storedZIndex)this.helper.css("zIndex",this._storedZIndex=="auto"?"":this._storedZIndex);this.dragging=false;if(this.cancelHelperRemoval){if(!b){this._trigger("beforeStop",a,this._uiHash());for(e=0;e<c.length;e++)c[e].call(this,a);this._trigger("stop",a,this._uiHash())}return false}b||this._trigger("beforeStop",a,this._uiHash());this.placeholder[0].parentNode.removeChild(this.placeholder[0]);
+this.helper[0]!=this.currentItem[0]&&this.helper.remove();this.helper=null;if(!b){for(e=0;e<c.length;e++)c[e].call(this,a);this._trigger("stop",a,this._uiHash())}this.fromOutside=false;return true},_trigger:function(){d.Widget.prototype._trigger.apply(this,arguments)===false&&this.cancel()},_uiHash:function(a){var b=a||this;return{helper:b.helper,placeholder:b.placeholder||d([]),position:b.position,originalPosition:b.originalPosition,offset:b.positionAbs,item:b.currentItem,sender:a?a.element:null}}});
+d.extend(d.ui.sortable,{version:"1.8.5"})})(jQuery);
+;/*
+ * jQuery UI Accordion 1.8.5
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Accordion
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ */
+(function(c){c.widget("ui.accordion",{options:{active:0,animated:"slide",autoHeight:true,clearStyle:false,collapsible:false,event:"click",fillSpace:false,header:"> li > :first-child,> :not(li):even",icons:{header:"ui-icon-triangle-1-e",headerSelected:"ui-icon-triangle-1-s"},navigation:false,navigationFilter:function(){return this.href.toLowerCase()===location.href.toLowerCase()}},_create:function(){var a=this,b=a.options;a.running=0;a.element.addClass("ui-accordion ui-widget ui-helper-reset").children("li").addClass("ui-accordion-li-fix");
+a.headers=a.element.find(b.header).addClass("ui-accordion-header ui-helper-reset ui-state-default ui-corner-all").bind("mouseenter.accordion",function(){b.disabled||c(this).addClass("ui-state-hover")}).bind("mouseleave.accordion",function(){b.disabled||c(this).removeClass("ui-state-hover")}).bind("focus.accordion",function(){b.disabled||c(this).addClass("ui-state-focus")}).bind("blur.accordion",function(){b.disabled||c(this).removeClass("ui-state-focus")});a.headers.next().addClass("ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom");
+if(b.navigation){var d=a.element.find("a").filter(b.navigationFilter).eq(0);if(d.length){var f=d.closest(".ui-accordion-header");a.active=f.length?f:d.closest(".ui-accordion-content").prev()}}a.active=a._findActive(a.active||b.active).addClass("ui-state-default ui-state-active").toggleClass("ui-corner-all ui-corner-top");a.active.next().addClass("ui-accordion-content-active");a._createIcons();a.resize();a.element.attr("role","tablist");a.headers.attr("role","tab").bind("keydown.accordion",function(g){return a._keydown(g)}).next().attr("role",
+"tabpanel");a.headers.not(a.active||"").attr({"aria-expanded":"false",tabIndex:-1}).next().hide();a.active.length?a.active.attr({"aria-expanded":"true",tabIndex:0}):a.headers.eq(0).attr("tabIndex",0);c.browser.safari||a.headers.find("a").attr("tabIndex",-1);b.event&&a.headers.bind(b.event.split(" ").join(".accordion ")+".accordion",function(g){a._clickHandler.call(a,g,this);g.preventDefault()})},_createIcons:function(){var a=this.options;if(a.icons){c("<span></span>").addClass("ui-icon "+a.icons.header).prependTo(this.headers);
+this.active.children(".ui-icon").toggleClass(a.icons.header).toggleClass(a.icons.headerSelected);this.element.addClass("ui-accordion-icons")}},_destroyIcons:function(){this.headers.children(".ui-icon").remove();this.element.removeClass("ui-accordion-icons")},destroy:function(){var a=this.options;this.element.removeClass("ui-accordion ui-widget ui-helper-reset").removeAttr("role");this.headers.unbind(".accordion").removeClass("ui-accordion-header ui-accordion-disabled ui-helper-reset ui-state-default ui-corner-all ui-state-active ui-state-disabled ui-corner-top").removeAttr("role").removeAttr("aria-expanded").removeAttr("tabIndex");
+this.headers.find("a").removeAttr("tabIndex");this._destroyIcons();var b=this.headers.next().css("display","").removeAttr("role").removeClass("ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content ui-accordion-content-active ui-accordion-disabled ui-state-disabled");if(a.autoHeight||a.fillHeight)b.css("height","");return c.Widget.prototype.destroy.call(this)},_setOption:function(a,b){c.Widget.prototype._setOption.apply(this,arguments);a=="active"&&this.activate(b);if(a=="icons"){this._destroyIcons();
+b&&this._createIcons()}if(a=="disabled")this.headers.add(this.headers.next())[b?"addClass":"removeClass"]("ui-accordion-disabled ui-state-disabled")},_keydown:function(a){if(!(this.options.disabled||a.altKey||a.ctrlKey)){var b=c.ui.keyCode,d=this.headers.length,f=this.headers.index(a.target),g=false;switch(a.keyCode){case b.RIGHT:case b.DOWN:g=this.headers[(f+1)%d];break;case b.LEFT:case b.UP:g=this.headers[(f-1+d)%d];break;case b.SPACE:case b.ENTER:this._clickHandler({target:a.target},a.target);
+a.preventDefault()}if(g){c(a.target).attr("tabIndex",-1);c(g).attr("tabIndex",0);g.focus();return false}return true}},resize:function(){var a=this.options,b;if(a.fillSpace){if(c.browser.msie){var d=this.element.parent().css("overflow");this.element.parent().css("overflow","hidden")}b=this.element.parent().height();c.browser.msie&&this.element.parent().css("overflow",d);this.headers.each(function(){b-=c(this).outerHeight(true)});this.headers.next().each(function(){c(this).height(Math.max(0,b-c(this).innerHeight()+
+c(this).height()))}).css("overflow","auto")}else if(a.autoHeight){b=0;this.headers.next().each(function(){b=Math.max(b,c(this).height("").height())}).height(b)}return this},activate:function(a){this.options.active=a;a=this._findActive(a)[0];this._clickHandler({target:a},a);return this},_findActive:function(a){return a?typeof a==="number"?this.headers.filter(":eq("+a+")"):this.headers.not(this.headers.not(a)):a===false?c([]):this.headers.filter(":eq(0)")},_clickHandler:function(a,b){var d=this.options;
+if(!d.disabled)if(a.target){a=c(a.currentTarget||b);b=a[0]===this.active[0];d.active=d.collapsible&&b?false:this.headers.index(a);if(!(this.running||!d.collapsible&&b)){this.active.removeClass("ui-state-active ui-corner-top").addClass("ui-state-default ui-corner-all").children(".ui-icon").removeClass(d.icons.headerSelected).addClass(d.icons.header);if(!b){a.removeClass("ui-state-default ui-corner-all").addClass("ui-state-active ui-corner-top").children(".ui-icon").removeClass(d.icons.header).addClass(d.icons.headerSelected);
+a.next().addClass("ui-accordion-content-active")}h=a.next();f=this.active.next();g={options:d,newHeader:b&&d.collapsible?c([]):a,oldHeader:this.active,newContent:b&&d.collapsible?c([]):h,oldContent:f};d=this.headers.index(this.active[0])>this.headers.index(a[0]);this.active=b?c([]):a;this._toggle(h,f,g,b,d)}}else if(d.collapsible){this.active.removeClass("ui-state-active ui-corner-top").addClass("ui-state-default ui-corner-all").children(".ui-icon").removeClass(d.icons.headerSelected).addClass(d.icons.header);
+this.active.next().addClass("ui-accordion-content-active");var f=this.active.next(),g={options:d,newHeader:c([]),oldHeader:d.active,newContent:c([]),oldContent:f},h=this.active=c([]);this._toggle(h,f,g)}},_toggle:function(a,b,d,f,g){var h=this,e=h.options;h.toShow=a;h.toHide=b;h.data=d;var j=function(){if(h)return h._completed.apply(h,arguments)};h._trigger("changestart",null,h.data);h.running=b.size()===0?a.size():b.size();if(e.animated){d={};d=e.collapsible&&f?{toShow:c([]),toHide:b,complete:j,
+down:g,autoHeight:e.autoHeight||e.fillSpace}:{toShow:a,toHide:b,complete:j,down:g,autoHeight:e.autoHeight||e.fillSpace};if(!e.proxied)e.proxied=e.animated;if(!e.proxiedDuration)e.proxiedDuration=e.duration;e.animated=c.isFunction(e.proxied)?e.proxied(d):e.proxied;e.duration=c.isFunction(e.proxiedDuration)?e.proxiedDuration(d):e.proxiedDuration;f=c.ui.accordion.animations;var i=e.duration,k=e.animated;if(k&&!f[k]&&!c.easing[k])k="slide";f[k]||(f[k]=function(l){this.slide(l,{easing:k,duration:i||700})});
+f[k](d)}else{if(e.collapsible&&f)a.toggle();else{b.hide();a.show()}j(true)}b.prev().attr({"aria-expanded":"false",tabIndex:-1}).blur();a.prev().attr({"aria-expanded":"true",tabIndex:0}).focus()},_completed:function(a){this.running=a?0:--this.running;if(!this.running){this.options.clearStyle&&this.toShow.add(this.toHide).css({height:"",overflow:""});this.toHide.removeClass("ui-accordion-content-active");this._trigger("change",null,this.data)}}});c.extend(c.ui.accordion,{version:"1.8.5",animations:{slide:function(a,
+b){a=c.extend({easing:"swing",duration:300},a,b);if(a.toHide.size())if(a.toShow.size()){var d=a.toShow.css("overflow"),f=0,g={},h={},e;b=a.toShow;e=b[0].style.width;b.width(parseInt(b.parent().width(),10)-parseInt(b.css("paddingLeft"),10)-parseInt(b.css("paddingRight"),10)-(parseInt(b.css("borderLeftWidth"),10)||0)-(parseInt(b.css("borderRightWidth"),10)||0));c.each(["height","paddingTop","paddingBottom"],function(j,i){h[i]="hide";j=(""+c.css(a.toShow[0],i)).match(/^([\d+-.]+)(.*)$/);g[i]={value:j[1],
+unit:j[2]||"px"}});a.toShow.css({height:0,overflow:"hidden"}).show();a.toHide.filter(":hidden").each(a.complete).end().filter(":visible").animate(h,{step:function(j,i){if(i.prop=="height")f=i.end-i.start===0?0:(i.now-i.start)/(i.end-i.start);a.toShow[0].style[i.prop]=f*g[i.prop].value+g[i.prop].unit},duration:a.duration,easing:a.easing,complete:function(){a.autoHeight||a.toShow.css("height","");a.toShow.css({width:e,overflow:d});a.complete()}})}else a.toHide.animate({height:"hide",paddingTop:"hide",
+paddingBottom:"hide"},a);else a.toShow.animate({height:"show",paddingTop:"show",paddingBottom:"show"},a)},bounceslide:function(a){this.slide(a,{easing:a.down?"easeOutBounce":"swing",duration:a.down?1E3:200})}}})})(jQuery);
+;/*
+ * jQuery UI Autocomplete 1.8.5
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Autocomplete
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ *	jquery.ui.position.js
+ */
+(function(e){e.widget("ui.autocomplete",{options:{appendTo:"body",delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null},_create:function(){var a=this,b=this.element[0].ownerDocument;this.element.addClass("ui-autocomplete-input").attr("autocomplete","off").attr({role:"textbox","aria-autocomplete":"list","aria-haspopup":"true"}).bind("keydown.autocomplete",function(c){if(!a.options.disabled){var d=e.ui.keyCode;switch(c.keyCode){case d.PAGE_UP:a._move("previousPage",
+c);break;case d.PAGE_DOWN:a._move("nextPage",c);break;case d.UP:a._move("previous",c);c.preventDefault();break;case d.DOWN:a._move("next",c);c.preventDefault();break;case d.ENTER:case d.NUMPAD_ENTER:a.menu.element.is(":visible")&&c.preventDefault();case d.TAB:if(!a.menu.active)return;a.menu.select(c);break;case d.ESCAPE:a.element.val(a.term);a.close(c);break;default:clearTimeout(a.searching);a.searching=setTimeout(function(){if(a.term!=a.element.val()){a.selectedItem=null;a.search(null,c)}},a.options.delay);
+break}}}).bind("focus.autocomplete",function(){if(!a.options.disabled){a.selectedItem=null;a.previous=a.element.val()}}).bind("blur.autocomplete",function(c){if(!a.options.disabled){clearTimeout(a.searching);a.closing=setTimeout(function(){a.close(c);a._change(c)},150)}});this._initSource();this.response=function(){return a._response.apply(a,arguments)};this.menu=e("<ul></ul>").addClass("ui-autocomplete").appendTo(e(this.options.appendTo||"body",b)[0]).mousedown(function(c){var d=a.menu.element[0];
+c.target===d&&setTimeout(function(){e(document).one("mousedown",function(f){f.target!==a.element[0]&&f.target!==d&&!e.ui.contains(d,f.target)&&a.close()})},1);setTimeout(function(){clearTimeout(a.closing)},13)}).menu({focus:function(c,d){d=d.item.data("item.autocomplete");false!==a._trigger("focus",null,{item:d})&&/^key/.test(c.originalEvent.type)&&a.element.val(d.value)},selected:function(c,d){d=d.item.data("item.autocomplete");var f=a.previous;if(a.element[0]!==b.activeElement){a.element.focus();
+a.previous=f}if(false!==a._trigger("select",c,{item:d})){a.term=d.value;a.element.val(d.value)}a.close(c);a.selectedItem=d},blur:function(){a.menu.element.is(":visible")&&a.element.val()!==a.term&&a.element.val(a.term)}}).zIndex(this.element.zIndex()+1).css({top:0,left:0}).hide().data("menu");e.fn.bgiframe&&this.menu.element.bgiframe()},destroy:function(){this.element.removeClass("ui-autocomplete-input").removeAttr("autocomplete").removeAttr("role").removeAttr("aria-autocomplete").removeAttr("aria-haspopup");
+this.menu.element.remove();e.Widget.prototype.destroy.call(this)},_setOption:function(a,b){e.Widget.prototype._setOption.apply(this,arguments);a==="source"&&this._initSource();if(a==="appendTo")this.menu.element.appendTo(e(b||"body",this.element[0].ownerDocument)[0])},_initSource:function(){var a=this,b,c;if(e.isArray(this.options.source)){b=this.options.source;this.source=function(d,f){f(e.ui.autocomplete.filter(b,d.term))}}else if(typeof this.options.source==="string"){c=this.options.source;this.source=
+function(d,f){a.xhr&&a.xhr.abort();a.xhr=e.getJSON(c,d,function(g,i,h){h===a.xhr&&f(g);a.xhr=null})}}else this.source=this.options.source},search:function(a,b){a=a!=null?a:this.element.val();this.term=this.element.val();if(a.length<this.options.minLength)return this.close(b);clearTimeout(this.closing);if(this._trigger("search")!==false)return this._search(a)},_search:function(a){this.element.addClass("ui-autocomplete-loading");this.source({term:a},this.response)},_response:function(a){if(a.length){a=
+this._normalize(a);this._suggest(a);this._trigger("open")}else this.close();this.element.removeClass("ui-autocomplete-loading")},close:function(a){clearTimeout(this.closing);if(this.menu.element.is(":visible")){this._trigger("close",a);this.menu.element.hide();this.menu.deactivate()}},_change:function(a){this.previous!==this.element.val()&&this._trigger("change",a,{item:this.selectedItem})},_normalize:function(a){if(a.length&&a[0].label&&a[0].value)return a;return e.map(a,function(b){if(typeof b===
+"string")return{label:b,value:b};return e.extend({label:b.label||b.value,value:b.value||b.label},b)})},_suggest:function(a){var b=this.menu.element.empty().zIndex(this.element.zIndex()+1),c;this._renderMenu(b,a);this.menu.deactivate();this.menu.refresh();this.menu.element.show().position(e.extend({of:this.element},this.options.position));a=b.width("").outerWidth();c=this.element.outerWidth();b.outerWidth(Math.max(a,c))},_renderMenu:function(a,b){var c=this;e.each(b,function(d,f){c._renderItem(a,f)})},
+_renderItem:function(a,b){return e("<li></li>").data("item.autocomplete",b).append(e("<a></a>").text(b.label)).appendTo(a)},_move:function(a,b){if(this.menu.element.is(":visible"))if(this.menu.first()&&/^previous/.test(a)||this.menu.last()&&/^next/.test(a)){this.element.val(this.term);this.menu.deactivate()}else this.menu[a](b);else this.search(null,b)},widget:function(){return this.menu.element}});e.extend(e.ui.autocomplete,{escapeRegex:function(a){return a.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&")},
+filter:function(a,b){var c=new RegExp(e.ui.autocomplete.escapeRegex(b),"i");return e.grep(a,function(d){return c.test(d.label||d.value||d)})}})})(jQuery);
+(function(e){e.widget("ui.menu",{_create:function(){var a=this;this.element.addClass("ui-menu ui-widget ui-widget-content ui-corner-all").attr({role:"listbox","aria-activedescendant":"ui-active-menuitem"}).click(function(b){if(e(b.target).closest(".ui-menu-item a").length){b.preventDefault();a.select(b)}});this.refresh()},refresh:function(){var a=this;this.element.children("li:not(.ui-menu-item):has(a)").addClass("ui-menu-item").attr("role","menuitem").children("a").addClass("ui-corner-all").attr("tabindex",
+-1).mouseenter(function(b){a.activate(b,e(this).parent())}).mouseleave(function(){a.deactivate()})},activate:function(a,b){this.deactivate();if(this.hasScroll()){var c=b.offset().top-this.element.offset().top,d=this.element.attr("scrollTop"),f=this.element.height();if(c<0)this.element.attr("scrollTop",d+c);else c>=f&&this.element.attr("scrollTop",d+c-f+b.height())}this.active=b.eq(0).children("a").addClass("ui-state-hover").attr("id","ui-active-menuitem").end();this._trigger("focus",a,{item:b})},
+deactivate:function(){if(this.active){this.active.children("a").removeClass("ui-state-hover").removeAttr("id");this._trigger("blur");this.active=null}},next:function(a){this.move("next",".ui-menu-item:first",a)},previous:function(a){this.move("prev",".ui-menu-item:last",a)},first:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},last:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},move:function(a,b,c){if(this.active){a=this.active[a+"All"](".ui-menu-item").eq(0);
+a.length?this.activate(c,a):this.activate(c,this.element.children(b))}else this.activate(c,this.element.children(b))},nextPage:function(a){if(this.hasScroll())if(!this.active||this.last())this.activate(a,this.element.children(":first"));else{var b=this.active.offset().top,c=this.element.height(),d=this.element.children("li").filter(function(){var f=e(this).offset().top-b-c+e(this).height();return f<10&&f>-10});d.length||(d=this.element.children(":last"));this.activate(a,d)}else this.activate(a,this.element.children(!this.active||
+this.last()?":first":":last"))},previousPage:function(a){if(this.hasScroll())if(!this.active||this.first())this.activate(a,this.element.children(":last"));else{var b=this.active.offset().top,c=this.element.height();result=this.element.children("li").filter(function(){var d=e(this).offset().top-b+c-e(this).height();return d<10&&d>-10});result.length||(result=this.element.children(":first"));this.activate(a,result)}else this.activate(a,this.element.children(!this.active||this.first()?":last":":first"))},
+hasScroll:function(){return this.element.height()<this.element.attr("scrollHeight")},select:function(a){this._trigger("selected",a,{item:this.active})}})})(jQuery);
+;/*
+ * jQuery UI Button 1.8.5
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Button
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ */
+(function(a){var g,i=function(b){a(":ui-button",b.target.form).each(function(){var c=a(this).data("button");setTimeout(function(){c.refresh()},1)})},h=function(b){var c=b.name,d=b.form,e=a([]);if(c)e=d?a(d).find("[name='"+c+"']"):a("[name='"+c+"']",b.ownerDocument).filter(function(){return!this.form});return e};a.widget("ui.button",{options:{disabled:null,text:true,label:null,icons:{primary:null,secondary:null}},_create:function(){this.element.closest("form").unbind("reset.button").bind("reset.button",
+i);if(typeof this.options.disabled!=="boolean")this.options.disabled=this.element.attr("disabled");this._determineButtonType();this.hasTitle=!!this.buttonElement.attr("title");var b=this,c=this.options,d=this.type==="checkbox"||this.type==="radio",e="ui-state-hover"+(!d?" ui-state-active":"");if(c.label===null)c.label=this.buttonElement.html();if(this.element.is(":disabled"))c.disabled=true;this.buttonElement.addClass("ui-button ui-widget ui-state-default ui-corner-all").attr("role","button").bind("mouseenter.button",
+function(){if(!c.disabled){a(this).addClass("ui-state-hover");this===g&&a(this).addClass("ui-state-active")}}).bind("mouseleave.button",function(){c.disabled||a(this).removeClass(e)}).bind("focus.button",function(){a(this).addClass("ui-state-focus")}).bind("blur.button",function(){a(this).removeClass("ui-state-focus")});d&&this.element.bind("change.button",function(){b.refresh()});if(this.type==="checkbox")this.buttonElement.bind("click.button",function(){if(c.disabled)return false;a(this).toggleClass("ui-state-active");
+b.buttonElement.attr("aria-pressed",b.element[0].checked)});else if(this.type==="radio")this.buttonElement.bind("click.button",function(){if(c.disabled)return false;a(this).addClass("ui-state-active");b.buttonElement.attr("aria-pressed",true);var f=b.element[0];h(f).not(f).map(function(){return a(this).button("widget")[0]}).removeClass("ui-state-active").attr("aria-pressed",false)});else{this.buttonElement.bind("mousedown.button",function(){if(c.disabled)return false;a(this).addClass("ui-state-active");
+g=this;a(document).one("mouseup",function(){g=null})}).bind("mouseup.button",function(){if(c.disabled)return false;a(this).removeClass("ui-state-active")}).bind("keydown.button",function(f){if(c.disabled)return false;if(f.keyCode==a.ui.keyCode.SPACE||f.keyCode==a.ui.keyCode.ENTER)a(this).addClass("ui-state-active")}).bind("keyup.button",function(){a(this).removeClass("ui-state-active")});this.buttonElement.is("a")&&this.buttonElement.keyup(function(f){f.keyCode===a.ui.keyCode.SPACE&&a(this).click()})}this._setOption("disabled",
+c.disabled)},_determineButtonType:function(){this.type=this.element.is(":checkbox")?"checkbox":this.element.is(":radio")?"radio":this.element.is("input")?"input":"button";if(this.type==="checkbox"||this.type==="radio"){this.buttonElement=this.element.parents().last().find("label[for="+this.element.attr("id")+"]");this.element.addClass("ui-helper-hidden-accessible");var b=this.element.is(":checked");b&&this.buttonElement.addClass("ui-state-active");this.buttonElement.attr("aria-pressed",b)}else this.buttonElement=
+this.element},widget:function(){return this.buttonElement},destroy:function(){this.element.removeClass("ui-helper-hidden-accessible");this.buttonElement.removeClass("ui-button ui-widget ui-state-default ui-corner-all ui-state-hover ui-state-active  ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only").removeAttr("role").removeAttr("aria-pressed").html(this.buttonElement.find(".ui-button-text").html());this.hasTitle||
+this.buttonElement.removeAttr("title");a.Widget.prototype.destroy.call(this)},_setOption:function(b,c){a.Widget.prototype._setOption.apply(this,arguments);if(b==="disabled")c?this.element.attr("disabled",true):this.element.removeAttr("disabled");this._resetButton()},refresh:function(){var b=this.element.is(":disabled");b!==this.options.disabled&&this._setOption("disabled",b);if(this.type==="radio")h(this.element[0]).each(function(){a(this).is(":checked")?a(this).button("widget").addClass("ui-state-active").attr("aria-pressed",
+true):a(this).button("widget").removeClass("ui-state-active").attr("aria-pressed",false)});else if(this.type==="checkbox")this.element.is(":checked")?this.buttonElement.addClass("ui-state-active").attr("aria-pressed",true):this.buttonElement.removeClass("ui-state-active").attr("aria-pressed",false)},_resetButton:function(){if(this.type==="input")this.options.label&&this.element.val(this.options.label);else{var b=this.buttonElement.removeClass("ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only"),
+c=a("<span></span>").addClass("ui-button-text").html(this.options.label).appendTo(b.empty()).text(),d=this.options.icons,e=d.primary&&d.secondary;if(d.primary||d.secondary){b.addClass("ui-button-text-icon"+(e?"s":d.primary?"-primary":"-secondary"));d.primary&&b.prepend("<span class='ui-button-icon-primary ui-icon "+d.primary+"'></span>");d.secondary&&b.append("<span class='ui-button-icon-secondary ui-icon "+d.secondary+"'></span>");if(!this.options.text){b.addClass(e?"ui-button-icons-only":"ui-button-icon-only").removeClass("ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary");
+this.hasTitle||b.attr("title",c)}}else b.addClass("ui-button-text-only")}}});a.widget("ui.buttonset",{_create:function(){this.element.addClass("ui-buttonset");this._init()},_init:function(){this.refresh()},_setOption:function(b,c){b==="disabled"&&this.buttons.button("option",b,c);a.Widget.prototype._setOption.apply(this,arguments)},refresh:function(){this.buttons=this.element.find(":button, :submit, :reset, :checkbox, :radio, a, :data(button)").filter(":ui-button").button("refresh").end().not(":ui-button").button().end().map(function(){return a(this).button("widget")[0]}).removeClass("ui-corner-all ui-corner-left ui-corner-right").filter(":visible").filter(":first").addClass("ui-corner-left").end().filter(":last").addClass("ui-corner-right").end().end().end()},
+destroy:function(){this.element.removeClass("ui-buttonset");this.buttons.map(function(){return a(this).button("widget")[0]}).removeClass("ui-corner-left ui-corner-right").end().button("destroy");a.Widget.prototype.destroy.call(this)}})})(jQuery);
+;/*
+ * jQuery UI Dialog 1.8.5
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Dialog
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ *  jquery.ui.button.js
+ *	jquery.ui.draggable.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.position.js
+ *	jquery.ui.resizable.js
+ */
+(function(c,j){c.widget("ui.dialog",{options:{autoOpen:true,buttons:{},closeOnEscape:true,closeText:"close",dialogClass:"",draggable:true,hide:null,height:"auto",maxHeight:false,maxWidth:false,minHeight:150,minWidth:150,modal:false,position:{my:"center",at:"center",of:window,collision:"fit",using:function(a){var b=c(this).css(a).offset().top;b<0&&c(this).css("top",a.top-b)}},resizable:true,show:null,stack:true,title:"",width:300,zIndex:1E3},_create:function(){this.originalTitle=this.element.attr("title");
+if(typeof this.originalTitle!=="string")this.originalTitle="";this.options.title=this.options.title||this.originalTitle;var a=this,b=a.options,d=b.title||"&#160;",f=c.ui.dialog.getTitleId(a.element),g=(a.uiDialog=c("<div></div>")).appendTo(document.body).hide().addClass("ui-dialog ui-widget ui-widget-content ui-corner-all "+b.dialogClass).css({zIndex:b.zIndex}).attr("tabIndex",-1).css("outline",0).keydown(function(i){if(b.closeOnEscape&&i.keyCode&&i.keyCode===c.ui.keyCode.ESCAPE){a.close(i);i.preventDefault()}}).attr({role:"dialog",
+"aria-labelledby":f}).mousedown(function(i){a.moveToTop(false,i)});a.element.show().removeAttr("title").addClass("ui-dialog-content ui-widget-content").appendTo(g);var e=(a.uiDialogTitlebar=c("<div></div>")).addClass("ui-dialog-titlebar ui-widget-header ui-corner-all ui-helper-clearfix").prependTo(g),h=c('<a href="#"></a>').addClass("ui-dialog-titlebar-close ui-corner-all").attr("role","button").hover(function(){h.addClass("ui-state-hover")},function(){h.removeClass("ui-state-hover")}).focus(function(){h.addClass("ui-state-focus")}).blur(function(){h.removeClass("ui-state-focus")}).click(function(i){a.close(i);
+return false}).appendTo(e);(a.uiDialogTitlebarCloseText=c("<span></span>")).addClass("ui-icon ui-icon-closethick").text(b.closeText).appendTo(h);c("<span></span>").addClass("ui-dialog-title").attr("id",f).html(d).prependTo(e);if(c.isFunction(b.beforeclose)&&!c.isFunction(b.beforeClose))b.beforeClose=b.beforeclose;e.find("*").add(e).disableSelection();b.draggable&&c.fn.draggable&&a._makeDraggable();b.resizable&&c.fn.resizable&&a._makeResizable();a._createButtons(b.buttons);a._isOpen=false;c.fn.bgiframe&&
+g.bgiframe()},_init:function(){this.options.autoOpen&&this.open()},destroy:function(){var a=this;a.overlay&&a.overlay.destroy();a.uiDialog.hide();a.element.unbind(".dialog").removeData("dialog").removeClass("ui-dialog-content ui-widget-content").hide().appendTo("body");a.uiDialog.remove();a.originalTitle&&a.element.attr("title",a.originalTitle);return a},widget:function(){return this.uiDialog},close:function(a){var b=this,d;if(false!==b._trigger("beforeClose",a)){b.overlay&&b.overlay.destroy();b.uiDialog.unbind("keypress.ui-dialog");
+b._isOpen=false;if(b.options.hide)b.uiDialog.hide(b.options.hide,function(){b._trigger("close",a)});else{b.uiDialog.hide();b._trigger("close",a)}c.ui.dialog.overlay.resize();if(b.options.modal){d=0;c(".ui-dialog").each(function(){if(this!==b.uiDialog[0])d=Math.max(d,c(this).css("z-index"))});c.ui.dialog.maxZ=d}return b}},isOpen:function(){return this._isOpen},moveToTop:function(a,b){var d=this,f=d.options;if(f.modal&&!a||!f.stack&&!f.modal)return d._trigger("focus",b);if(f.zIndex>c.ui.dialog.maxZ)c.ui.dialog.maxZ=
+f.zIndex;if(d.overlay){c.ui.dialog.maxZ+=1;d.overlay.$el.css("z-index",c.ui.dialog.overlay.maxZ=c.ui.dialog.maxZ)}a={scrollTop:d.element.attr("scrollTop"),scrollLeft:d.element.attr("scrollLeft")};c.ui.dialog.maxZ+=1;d.uiDialog.css("z-index",c.ui.dialog.maxZ);d.element.attr(a);d._trigger("focus",b);return d},open:function(){if(!this._isOpen){var a=this,b=a.options,d=a.uiDialog;a.overlay=b.modal?new c.ui.dialog.overlay(a):null;d.next().length&&d.appendTo("body");a._size();a._position(b.position);d.show(b.show);
+a.moveToTop(true);b.modal&&d.bind("keypress.ui-dialog",function(f){if(f.keyCode===c.ui.keyCode.TAB){var g=c(":tabbable",this),e=g.filter(":first");g=g.filter(":last");if(f.target===g[0]&&!f.shiftKey){e.focus(1);return false}else if(f.target===e[0]&&f.shiftKey){g.focus(1);return false}}});c(a.element.find(":tabbable").get().concat(d.find(".ui-dialog-buttonpane :tabbable").get().concat(d.get()))).eq(0).focus();a._isOpen=true;a._trigger("open");return a}},_createButtons:function(a){var b=this,d=false,
+f=c("<div></div>").addClass("ui-dialog-buttonpane ui-widget-content ui-helper-clearfix"),g=c("<div></div>").addClass("ui-dialog-buttonset").appendTo(f);b.uiDialog.find(".ui-dialog-buttonpane").remove();typeof a==="object"&&a!==null&&c.each(a,function(){return!(d=true)});if(d){c.each(a,function(e,h){h=c.isFunction(h)?{click:h,text:e}:h;e=c("<button></button>",h).unbind("click").click(function(){h.click.apply(b.element[0],arguments)}).appendTo(g);c.fn.button&&e.button()});f.appendTo(b.uiDialog)}},_makeDraggable:function(){function a(e){return{position:e.position,
+offset:e.offset}}var b=this,d=b.options,f=c(document),g;b.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close",handle:".ui-dialog-titlebar",containment:"document",start:function(e,h){g=d.height==="auto"?"auto":c(this).height();c(this).height(c(this).height()).addClass("ui-dialog-dragging");b._trigger("dragStart",e,a(h))},drag:function(e,h){b._trigger("drag",e,a(h))},stop:function(e,h){d.position=[h.position.left-f.scrollLeft(),h.position.top-f.scrollTop()];c(this).removeClass("ui-dialog-dragging").height(g);
+b._trigger("dragStop",e,a(h));c.ui.dialog.overlay.resize()}})},_makeResizable:function(a){function b(e){return{originalPosition:e.originalPosition,originalSize:e.originalSize,position:e.position,size:e.size}}a=a===j?this.options.resizable:a;var d=this,f=d.options,g=d.uiDialog.css("position");a=typeof a==="string"?a:"n,e,s,w,se,sw,ne,nw";d.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:d.element,maxWidth:f.maxWidth,maxHeight:f.maxHeight,minWidth:f.minWidth,minHeight:d._minHeight(),
+handles:a,start:function(e,h){c(this).addClass("ui-dialog-resizing");d._trigger("resizeStart",e,b(h))},resize:function(e,h){d._trigger("resize",e,b(h))},stop:function(e,h){c(this).removeClass("ui-dialog-resizing");f.height=c(this).height();f.width=c(this).width();d._trigger("resizeStop",e,b(h));c.ui.dialog.overlay.resize()}}).css("position",g).find(".ui-resizable-se").addClass("ui-icon ui-icon-grip-diagonal-se")},_minHeight:function(){var a=this.options;return a.height==="auto"?a.minHeight:Math.min(a.minHeight,
+a.height)},_position:function(a){var b=[],d=[0,0],f;if(a){if(typeof a==="string"||typeof a==="object"&&"0"in a){b=a.split?a.split(" "):[a[0],a[1]];if(b.length===1)b[1]=b[0];c.each(["left","top"],function(g,e){if(+b[g]===b[g]){d[g]=b[g];b[g]=e}});a={my:b.join(" "),at:b.join(" "),offset:d.join(" ")}}a=c.extend({},c.ui.dialog.prototype.options.position,a)}else a=c.ui.dialog.prototype.options.position;(f=this.uiDialog.is(":visible"))||this.uiDialog.show();this.uiDialog.css({top:0,left:0}).position(a);
+f||this.uiDialog.hide()},_setOption:function(a,b){var d=this,f=d.uiDialog,g=f.is(":data(resizable)"),e=false;switch(a){case "beforeclose":a="beforeClose";break;case "buttons":d._createButtons(b);e=true;break;case "closeText":d.uiDialogTitlebarCloseText.text(""+b);break;case "dialogClass":f.removeClass(d.options.dialogClass).addClass("ui-dialog ui-widget ui-widget-content ui-corner-all "+b);break;case "disabled":b?f.addClass("ui-dialog-disabled"):f.removeClass("ui-dialog-disabled");break;case "draggable":b?
+d._makeDraggable():f.draggable("destroy");break;case "height":e=true;break;case "maxHeight":g&&f.resizable("option","maxHeight",b);e=true;break;case "maxWidth":g&&f.resizable("option","maxWidth",b);e=true;break;case "minHeight":g&&f.resizable("option","minHeight",b);e=true;break;case "minWidth":g&&f.resizable("option","minWidth",b);e=true;break;case "position":d._position(b);break;case "resizable":g&&!b&&f.resizable("destroy");g&&typeof b==="string"&&f.resizable("option","handles",b);!g&&b!==false&&
+d._makeResizable(b);break;case "title":c(".ui-dialog-title",d.uiDialogTitlebar).html(""+(b||"&#160;"));break;case "width":e=true;break}c.Widget.prototype._setOption.apply(d,arguments);e&&d._size()},_size:function(){var a=this.options,b;this.element.css({width:"auto",minHeight:0,height:0});if(a.minWidth>a.width)a.width=a.minWidth;b=this.uiDialog.css({height:"auto",width:a.width}).height();this.element.css(a.height==="auto"?{minHeight:Math.max(a.minHeight-b,0),height:c.support.minHeight?"auto":Math.max(a.minHeight-
+b,0)}:{minHeight:0,height:Math.max(a.height-b,0)}).show();this.uiDialog.is(":data(resizable)")&&this.uiDialog.resizable("option","minHeight",this._minHeight())}});c.extend(c.ui.dialog,{version:"1.8.5",uuid:0,maxZ:0,getTitleId:function(a){a=a.attr("id");if(!a){this.uuid+=1;a=this.uuid}return"ui-dialog-title-"+a},overlay:function(a){this.$el=c.ui.dialog.overlay.create(a)}});c.extend(c.ui.dialog.overlay,{instances:[],oldInstances:[],maxZ:0,events:c.map("focus,mousedown,mouseup,keydown,keypress,click".split(","),
+function(a){return a+".dialog-overlay"}).join(" "),create:function(a){if(this.instances.length===0){setTimeout(function(){c.ui.dialog.overlay.instances.length&&c(document).bind(c.ui.dialog.overlay.events,function(d){if(c(d.target).zIndex()<c.ui.dialog.overlay.maxZ)return false})},1);c(document).bind("keydown.dialog-overlay",function(d){if(a.options.closeOnEscape&&d.keyCode&&d.keyCode===c.ui.keyCode.ESCAPE){a.close(d);d.preventDefault()}});c(window).bind("resize.dialog-overlay",c.ui.dialog.overlay.resize)}var b=
+(this.oldInstances.pop()||c("<div></div>").addClass("ui-widget-overlay")).appendTo(document.body).css({width:this.width(),height:this.height()});c.fn.bgiframe&&b.bgiframe();this.instances.push(b);return b},destroy:function(a){this.oldInstances.push(this.instances.splice(c.inArray(a,this.instances),1)[0]);this.instances.length===0&&c([document,window]).unbind(".dialog-overlay");a.remove();var b=0;c.each(this.instances,function(){b=Math.max(b,this.css("z-index"))});this.maxZ=b},height:function(){var a,
+b;if(c.browser.msie&&c.browser.version<7){a=Math.max(document.documentElement.scrollHeight,document.body.scrollHeight);b=Math.max(document.documentElement.offsetHeight,document.body.offsetHeight);return a<b?c(window).height()+"px":a+"px"}else return c(document).height()+"px"},width:function(){var a,b;if(c.browser.msie&&c.browser.version<7){a=Math.max(document.documentElement.scrollWidth,document.body.scrollWidth);b=Math.max(document.documentElement.offsetWidth,document.body.offsetWidth);return a<
+b?c(window).width()+"px":a+"px"}else return c(document).width()+"px"},resize:function(){var a=c([]);c.each(c.ui.dialog.overlay.instances,function(){a=a.add(this)});a.css({width:0,height:0}).css({width:c.ui.dialog.overlay.width(),height:c.ui.dialog.overlay.height()})}});c.extend(c.ui.dialog.overlay.prototype,{destroy:function(){c.ui.dialog.overlay.destroy(this.$el)}})})(jQuery);
+;/*
+ * jQuery UI Slider 1.8.5
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Slider
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+(function(d){d.widget("ui.slider",d.ui.mouse,{widgetEventPrefix:"slide",options:{animate:false,distance:0,max:100,min:0,orientation:"horizontal",range:false,step:1,value:0,values:null},_create:function(){var a=this,b=this.options;this._mouseSliding=this._keySliding=false;this._animateOff=true;this._handleIndex=null;this._detectOrientation();this._mouseInit();this.element.addClass("ui-slider ui-slider-"+this.orientation+" ui-widget ui-widget-content ui-corner-all");b.disabled&&this.element.addClass("ui-slider-disabled ui-disabled");
+this.range=d([]);if(b.range){if(b.range===true){this.range=d("<div></div>");if(!b.values)b.values=[this._valueMin(),this._valueMin()];if(b.values.length&&b.values.length!==2)b.values=[b.values[0],b.values[0]]}else this.range=d("<div></div>");this.range.appendTo(this.element).addClass("ui-slider-range");if(b.range==="min"||b.range==="max")this.range.addClass("ui-slider-range-"+b.range);this.range.addClass("ui-widget-header")}d(".ui-slider-handle",this.element).length===0&&d("<a href='#'></a>").appendTo(this.element).addClass("ui-slider-handle");
+if(b.values&&b.values.length)for(;d(".ui-slider-handle",this.element).length<b.values.length;)d("<a href='#'></a>").appendTo(this.element).addClass("ui-slider-handle");this.handles=d(".ui-slider-handle",this.element).addClass("ui-state-default ui-corner-all");this.handle=this.handles.eq(0);this.handles.add(this.range).filter("a").click(function(c){c.preventDefault()}).hover(function(){b.disabled||d(this).addClass("ui-state-hover")},function(){d(this).removeClass("ui-state-hover")}).focus(function(){if(b.disabled)d(this).blur();
+else{d(".ui-slider .ui-state-focus").removeClass("ui-state-focus");d(this).addClass("ui-state-focus")}}).blur(function(){d(this).removeClass("ui-state-focus")});this.handles.each(function(c){d(this).data("index.ui-slider-handle",c)});this.handles.keydown(function(c){var e=true,f=d(this).data("index.ui-slider-handle"),h,g,i;if(!a.options.disabled){switch(c.keyCode){case d.ui.keyCode.HOME:case d.ui.keyCode.END:case d.ui.keyCode.PAGE_UP:case d.ui.keyCode.PAGE_DOWN:case d.ui.keyCode.UP:case d.ui.keyCode.RIGHT:case d.ui.keyCode.DOWN:case d.ui.keyCode.LEFT:e=
+false;if(!a._keySliding){a._keySliding=true;d(this).addClass("ui-state-active");h=a._start(c,f);if(h===false)return}break}i=a.options.step;h=a.options.values&&a.options.values.length?(g=a.values(f)):(g=a.value());switch(c.keyCode){case d.ui.keyCode.HOME:g=a._valueMin();break;case d.ui.keyCode.END:g=a._valueMax();break;case d.ui.keyCode.PAGE_UP:g=a._trimAlignValue(h+(a._valueMax()-a._valueMin())/5);break;case d.ui.keyCode.PAGE_DOWN:g=a._trimAlignValue(h-(a._valueMax()-a._valueMin())/5);break;case d.ui.keyCode.UP:case d.ui.keyCode.RIGHT:if(h===
+a._valueMax())return;g=a._trimAlignValue(h+i);break;case d.ui.keyCode.DOWN:case d.ui.keyCode.LEFT:if(h===a._valueMin())return;g=a._trimAlignValue(h-i);break}a._slide(c,f,g);return e}}).keyup(function(c){var e=d(this).data("index.ui-slider-handle");if(a._keySliding){a._keySliding=false;a._stop(c,e);a._change(c,e);d(this).removeClass("ui-state-active")}});this._refreshValue();this._animateOff=false},destroy:function(){this.handles.remove();this.range.remove();this.element.removeClass("ui-slider ui-slider-horizontal ui-slider-vertical ui-slider-disabled ui-widget ui-widget-content ui-corner-all").removeData("slider").unbind(".slider");
+this._mouseDestroy();return this},_mouseCapture:function(a){var b=this.options,c,e,f,h,g;if(b.disabled)return false;this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()};this.elementOffset=this.element.offset();c=this._normValueFromMouse({x:a.pageX,y:a.pageY});e=this._valueMax()-this._valueMin()+1;h=this;this.handles.each(function(i){var j=Math.abs(c-h.values(i));if(e>j){e=j;f=d(this);g=i}});if(b.range===true&&this.values(1)===b.min){g+=1;f=d(this.handles[g])}if(this._start(a,
+g)===false)return false;this._mouseSliding=true;h._handleIndex=g;f.addClass("ui-state-active").focus();b=f.offset();this._clickOffset=!d(a.target).parents().andSelf().is(".ui-slider-handle")?{left:0,top:0}:{left:a.pageX-b.left-f.width()/2,top:a.pageY-b.top-f.height()/2-(parseInt(f.css("borderTopWidth"),10)||0)-(parseInt(f.css("borderBottomWidth"),10)||0)+(parseInt(f.css("marginTop"),10)||0)};this._slide(a,g,c);return this._animateOff=true},_mouseStart:function(){return true},_mouseDrag:function(a){var b=
+this._normValueFromMouse({x:a.pageX,y:a.pageY});this._slide(a,this._handleIndex,b);return false},_mouseStop:function(a){this.handles.removeClass("ui-state-active");this._mouseSliding=false;this._stop(a,this._handleIndex);this._change(a,this._handleIndex);this._clickOffset=this._handleIndex=null;return this._animateOff=false},_detectOrientation:function(){this.orientation=this.options.orientation==="vertical"?"vertical":"horizontal"},_normValueFromMouse:function(a){var b;if(this.orientation==="horizontal"){b=
+this.elementSize.width;a=a.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)}else{b=this.elementSize.height;a=a.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)}b=a/b;if(b>1)b=1;if(b<0)b=0;if(this.orientation==="vertical")b=1-b;a=this._valueMax()-this._valueMin();return this._trimAlignValue(this._valueMin()+b*a)},_start:function(a,b){var c={handle:this.handles[b],value:this.value()};if(this.options.values&&this.options.values.length){c.value=this.values(b);
+c.values=this.values()}return this._trigger("start",a,c)},_slide:function(a,b,c){var e;if(this.options.values&&this.options.values.length){e=this.values(b?0:1);if(this.options.values.length===2&&this.options.range===true&&(b===0&&c>e||b===1&&c<e))c=e;if(c!==this.values(b)){e=this.values();e[b]=c;a=this._trigger("slide",a,{handle:this.handles[b],value:c,values:e});this.values(b?0:1);a!==false&&this.values(b,c,true)}}else if(c!==this.value()){a=this._trigger("slide",a,{handle:this.handles[b],value:c});
+a!==false&&this.value(c)}},_stop:function(a,b){var c={handle:this.handles[b],value:this.value()};if(this.options.values&&this.options.values.length){c.value=this.values(b);c.values=this.values()}this._trigger("stop",a,c)},_change:function(a,b){if(!this._keySliding&&!this._mouseSliding){var c={handle:this.handles[b],value:this.value()};if(this.options.values&&this.options.values.length){c.value=this.values(b);c.values=this.values()}this._trigger("change",a,c)}},value:function(a){if(arguments.length){this.options.value=
+this._trimAlignValue(a);this._refreshValue();this._change(null,0)}return this._value()},values:function(a,b){var c,e,f;if(arguments.length>1){this.options.values[a]=this._trimAlignValue(b);this._refreshValue();this._change(null,a)}if(arguments.length)if(d.isArray(arguments[0])){c=this.options.values;e=arguments[0];for(f=0;f<c.length;f+=1){c[f]=this._trimAlignValue(e[f]);this._change(null,f)}this._refreshValue()}else return this.options.values&&this.options.values.length?this._values(a):this.value();
+else return this._values()},_setOption:function(a,b){var c,e=0;if(d.isArray(this.options.values))e=this.options.values.length;d.Widget.prototype._setOption.apply(this,arguments);switch(a){case "disabled":if(b){this.handles.filter(".ui-state-focus").blur();this.handles.removeClass("ui-state-hover");this.handles.attr("disabled","disabled");this.element.addClass("ui-disabled")}else{this.handles.removeAttr("disabled");this.element.removeClass("ui-disabled")}break;case "orientation":this._detectOrientation();
+this.element.removeClass("ui-slider-horizontal ui-slider-vertical").addClass("ui-slider-"+this.orientation);this._refreshValue();break;case "value":this._animateOff=true;this._refreshValue();this._change(null,0);this._animateOff=false;break;case "values":this._animateOff=true;this._refreshValue();for(c=0;c<e;c+=1)this._change(null,c);this._animateOff=false;break}},_value:function(){var a=this.options.value;return a=this._trimAlignValue(a)},_values:function(a){var b,c;if(arguments.length){b=this.options.values[a];
+return b=this._trimAlignValue(b)}else{b=this.options.values.slice();for(c=0;c<b.length;c+=1)b[c]=this._trimAlignValue(b[c]);return b}},_trimAlignValue:function(a){if(a<this._valueMin())return this._valueMin();if(a>this._valueMax())return this._valueMax();var b=this.options.step>0?this.options.step:1,c=a%b;a=a-c;if(Math.abs(c)*2>=b)a+=c>0?b:-b;return parseFloat(a.toFixed(5))},_valueMin:function(){return this.options.min},_valueMax:function(){return this.options.max},_refreshValue:function(){var a=
+this.options.range,b=this.options,c=this,e=!this._animateOff?b.animate:false,f,h={},g,i,j,l;if(this.options.values&&this.options.values.length)this.handles.each(function(k){f=(c.values(k)-c._valueMin())/(c._valueMax()-c._valueMin())*100;h[c.orientation==="horizontal"?"left":"bottom"]=f+"%";d(this).stop(1,1)[e?"animate":"css"](h,b.animate);if(c.options.range===true)if(c.orientation==="horizontal"){if(k===0)c.range.stop(1,1)[e?"animate":"css"]({left:f+"%"},b.animate);if(k===1)c.range[e?"animate":"css"]({width:f-
+g+"%"},{queue:false,duration:b.animate})}else{if(k===0)c.range.stop(1,1)[e?"animate":"css"]({bottom:f+"%"},b.animate);if(k===1)c.range[e?"animate":"css"]({height:f-g+"%"},{queue:false,duration:b.animate})}g=f});else{i=this.value();j=this._valueMin();l=this._valueMax();f=l!==j?(i-j)/(l-j)*100:0;h[c.orientation==="horizontal"?"left":"bottom"]=f+"%";this.handle.stop(1,1)[e?"animate":"css"](h,b.animate);if(a==="min"&&this.orientation==="horizontal")this.range.stop(1,1)[e?"animate":"css"]({width:f+"%"},
+b.animate);if(a==="max"&&this.orientation==="horizontal")this.range[e?"animate":"css"]({width:100-f+"%"},{queue:false,duration:b.animate});if(a==="min"&&this.orientation==="vertical")this.range.stop(1,1)[e?"animate":"css"]({height:f+"%"},b.animate);if(a==="max"&&this.orientation==="vertical")this.range[e?"animate":"css"]({height:100-f+"%"},{queue:false,duration:b.animate})}}});d.extend(d.ui.slider,{version:"1.8.5"})})(jQuery);
+;/*
+ * jQuery UI Tabs 1.8.5
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Tabs
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ */
+(function(d,p){function u(){return++v}function w(){return++x}var v=0,x=0;d.widget("ui.tabs",{options:{add:null,ajaxOptions:null,cache:false,cookie:null,collapsible:false,disable:null,disabled:[],enable:null,event:"click",fx:null,idPrefix:"ui-tabs-",load:null,panelTemplate:"<div></div>",remove:null,select:null,show:null,spinner:"<em>Loading&#8230;</em>",tabTemplate:"<li><a href='#{href}'><span>#{label}</span></a></li>"},_create:function(){this._tabify(true)},_setOption:function(a,e){if(a=="selected")this.options.collapsible&&
+e==this.options.selected||this.select(e);else{this.options[a]=e;this._tabify()}},_tabId:function(a){return a.title&&a.title.replace(/\s/g,"_").replace(/[^\w\u00c0-\uFFFF-]/g,"")||this.options.idPrefix+u()},_sanitizeSelector:function(a){return a.replace(/:/g,"\\:")},_cookie:function(){var a=this.cookie||(this.cookie=this.options.cookie.name||"ui-tabs-"+w());return d.cookie.apply(null,[a].concat(d.makeArray(arguments)))},_ui:function(a,e){return{tab:a,panel:e,index:this.anchors.index(a)}},_cleanup:function(){this.lis.filter(".ui-state-processing").removeClass("ui-state-processing").find("span:data(label.tabs)").each(function(){var a=
+d(this);a.html(a.data("label.tabs")).removeData("label.tabs")})},_tabify:function(a){function e(g,f){g.css("display","");!d.support.opacity&&f.opacity&&g[0].style.removeAttribute("filter")}var b=this,c=this.options,h=/^#.+/;this.list=this.element.find("ol,ul").eq(0);this.lis=d(" > li:has(a[href])",this.list);this.anchors=this.lis.map(function(){return d("a",this)[0]});this.panels=d([]);this.anchors.each(function(g,f){var i=d(f).attr("href"),l=i.split("#")[0],q;if(l&&(l===location.toString().split("#")[0]||
+(q=d("base")[0])&&l===q.href)){i=f.hash;f.href=i}if(h.test(i))b.panels=b.panels.add(b._sanitizeSelector(i));else if(i&&i!=="#"){d.data(f,"href.tabs",i);d.data(f,"load.tabs",i.replace(/#.*$/,""));i=b._tabId(f);f.href="#"+i;f=d("#"+i);if(!f.length){f=d(c.panelTemplate).attr("id",i).addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").insertAfter(b.panels[g-1]||b.list);f.data("destroy.tabs",true)}b.panels=b.panels.add(f)}else c.disabled.push(g)});if(a){this.element.addClass("ui-tabs ui-widget ui-widget-content ui-corner-all");
+this.list.addClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all");this.lis.addClass("ui-state-default ui-corner-top");this.panels.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom");if(c.selected===p){location.hash&&this.anchors.each(function(g,f){if(f.hash==location.hash){c.selected=g;return false}});if(typeof c.selected!=="number"&&c.cookie)c.selected=parseInt(b._cookie(),10);if(typeof c.selected!=="number"&&this.lis.filter(".ui-tabs-selected").length)c.selected=
+this.lis.index(this.lis.filter(".ui-tabs-selected"));c.selected=c.selected||(this.lis.length?0:-1)}else if(c.selected===null)c.selected=-1;c.selected=c.selected>=0&&this.anchors[c.selected]||c.selected<0?c.selected:0;c.disabled=d.unique(c.disabled.concat(d.map(this.lis.filter(".ui-state-disabled"),function(g){return b.lis.index(g)}))).sort();d.inArray(c.selected,c.disabled)!=-1&&c.disabled.splice(d.inArray(c.selected,c.disabled),1);this.panels.addClass("ui-tabs-hide");this.lis.removeClass("ui-tabs-selected ui-state-active");
+if(c.selected>=0&&this.anchors.length){this.panels.eq(c.selected).removeClass("ui-tabs-hide");this.lis.eq(c.selected).addClass("ui-tabs-selected ui-state-active");b.element.queue("tabs",function(){b._trigger("show",null,b._ui(b.anchors[c.selected],b.panels[c.selected]))});this.load(c.selected)}d(window).bind("unload",function(){b.lis.add(b.anchors).unbind(".tabs");b.lis=b.anchors=b.panels=null})}else c.selected=this.lis.index(this.lis.filter(".ui-tabs-selected"));this.element[c.collapsible?"addClass":
+"removeClass"]("ui-tabs-collapsible");c.cookie&&this._cookie(c.selected,c.cookie);a=0;for(var j;j=this.lis[a];a++)d(j)[d.inArray(a,c.disabled)!=-1&&!d(j).hasClass("ui-tabs-selected")?"addClass":"removeClass"]("ui-state-disabled");c.cache===false&&this.anchors.removeData("cache.tabs");this.lis.add(this.anchors).unbind(".tabs");if(c.event!=="mouseover"){var k=function(g,f){f.is(":not(.ui-state-disabled)")&&f.addClass("ui-state-"+g)},n=function(g,f){f.removeClass("ui-state-"+g)};this.lis.bind("mouseover.tabs",
+function(){k("hover",d(this))});this.lis.bind("mouseout.tabs",function(){n("hover",d(this))});this.anchors.bind("focus.tabs",function(){k("focus",d(this).closest("li"))});this.anchors.bind("blur.tabs",function(){n("focus",d(this).closest("li"))})}var m,o;if(c.fx)if(d.isArray(c.fx)){m=c.fx[0];o=c.fx[1]}else m=o=c.fx;var r=o?function(g,f){d(g).closest("li").addClass("ui-tabs-selected ui-state-active");f.hide().removeClass("ui-tabs-hide").animate(o,o.duration||"normal",function(){e(f,o);b._trigger("show",
+null,b._ui(g,f[0]))})}:function(g,f){d(g).closest("li").addClass("ui-tabs-selected ui-state-active");f.removeClass("ui-tabs-hide");b._trigger("show",null,b._ui(g,f[0]))},s=m?function(g,f){f.animate(m,m.duration||"normal",function(){b.lis.removeClass("ui-tabs-selected ui-state-active");f.addClass("ui-tabs-hide");e(f,m);b.element.dequeue("tabs")})}:function(g,f){b.lis.removeClass("ui-tabs-selected ui-state-active");f.addClass("ui-tabs-hide");b.element.dequeue("tabs")};this.anchors.bind(c.event+".tabs",
+function(){var g=this,f=d(g).closest("li"),i=b.panels.filter(":not(.ui-tabs-hide)"),l=d(b._sanitizeSelector(g.hash));if(f.hasClass("ui-tabs-selected")&&!c.collapsible||f.hasClass("ui-state-disabled")||f.hasClass("ui-state-processing")||b.panels.filter(":animated").length||b._trigger("select",null,b._ui(this,l[0]))===false){this.blur();return false}c.selected=b.anchors.index(this);b.abort();if(c.collapsible)if(f.hasClass("ui-tabs-selected")){c.selected=-1;c.cookie&&b._cookie(c.selected,c.cookie);b.element.queue("tabs",
+function(){s(g,i)}).dequeue("tabs");this.blur();return false}else if(!i.length){c.cookie&&b._cookie(c.selected,c.cookie);b.element.queue("tabs",function(){r(g,l)});b.load(b.anchors.index(this));this.blur();return false}c.cookie&&b._cookie(c.selected,c.cookie);if(l.length){i.length&&b.element.queue("tabs",function(){s(g,i)});b.element.queue("tabs",function(){r(g,l)});b.load(b.anchors.index(this))}else throw"jQuery UI Tabs: Mismatching fragment identifier.";d.browser.msie&&this.blur()});this.anchors.bind("click.tabs",
+function(){return false})},_getIndex:function(a){if(typeof a=="string")a=this.anchors.index(this.anchors.filter("[href$="+a+"]"));return a},destroy:function(){var a=this.options;this.abort();this.element.unbind(".tabs").removeClass("ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible").removeData("tabs");this.list.removeClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all");this.anchors.each(function(){var e=d.data(this,"href.tabs");if(e)this.href=
+e;var b=d(this).unbind(".tabs");d.each(["href","load","cache"],function(c,h){b.removeData(h+".tabs")})});this.lis.unbind(".tabs").add(this.panels).each(function(){d.data(this,"destroy.tabs")?d(this).remove():d(this).removeClass("ui-state-default ui-corner-top ui-tabs-selected ui-state-active ui-state-hover ui-state-focus ui-state-disabled ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide")});a.cookie&&this._cookie(null,a.cookie);return this},add:function(a,e,b){if(b===p)b=this.anchors.length;
+var c=this,h=this.options;e=d(h.tabTemplate.replace(/#\{href\}/g,a).replace(/#\{label\}/g,e));a=!a.indexOf("#")?a.replace("#",""):this._tabId(d("a",e)[0]);e.addClass("ui-state-default ui-corner-top").data("destroy.tabs",true);var j=d("#"+a);j.length||(j=d(h.panelTemplate).attr("id",a).data("destroy.tabs",true));j.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide");if(b>=this.lis.length){e.appendTo(this.list);j.appendTo(this.list[0].parentNode)}else{e.insertBefore(this.lis[b]);
+j.insertBefore(this.panels[b])}h.disabled=d.map(h.disabled,function(k){return k>=b?++k:k});this._tabify();if(this.anchors.length==1){h.selected=0;e.addClass("ui-tabs-selected ui-state-active");j.removeClass("ui-tabs-hide");this.element.queue("tabs",function(){c._trigger("show",null,c._ui(c.anchors[0],c.panels[0]))});this.load(0)}this._trigger("add",null,this._ui(this.anchors[b],this.panels[b]));return this},remove:function(a){a=this._getIndex(a);var e=this.options,b=this.lis.eq(a).remove(),c=this.panels.eq(a).remove();
+if(b.hasClass("ui-tabs-selected")&&this.anchors.length>1)this.select(a+(a+1<this.anchors.length?1:-1));e.disabled=d.map(d.grep(e.disabled,function(h){return h!=a}),function(h){return h>=a?--h:h});this._tabify();this._trigger("remove",null,this._ui(b.find("a")[0],c[0]));return this},enable:function(a){a=this._getIndex(a);var e=this.options;if(d.inArray(a,e.disabled)!=-1){this.lis.eq(a).removeClass("ui-state-disabled");e.disabled=d.grep(e.disabled,function(b){return b!=a});this._trigger("enable",null,
+this._ui(this.anchors[a],this.panels[a]));return this}},disable:function(a){a=this._getIndex(a);var e=this.options;if(a!=e.selected){this.lis.eq(a).addClass("ui-state-disabled");e.disabled.push(a);e.disabled.sort();this._trigger("disable",null,this._ui(this.anchors[a],this.panels[a]))}return this},select:function(a){a=this._getIndex(a);if(a==-1)if(this.options.collapsible&&this.options.selected!=-1)a=this.options.selected;else return this;this.anchors.eq(a).trigger(this.options.event+".tabs");return this},
+load:function(a){a=this._getIndex(a);var e=this,b=this.options,c=this.anchors.eq(a)[0],h=d.data(c,"load.tabs");this.abort();if(!h||this.element.queue("tabs").length!==0&&d.data(c,"cache.tabs"))this.element.dequeue("tabs");else{this.lis.eq(a).addClass("ui-state-processing");if(b.spinner){var j=d("span",c);j.data("label.tabs",j.html()).html(b.spinner)}this.xhr=d.ajax(d.extend({},b.ajaxOptions,{url:h,success:function(k,n){d(e._sanitizeSelector(c.hash)).html(k);e._cleanup();b.cache&&d.data(c,"cache.tabs",
+true);e._trigger("load",null,e._ui(e.anchors[a],e.panels[a]));try{b.ajaxOptions.success(k,n)}catch(m){}},error:function(k,n){e._cleanup();e._trigger("load",null,e._ui(e.anchors[a],e.panels[a]));try{b.ajaxOptions.error(k,n,a,c)}catch(m){}}}));e.element.dequeue("tabs");return this}},abort:function(){this.element.queue([]);this.panels.stop(false,true);this.element.queue("tabs",this.element.queue("tabs").splice(-2,2));if(this.xhr){this.xhr.abort();delete this.xhr}this._cleanup();return this},url:function(a,
+e){this.anchors.eq(a).removeData("cache.tabs").data("load.tabs",e);return this},length:function(){return this.anchors.length}});d.extend(d.ui.tabs,{version:"1.8.5"});d.extend(d.ui.tabs.prototype,{rotation:null,rotate:function(a,e){var b=this,c=this.options,h=b._rotate||(b._rotate=function(j){clearTimeout(b.rotation);b.rotation=setTimeout(function(){var k=c.selected;b.select(++k<b.anchors.length?k:0)},a);j&&j.stopPropagation()});e=b._unrotate||(b._unrotate=!e?function(j){j.clientX&&b.rotate(null)}:
+function(){t=c.selected;h()});if(a){this.element.bind("tabsshow",h);this.anchors.bind(c.event+".tabs",e);h()}else{clearTimeout(b.rotation);this.element.unbind("tabsshow",h);this.anchors.unbind(c.event+".tabs",e);delete this._rotate;delete this._unrotate}return this}})})(jQuery);
+;/*
+ * jQuery UI Datepicker 1.8.5
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Datepicker
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ */
+(function(d,G){function L(){this.debug=false;this._curInst=null;this._keyEvent=false;this._disabledInputs=[];this._inDialog=this._datepickerShowing=false;this._mainDivId="ui-datepicker-div";this._inlineClass="ui-datepicker-inline";this._appendClass="ui-datepicker-append";this._triggerClass="ui-datepicker-trigger";this._dialogClass="ui-datepicker-dialog";this._disableClass="ui-datepicker-disabled";this._unselectableClass="ui-datepicker-unselectable";this._currentClass="ui-datepicker-current-day";this._dayOverClass=
+"ui-datepicker-days-cell-over";this.regional=[];this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun", "Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su",
+"Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"mm/dd/yy",firstDay:1,isRTL:false,showMonthAfterYear:false,yearSuffix:""};this._defaults={showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:false,hideIfNoPrevNext:false,navigationAsDateFormat:false,gotoCurrent:false,changeMonth:false,changeYear:false,yearRange:"c-10:c+10",showOtherMonths:false,selectOtherMonths:false,showWeek:false,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",
+minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:true,showButtonPanel:false,autoSize:false};d.extend(this._defaults,this.regional[""]);this.dpDiv=d('<div id="'+this._mainDivId+'" class="ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all ui-helper-hidden-accessible"></div>')}function E(a,b){d.extend(a,
+b);for(var c in b)if(b[c]==null||b[c]==G)a[c]=b[c];return a}d.extend(d.ui,{datepicker:{version:"1.8.5"}});var y=(new Date).getTime();d.extend(L.prototype,{markerClassName:"hasDatepicker",log:function(){this.debug&&console.log.apply("",arguments)},_widgetDatepicker:function(){return this.dpDiv},setDefaults:function(a){E(this._defaults,a||{});return this},_attachDatepicker:function(a,b){var c=null;for(var e in this._defaults){var f=a.getAttribute("date:"+e);if(f){c=c||{};try{c[e]=eval(f)}catch(h){c[e]=
+f}}}e=a.nodeName.toLowerCase();f=e=="div"||e=="span";if(!a.id){this.uuid+=1;a.id="dp"+this.uuid}var i=this._newInst(d(a),f);i.settings=d.extend({},b||{},c||{});if(e=="input")this._connectDatepicker(a,i);else f&&this._inlineDatepicker(a,i)},_newInst:function(a,b){return{id:a[0].id.replace(/([^A-Za-z0-9_])/g,"\\\\$1"),input:a,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:b,dpDiv:!b?this.dpDiv:d('<div class="'+this._inlineClass+' ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>')}},
+_connectDatepicker:function(a,b){var c=d(a);b.append=d([]);b.trigger=d([]);if(!c.hasClass(this.markerClassName)){this._attachments(c,b);c.addClass(this.markerClassName).keydown(this._doKeyDown).keypress(this._doKeyPress).keyup(this._doKeyUp).bind("setData.datepicker",function(e,f,h){b.settings[f]=h}).bind("getData.datepicker",function(e,f){return this._get(b,f)});this._autoSize(b);d.data(a,"datepicker",b)}},_attachments:function(a,b){var c=this._get(b,"appendText"),e=this._get(b,"isRTL");b.append&&
+b.append.remove();if(c){b.append=d('<span class="'+this._appendClass+'">'+c+"</span>");a[e?"before":"after"](b.append)}a.unbind("focus",this._showDatepicker);b.trigger&&b.trigger.remove();c=this._get(b,"showOn");if(c=="focus"||c=="both")a.focus(this._showDatepicker);if(c=="button"||c=="both"){c=this._get(b,"buttonText");var f=this._get(b,"buttonImage");b.trigger=d(this._get(b,"buttonImageOnly")?d("<img/>").addClass(this._triggerClass).attr({src:f,alt:c,title:c}):d('<button type="button"></button>').addClass(this._triggerClass).html(f==
+""?c:d("<img/>").attr({src:f,alt:c,title:c})));a[e?"before":"after"](b.trigger);b.trigger.click(function(){d.datepicker._datepickerShowing&&d.datepicker._lastInput==a[0]?d.datepicker._hideDatepicker():d.datepicker._showDatepicker(a[0]);return false})}},_autoSize:function(a){if(this._get(a,"autoSize")&&!a.inline){var b=new Date(2009,11,20),c=this._get(a,"dateFormat");if(c.match(/[DM]/)){var e=function(f){for(var h=0,i=0,g=0;g<f.length;g++)if(f[g].length>h){h=f[g].length;i=g}return i};b.setMonth(e(this._get(a,
+c.match(/MM/)?"monthNames":"monthNamesShort")));b.setDate(e(this._get(a,c.match(/DD/)?"dayNames":"dayNamesShort"))+20-b.getDay())}a.input.attr("size",this._formatDate(a,b).length)}},_inlineDatepicker:function(a,b){var c=d(a);if(!c.hasClass(this.markerClassName)){c.addClass(this.markerClassName).append(b.dpDiv).bind("setData.datepicker",function(e,f,h){b.settings[f]=h}).bind("getData.datepicker",function(e,f){return this._get(b,f)});d.data(a,"datepicker",b);this._setDate(b,this._getDefaultDate(b),
+true);this._updateDatepicker(b);this._updateAlternate(b)}},_dialogDatepicker:function(a,b,c,e,f){a=this._dialogInst;if(!a){this.uuid+=1;this._dialogInput=d('<input type="text" id="'+("dp"+this.uuid)+'" style="position: absolute; top: -100px; width: 0px; z-index: -10;"/>');this._dialogInput.keydown(this._doKeyDown);d("body").append(this._dialogInput);a=this._dialogInst=this._newInst(this._dialogInput,false);a.settings={};d.data(this._dialogInput[0],"datepicker",a)}E(a.settings,e||{});b=b&&b.constructor==
+Date?this._formatDate(a,b):b;this._dialogInput.val(b);this._pos=f?f.length?f:[f.pageX,f.pageY]:null;if(!this._pos)this._pos=[document.documentElement.clientWidth/2-100+(document.documentElement.scrollLeft||document.body.scrollLeft),document.documentElement.clientHeight/2-150+(document.documentElement.scrollTop||document.body.scrollTop)];this._dialogInput.css("left",this._pos[0]+20+"px").css("top",this._pos[1]+"px");a.settings.onSelect=c;this._inDialog=true;this.dpDiv.addClass(this._dialogClass);this._showDatepicker(this._dialogInput[0]);
+d.blockUI&&d.blockUI(this.dpDiv);d.data(this._dialogInput[0],"datepicker",a);return this},_destroyDatepicker:function(a){var b=d(a),c=d.data(a,"datepicker");if(b.hasClass(this.markerClassName)){var e=a.nodeName.toLowerCase();d.removeData(a,"datepicker");if(e=="input"){c.append.remove();c.trigger.remove();b.removeClass(this.markerClassName).unbind("focus",this._showDatepicker).unbind("keydown",this._doKeyDown).unbind("keypress",this._doKeyPress).unbind("keyup",this._doKeyUp)}else if(e=="div"||e=="span")b.removeClass(this.markerClassName).empty()}},
+_enableDatepicker:function(a){var b=d(a),c=d.data(a,"datepicker");if(b.hasClass(this.markerClassName)){var e=a.nodeName.toLowerCase();if(e=="input"){a.disabled=false;c.trigger.filter("button").each(function(){this.disabled=false}).end().filter("img").css({opacity:"1.0",cursor:""})}else if(e=="div"||e=="span")b.children("."+this._inlineClass).children().removeClass("ui-state-disabled");this._disabledInputs=d.map(this._disabledInputs,function(f){return f==a?null:f})}},_disableDatepicker:function(a){var b=
+d(a),c=d.data(a,"datepicker");if(b.hasClass(this.markerClassName)){var e=a.nodeName.toLowerCase();if(e=="input"){a.disabled=true;c.trigger.filter("button").each(function(){this.disabled=true}).end().filter("img").css({opacity:"0.5",cursor:"default"})}else if(e=="div"||e=="span")b.children("."+this._inlineClass).children().addClass("ui-state-disabled");this._disabledInputs=d.map(this._disabledInputs,function(f){return f==a?null:f});this._disabledInputs[this._disabledInputs.length]=a}},_isDisabledDatepicker:function(a){if(!a)return false;
+for(var b=0;b<this._disabledInputs.length;b++)if(this._disabledInputs[b]==a)return true;return false},_getInst:function(a){try{return d.data(a,"datepicker")}catch(b){throw"Missing instance data for this datepicker";}},_optionDatepicker:function(a,b,c){var e=this._getInst(a);if(arguments.length==2&&typeof b=="string")return b=="defaults"?d.extend({},d.datepicker._defaults):e?b=="all"?d.extend({},e.settings):this._get(e,b):null;var f=b||{};if(typeof b=="string"){f={};f[b]=c}if(e){this._curInst==e&&
+this._hideDatepicker();var h=this._getDateDatepicker(a,true);E(e.settings,f);this._attachments(d(a),e);this._autoSize(e);this._setDateDatepicker(a,h);this._updateDatepicker(e)}},_changeDatepicker:function(a,b,c){this._optionDatepicker(a,b,c)},_refreshDatepicker:function(a){(a=this._getInst(a))&&this._updateDatepicker(a)},_setDateDatepicker:function(a,b){if(a=this._getInst(a)){this._setDate(a,b);this._updateDatepicker(a);this._updateAlternate(a)}},_getDateDatepicker:function(a,b){(a=this._getInst(a))&&
+!a.inline&&this._setDateFromField(a,b);return a?this._getDate(a):null},_doKeyDown:function(a){var b=d.datepicker._getInst(a.target),c=true,e=b.dpDiv.is(".ui-datepicker-rtl");b._keyEvent=true;if(d.datepicker._datepickerShowing)switch(a.keyCode){case 9:d.datepicker._hideDatepicker();c=false;break;case 13:c=d("td."+d.datepicker._dayOverClass,b.dpDiv).add(d("td."+d.datepicker._currentClass,b.dpDiv));c[0]?d.datepicker._selectDay(a.target,b.selectedMonth,b.selectedYear,c[0]):d.datepicker._hideDatepicker();
+return false;case 27:d.datepicker._hideDatepicker();break;case 33:d.datepicker._adjustDate(a.target,a.ctrlKey?-d.datepicker._get(b,"stepBigMonths"):-d.datepicker._get(b,"stepMonths"),"M");break;case 34:d.datepicker._adjustDate(a.target,a.ctrlKey?+d.datepicker._get(b,"stepBigMonths"):+d.datepicker._get(b,"stepMonths"),"M");break;case 35:if(a.ctrlKey||a.metaKey)d.datepicker._clearDate(a.target);c=a.ctrlKey||a.metaKey;break;case 36:if(a.ctrlKey||a.metaKey)d.datepicker._gotoToday(a.target);c=a.ctrlKey||
+a.metaKey;break;case 37:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,e?+1:-1,"D");c=a.ctrlKey||a.metaKey;if(a.originalEvent.altKey)d.datepicker._adjustDate(a.target,a.ctrlKey?-d.datepicker._get(b,"stepBigMonths"):-d.datepicker._get(b,"stepMonths"),"M");break;case 38:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,-7,"D");c=a.ctrlKey||a.metaKey;break;case 39:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,e?-1:+1,"D");c=a.ctrlKey||a.metaKey;if(a.originalEvent.altKey)d.datepicker._adjustDate(a.target,
+a.ctrlKey?+d.datepicker._get(b,"stepBigMonths"):+d.datepicker._get(b,"stepMonths"),"M");break;case 40:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,+7,"D");c=a.ctrlKey||a.metaKey;break;default:c=false}else if(a.keyCode==36&&a.ctrlKey)d.datepicker._showDatepicker(this);else c=false;if(c){a.preventDefault();a.stopPropagation()}},_doKeyPress:function(a){var b=d.datepicker._getInst(a.target);if(d.datepicker._get(b,"constrainInput")){b=d.datepicker._possibleChars(d.datepicker._get(b,"dateFormat"));
+var c=String.fromCharCode(a.charCode==G?a.keyCode:a.charCode);return a.ctrlKey||c<" "||!b||b.indexOf(c)>-1}},_doKeyUp:function(a){a=d.datepicker._getInst(a.target);if(a.input.val()!=a.lastVal)try{if(d.datepicker.parseDate(d.datepicker._get(a,"dateFormat"),a.input?a.input.val():null,d.datepicker._getFormatConfig(a))){d.datepicker._setDateFromField(a);d.datepicker._updateAlternate(a);d.datepicker._updateDatepicker(a)}}catch(b){d.datepicker.log(b)}return true},_showDatepicker:function(a){a=a.target||
+a;if(a.nodeName.toLowerCase()!="input")a=d("input",a.parentNode)[0];if(!(d.datepicker._isDisabledDatepicker(a)||d.datepicker._lastInput==a)){var b=d.datepicker._getInst(a);d.datepicker._curInst&&d.datepicker._curInst!=b&&d.datepicker._curInst.dpDiv.stop(true,true);var c=d.datepicker._get(b,"beforeShow");E(b.settings,c?c.apply(a,[a,b]):{});b.lastVal=null;d.datepicker._lastInput=a;d.datepicker._setDateFromField(b);if(d.datepicker._inDialog)a.value="";if(!d.datepicker._pos){d.datepicker._pos=d.datepicker._findPos(a);
+d.datepicker._pos[1]+=a.offsetHeight}var e=false;d(a).parents().each(function(){e|=d(this).css("position")=="fixed";return!e});if(e&&d.browser.opera){d.datepicker._pos[0]-=document.documentElement.scrollLeft;d.datepicker._pos[1]-=document.documentElement.scrollTop}c={left:d.datepicker._pos[0],top:d.datepicker._pos[1]};d.datepicker._pos=null;b.dpDiv.css({position:"absolute",display:"block",top:"-1000px"});d.datepicker._updateDatepicker(b);c=d.datepicker._checkOffset(b,c,e);b.dpDiv.css({position:d.datepicker._inDialog&&
+d.blockUI?"static":e?"fixed":"absolute",display:"none",left:c.left+"px",top:c.top+"px"});if(!b.inline){c=d.datepicker._get(b,"showAnim");var f=d.datepicker._get(b,"duration"),h=function(){d.datepicker._datepickerShowing=true;var i=d.datepicker._getBorders(b.dpDiv);b.dpDiv.find("iframe.ui-datepicker-cover").css({left:-i[0],top:-i[1],width:b.dpDiv.outerWidth(),height:b.dpDiv.outerHeight()})};b.dpDiv.zIndex(d(a).zIndex()+1);d.effects&&d.effects[c]?b.dpDiv.show(c,d.datepicker._get(b,"showOptions"),f,
+h):b.dpDiv[c||"show"](c?f:null,h);if(!c||!f)h();b.input.is(":visible")&&!b.input.is(":disabled")&&b.input.focus();d.datepicker._curInst=b}}},_updateDatepicker:function(a){var b=this,c=d.datepicker._getBorders(a.dpDiv);a.dpDiv.empty().append(this._generateHTML(a)).find("iframe.ui-datepicker-cover").css({left:-c[0],top:-c[1],width:a.dpDiv.outerWidth(),height:a.dpDiv.outerHeight()}).end().find("button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a").bind("mouseout",function(){d(this).removeClass("ui-state-hover");
+this.className.indexOf("ui-datepicker-prev")!=-1&&d(this).removeClass("ui-datepicker-prev-hover");this.className.indexOf("ui-datepicker-next")!=-1&&d(this).removeClass("ui-datepicker-next-hover")}).bind("mouseover",function(){if(!b._isDisabledDatepicker(a.inline?a.dpDiv.parent()[0]:a.input[0])){d(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover");d(this).addClass("ui-state-hover");this.className.indexOf("ui-datepicker-prev")!=-1&&d(this).addClass("ui-datepicker-prev-hover");
+this.className.indexOf("ui-datepicker-next")!=-1&&d(this).addClass("ui-datepicker-next-hover")}}).end().find("."+this._dayOverClass+" a").trigger("mouseover").end();c=this._getNumberOfMonths(a);var e=c[1];e>1?a.dpDiv.addClass("ui-datepicker-multi-"+e).css("width",17*e+"em"):a.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width("");a.dpDiv[(c[0]!=1||c[1]!=1?"add":"remove")+"Class"]("ui-datepicker-multi");a.dpDiv[(this._get(a,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl");
+a==d.datepicker._curInst&&d.datepicker._datepickerShowing&&a.input&&a.input.is(":visible")&&!a.input.is(":disabled")&&a.input.focus()},_getBorders:function(a){var b=function(c){return{thin:1,medium:2,thick:3}[c]||c};return[parseFloat(b(a.css("border-left-width"))),parseFloat(b(a.css("border-top-width")))]},_checkOffset:function(a,b,c){var e=a.dpDiv.outerWidth(),f=a.dpDiv.outerHeight(),h=a.input?a.input.outerWidth():0,i=a.input?a.input.outerHeight():0,g=document.documentElement.clientWidth+d(document).scrollLeft(),
+k=document.documentElement.clientHeight+d(document).scrollTop();b.left-=this._get(a,"isRTL")?e-h:0;b.left-=c&&b.left==a.input.offset().left?d(document).scrollLeft():0;b.top-=c&&b.top==a.input.offset().top+i?d(document).scrollTop():0;b.left-=Math.min(b.left,b.left+e>g&&g>e?Math.abs(b.left+e-g):0);b.top-=Math.min(b.top,b.top+f>k&&k>f?Math.abs(f+i):0);return b},_findPos:function(a){for(var b=this._get(this._getInst(a),"isRTL");a&&(a.type=="hidden"||a.nodeType!=1);)a=a[b?"previousSibling":"nextSibling"];
+a=d(a).offset();return[a.left,a.top]},_hideDatepicker:function(a){var b=this._curInst;if(!(!b||a&&b!=d.data(a,"datepicker")))if(this._datepickerShowing){a=this._get(b,"showAnim");var c=this._get(b,"duration"),e=function(){d.datepicker._tidyDialog(b);this._curInst=null};d.effects&&d.effects[a]?b.dpDiv.hide(a,d.datepicker._get(b,"showOptions"),c,e):b.dpDiv[a=="slideDown"?"slideUp":a=="fadeIn"?"fadeOut":"hide"](a?c:null,e);a||e();if(a=this._get(b,"onClose"))a.apply(b.input?b.input[0]:null,[b.input?b.input.val():
+"",b]);this._datepickerShowing=false;this._lastInput=null;if(this._inDialog){this._dialogInput.css({position:"absolute",left:"0",top:"-100px"});if(d.blockUI){d.unblockUI();d("body").append(this.dpDiv)}}this._inDialog=false}},_tidyDialog:function(a){a.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar")},_checkExternalClick:function(a){if(d.datepicker._curInst){a=d(a.target);a[0].id!=d.datepicker._mainDivId&&a.parents("#"+d.datepicker._mainDivId).length==0&&!a.hasClass(d.datepicker.markerClassName)&&
+!a.hasClass(d.datepicker._triggerClass)&&d.datepicker._datepickerShowing&&!(d.datepicker._inDialog&&d.blockUI)&&d.datepicker._hideDatepicker()}},_adjustDate:function(a,b,c){a=d(a);var e=this._getInst(a[0]);if(!this._isDisabledDatepicker(a[0])){this._adjustInstDate(e,b+(c=="M"?this._get(e,"showCurrentAtPos"):0),c);this._updateDatepicker(e)}},_gotoToday:function(a){a=d(a);var b=this._getInst(a[0]);if(this._get(b,"gotoCurrent")&&b.currentDay){b.selectedDay=b.currentDay;b.drawMonth=b.selectedMonth=b.currentMonth;
+b.drawYear=b.selectedYear=b.currentYear}else{var c=new Date;b.selectedDay=c.getDate();b.drawMonth=b.selectedMonth=c.getMonth();b.drawYear=b.selectedYear=c.getFullYear()}this._notifyChange(b);this._adjustDate(a)},_selectMonthYear:function(a,b,c){a=d(a);var e=this._getInst(a[0]);e._selectingMonthYear=false;e["selected"+(c=="M"?"Month":"Year")]=e["draw"+(c=="M"?"Month":"Year")]=parseInt(b.options[b.selectedIndex].value,10);this._notifyChange(e);this._adjustDate(a)},_clickMonthYear:function(a){var b=
+this._getInst(d(a)[0]);b.input&&b._selectingMonthYear&&setTimeout(function(){b.input.focus()},0);b._selectingMonthYear=!b._selectingMonthYear},_selectDay:function(a,b,c,e){var f=d(a);if(!(d(e).hasClass(this._unselectableClass)||this._isDisabledDatepicker(f[0]))){f=this._getInst(f[0]);f.selectedDay=f.currentDay=d("a",e).html();f.selectedMonth=f.currentMonth=b;f.selectedYear=f.currentYear=c;this._selectDate(a,this._formatDate(f,f.currentDay,f.currentMonth,f.currentYear))}},_clearDate:function(a){a=
+d(a);this._getInst(a[0]);this._selectDate(a,"")},_selectDate:function(a,b){a=this._getInst(d(a)[0]);b=b!=null?b:this._formatDate(a);a.input&&a.input.val(b);this._updateAlternate(a);var c=this._get(a,"onSelect");if(c)c.apply(a.input?a.input[0]:null,[b,a]);else a.input&&a.input.trigger("change");if(a.inline)this._updateDatepicker(a);else{this._hideDatepicker();this._lastInput=a.input[0];typeof a.input[0]!="object"&&a.input.focus();this._lastInput=null}},_updateAlternate:function(a){var b=this._get(a,
+"altField");if(b){var c=this._get(a,"altFormat")||this._get(a,"dateFormat"),e=this._getDate(a),f=this.formatDate(c,e,this._getFormatConfig(a));d(b).each(function(){d(this).val(f)})}},noWeekends:function(a){a=a.getDay();return[a>0&&a<6,""]},iso8601Week:function(a){a=new Date(a.getTime());a.setDate(a.getDate()+4-(a.getDay()||7));var b=a.getTime();a.setMonth(0);a.setDate(1);return Math.floor(Math.round((b-a)/864E5)/7)+1},parseDate:function(a,b,c){if(a==null||b==null)throw"Invalid arguments";b=typeof b==
+"object"?b.toString():b+"";if(b=="")return null;for(var e=(c?c.shortYearCutoff:null)||this._defaults.shortYearCutoff,f=(c?c.dayNamesShort:null)||this._defaults.dayNamesShort,h=(c?c.dayNames:null)||this._defaults.dayNames,i=(c?c.monthNamesShort:null)||this._defaults.monthNamesShort,g=(c?c.monthNames:null)||this._defaults.monthNames,k=c=-1,l=-1,u=-1,j=false,o=function(p){(p=z+1<a.length&&a.charAt(z+1)==p)&&z++;return p},m=function(p){o(p);p=new RegExp("^\\d{1,"+(p=="@"?14:p=="!"?20:p=="y"?4:p=="o"?
+3:2)+"}");p=b.substring(s).match(p);if(!p)throw"Missing number at position "+s;s+=p[0].length;return parseInt(p[0],10)},n=function(p,w,H){p=o(p)?H:w;for(w=0;w<p.length;w++)if(b.substr(s,p[w].length).toLowerCase()==p[w].toLowerCase()){s+=p[w].length;return w+1}throw"Unknown name at position "+s;},r=function(){if(b.charAt(s)!=a.charAt(z))throw"Unexpected literal at position "+s;s++},s=0,z=0;z<a.length;z++)if(j)if(a.charAt(z)=="'"&&!o("'"))j=false;else r();else switch(a.charAt(z)){case "d":l=m("d");
+break;case "D":n("D",f,h);break;case "o":u=m("o");break;case "m":k=m("m");break;case "M":k=n("M",i,g);break;case "y":c=m("y");break;case "@":var v=new Date(m("@"));c=v.getFullYear();k=v.getMonth()+1;l=v.getDate();break;case "!":v=new Date((m("!")-this._ticksTo1970)/1E4);c=v.getFullYear();k=v.getMonth()+1;l=v.getDate();break;case "'":if(o("'"))r();else j=true;break;default:r()}if(c==-1)c=(new Date).getFullYear();else if(c<100)c+=(new Date).getFullYear()-(new Date).getFullYear()%100+(c<=e?0:-100);if(u>
+-1){k=1;l=u;do{e=this._getDaysInMonth(c,k-1);if(l<=e)break;k++;l-=e}while(1)}v=this._daylightSavingAdjust(new Date(c,k-1,l));if(v.getFullYear()!=c||v.getMonth()+1!=k||v.getDate()!=l)throw"Invalid date";return v},ATOM:"yy-mm-dd",COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(4.925))*24*
+60*60*1E7,formatDate:function(a,b,c){if(!b)return"";var e=(c?c.dayNamesShort:null)||this._defaults.dayNamesShort,f=(c?c.dayNames:null)||this._defaults.dayNames,h=(c?c.monthNamesShort:null)||this._defaults.monthNamesShort;c=(c?c.monthNames:null)||this._defaults.monthNames;var i=function(o){(o=j+1<a.length&&a.charAt(j+1)==o)&&j++;return o},g=function(o,m,n){m=""+m;if(i(o))for(;m.length<n;)m="0"+m;return m},k=function(o,m,n,r){return i(o)?r[m]:n[m]},l="",u=false;if(b)for(var j=0;j<a.length;j++)if(u)if(a.charAt(j)==
+"'"&&!i("'"))u=false;else l+=a.charAt(j);else switch(a.charAt(j)){case "d":l+=g("d",b.getDate(),2);break;case "D":l+=k("D",b.getDay(),e,f);break;case "o":l+=g("o",(b.getTime()-(new Date(b.getFullYear(),0,0)).getTime())/864E5,3);break;case "m":l+=g("m",b.getMonth()+1,2);break;case "M":l+=k("M",b.getMonth(),h,c);break;case "y":l+=i("y")?b.getFullYear():(b.getYear()%100<10?"0":"")+b.getYear()%100;break;case "@":l+=b.getTime();break;case "!":l+=b.getTime()*1E4+this._ticksTo1970;break;case "'":if(i("'"))l+=
+"'";else u=true;break;default:l+=a.charAt(j)}return l},_possibleChars:function(a){for(var b="",c=false,e=function(h){(h=f+1<a.length&&a.charAt(f+1)==h)&&f++;return h},f=0;f<a.length;f++)if(c)if(a.charAt(f)=="'"&&!e("'"))c=false;else b+=a.charAt(f);else switch(a.charAt(f)){case "d":case "m":case "y":case "@":b+="0123456789";break;case "D":case "M":return null;case "'":if(e("'"))b+="'";else c=true;break;default:b+=a.charAt(f)}return b},_get:function(a,b){return a.settings[b]!==G?a.settings[b]:this._defaults[b]},
+_setDateFromField:function(a,b){if(a.input.val()!=a.lastVal){var c=this._get(a,"dateFormat"),e=a.lastVal=a.input?a.input.val():null,f,h;f=h=this._getDefaultDate(a);var i=this._getFormatConfig(a);try{f=this.parseDate(c,e,i)||h}catch(g){this.log(g);e=b?"":e}a.selectedDay=f.getDate();a.drawMonth=a.selectedMonth=f.getMonth();a.drawYear=a.selectedYear=f.getFullYear();a.currentDay=e?f.getDate():0;a.currentMonth=e?f.getMonth():0;a.currentYear=e?f.getFullYear():0;this._adjustInstDate(a)}},_getDefaultDate:function(a){return this._restrictMinMax(a,
+this._determineDate(a,this._get(a,"defaultDate"),new Date))},_determineDate:function(a,b,c){var e=function(h){var i=new Date;i.setDate(i.getDate()+h);return i},f=function(h){try{return d.datepicker.parseDate(d.datepicker._get(a,"dateFormat"),h,d.datepicker._getFormatConfig(a))}catch(i){}var g=(h.toLowerCase().match(/^c/)?d.datepicker._getDate(a):null)||new Date,k=g.getFullYear(),l=g.getMonth();g=g.getDate();for(var u=/([+-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,j=u.exec(h);j;){switch(j[2]||"d"){case "d":case "D":g+=
+parseInt(j[1],10);break;case "w":case "W":g+=parseInt(j[1],10)*7;break;case "m":case "M":l+=parseInt(j[1],10);g=Math.min(g,d.datepicker._getDaysInMonth(k,l));break;case "y":case "Y":k+=parseInt(j[1],10);g=Math.min(g,d.datepicker._getDaysInMonth(k,l));break}j=u.exec(h)}return new Date(k,l,g)};if(b=(b=b==null?c:typeof b=="string"?f(b):typeof b=="number"?isNaN(b)?c:e(b):b)&&b.toString()=="Invalid Date"?c:b){b.setHours(0);b.setMinutes(0);b.setSeconds(0);b.setMilliseconds(0)}return this._daylightSavingAdjust(b)},
+_daylightSavingAdjust:function(a){if(!a)return null;a.setHours(a.getHours()>12?a.getHours()+2:0);return a},_setDate:function(a,b,c){var e=!b,f=a.selectedMonth,h=a.selectedYear;b=this._restrictMinMax(a,this._determineDate(a,b,new Date));a.selectedDay=a.currentDay=b.getDate();a.drawMonth=a.selectedMonth=a.currentMonth=b.getMonth();a.drawYear=a.selectedYear=a.currentYear=b.getFullYear();if((f!=a.selectedMonth||h!=a.selectedYear)&&!c)this._notifyChange(a);this._adjustInstDate(a);if(a.input)a.input.val(e?
+"":this._formatDate(a))},_getDate:function(a){return!a.currentYear||a.input&&a.input.val()==""?null:this._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDay))},_generateHTML:function(a){var b=new Date;b=this._daylightSavingAdjust(new Date(b.getFullYear(),b.getMonth(),b.getDate()));var c=this._get(a,"isRTL"),e=this._get(a,"showButtonPanel"),f=this._get(a,"hideIfNoPrevNext"),h=this._get(a,"navigationAsDateFormat"),i=this._getNumberOfMonths(a),g=this._get(a,"showCurrentAtPos"),k=
+this._get(a,"stepMonths"),l=i[0]!=1||i[1]!=1,u=this._daylightSavingAdjust(!a.currentDay?new Date(9999,9,9):new Date(a.currentYear,a.currentMonth,a.currentDay)),j=this._getMinMaxDate(a,"min"),o=this._getMinMaxDate(a,"max");g=a.drawMonth-g;var m=a.drawYear;if(g<0){g+=12;m--}if(o){var n=this._daylightSavingAdjust(new Date(o.getFullYear(),o.getMonth()-i[0]*i[1]+1,o.getDate()));for(n=j&&n<j?j:n;this._daylightSavingAdjust(new Date(m,g,1))>n;){g--;if(g<0){g=11;m--}}}a.drawMonth=g;a.drawYear=m;n=this._get(a,
+"prevText");n=!h?n:this.formatDate(n,this._daylightSavingAdjust(new Date(m,g-k,1)),this._getFormatConfig(a));n=this._canAdjustMonth(a,-1,m,g)?'<a class="ui-datepicker-prev ui-corner-all" onclick="DP_jQuery_'+y+".datepicker._adjustDate('#"+a.id+"', -"+k+", 'M');\" title=\""+n+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"e":"w")+'">'+n+"</span></a>":f?"":'<a class="ui-datepicker-prev ui-corner-all ui-state-disabled" title="'+n+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"e":"w")+'">'+
+n+"</span></a>";var r=this._get(a,"nextText");r=!h?r:this.formatDate(r,this._daylightSavingAdjust(new Date(m,g+k,1)),this._getFormatConfig(a));f=this._canAdjustMonth(a,+1,m,g)?'<a class="ui-datepicker-next ui-corner-all" onclick="DP_jQuery_'+y+".datepicker._adjustDate('#"+a.id+"', +"+k+", 'M');\" title=\""+r+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"w":"e")+'">'+r+"</span></a>":f?"":'<a class="ui-datepicker-next ui-corner-all ui-state-disabled" title="'+r+'"><span class="ui-icon ui-icon-circle-triangle-'+
+(c?"w":"e")+'">'+r+"</span></a>";k=this._get(a,"currentText");r=this._get(a,"gotoCurrent")&&a.currentDay?u:b;k=!h?k:this.formatDate(k,r,this._getFormatConfig(a));h=!a.inline?'<button type="button" class="ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all" onclick="DP_jQuery_'+y+'.datepicker._hideDatepicker();">'+this._get(a,"closeText")+"</button>":"";e=e?'<div class="ui-datepicker-buttonpane ui-widget-content">'+(c?h:"")+(this._isInRange(a,r)?'<button type="button" class="ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all" onclick="DP_jQuery_'+
+y+".datepicker._gotoToday('#"+a.id+"');\">"+k+"</button>":"")+(c?"":h)+"</div>":"";h=parseInt(this._get(a,"firstDay"),10);h=isNaN(h)?0:h;k=this._get(a,"showWeek");r=this._get(a,"dayNames");this._get(a,"dayNamesShort");var s=this._get(a,"dayNamesMin"),z=this._get(a,"monthNames"),v=this._get(a,"monthNamesShort"),p=this._get(a,"beforeShowDay"),w=this._get(a,"showOtherMonths"),H=this._get(a,"selectOtherMonths");this._get(a,"calculateWeek");for(var M=this._getDefaultDate(a),I="",C=0;C<i[0];C++){for(var N=
+"",D=0;D<i[1];D++){var J=this._daylightSavingAdjust(new Date(m,g,a.selectedDay)),t=" ui-corner-all",x="";if(l){x+='<div class="ui-datepicker-group';if(i[1]>1)switch(D){case 0:x+=" ui-datepicker-group-first";t=" ui-corner-"+(c?"right":"left");break;case i[1]-1:x+=" ui-datepicker-group-last";t=" ui-corner-"+(c?"left":"right");break;default:x+=" ui-datepicker-group-middle";t="";break}x+='">'}x+='<div class="ui-datepicker-header ui-widget-header ui-helper-clearfix'+t+'">'+(/all|left/.test(t)&&C==0?c?
+f:n:"")+(/all|right/.test(t)&&C==0?c?n:f:"")+this._generateMonthYearHeader(a,g,m,j,o,C>0||D>0,z,v)+'</div><table class="ui-datepicker-calendar"><thead><tr>';var A=k?'<th class="ui-datepicker-week-col">'+this._get(a,"weekHeader")+"</th>":"";for(t=0;t<7;t++){var q=(t+h)%7;A+="<th"+((t+h+6)%7>=5?' class="ui-datepicker-week-end"':"")+'><span title="'+r[q]+'">'+s[q]+"</span></th>"}x+=A+"</tr></thead><tbody>";A=this._getDaysInMonth(m,g);if(m==a.selectedYear&&g==a.selectedMonth)a.selectedDay=Math.min(a.selectedDay,
+A);t=(this._getFirstDayOfMonth(m,g)-h+7)%7;A=l?6:Math.ceil((t+A)/7);q=this._daylightSavingAdjust(new Date(m,g,1-t));for(var O=0;O<A;O++){x+="<tr>";var P=!k?"":'<td class="ui-datepicker-week-col">'+this._get(a,"calculateWeek")(q)+"</td>";for(t=0;t<7;t++){var F=p?p.apply(a.input?a.input[0]:null,[q]):[true,""],B=q.getMonth()!=g,K=B&&!H||!F[0]||j&&q<j||o&&q>o;P+='<td class="'+((t+h+6)%7>=5?" ui-datepicker-week-end":"")+(B?" ui-datepicker-other-month":"")+(q.getTime()==J.getTime()&&g==a.selectedMonth&&
+a._keyEvent||M.getTime()==q.getTime()&&M.getTime()==J.getTime()?" "+this._dayOverClass:"")+(K?" "+this._unselectableClass+" ui-state-disabled":"")+(B&&!w?"":" "+F[1]+(q.getTime()==u.getTime()?" "+this._currentClass:"")+(q.getTime()==b.getTime()?" ui-datepicker-today":""))+'"'+((!B||w)&&F[2]?' title="'+F[2]+'"':"")+(K?"":' onclick="DP_jQuery_'+y+".datepicker._selectDay('#"+a.id+"',"+q.getMonth()+","+q.getFullYear()+', this);return false;"')+">"+(B&&!w?"&#xa0;":K?'<span class="ui-state-default">'+q.getDate()+
+"</span>":'<a class="ui-state-default'+(q.getTime()==b.getTime()?" ui-state-highlight":"")+(q.getTime()==J.getTime()?" ui-state-active":"")+(B?" ui-priority-secondary":"")+'" href="#">'+q.getDate()+"</a>")+"</td>";q.setDate(q.getDate()+1);q=this._daylightSavingAdjust(q)}x+=P+"</tr>"}g++;if(g>11){g=0;m++}x+="</tbody></table>"+(l?"</div>"+(i[0]>0&&D==i[1]-1?'<div class="ui-datepicker-row-break"></div>':""):"");N+=x}I+=N}I+=e+(d.browser.msie&&parseInt(d.browser.version,10)<7&&!a.inline?'<iframe src="javascript:false;" class="ui-datepicker-cover" frameborder="0"></iframe>':
+"");a._keyEvent=false;return I},_generateMonthYearHeader:function(a,b,c,e,f,h,i,g){var k=this._get(a,"changeMonth"),l=this._get(a,"changeYear"),u=this._get(a,"showMonthAfterYear"),j='<div class="ui-datepicker-title">',o="";if(h||!k)o+='<span class="ui-datepicker-month">'+i[b]+"</span>";else{i=e&&e.getFullYear()==c;var m=f&&f.getFullYear()==c;o+='<select class="ui-datepicker-month" onchange="DP_jQuery_'+y+".datepicker._selectMonthYear('#"+a.id+"', this, 'M');\" onclick=\"DP_jQuery_"+y+".datepicker._clickMonthYear('#"+
+a.id+"');\">";for(var n=0;n<12;n++)if((!i||n>=e.getMonth())&&(!m||n<=f.getMonth()))o+='<option value="'+n+'"'+(n==b?' selected="selected"':"")+">"+g[n]+"</option>";o+="</select>"}u||(j+=o+(h||!(k&&l)?"&#xa0;":""));if(h||!l)j+='<span class="ui-datepicker-year">'+c+"</span>";else{g=this._get(a,"yearRange").split(":");var r=(new Date).getFullYear();i=function(s){s=s.match(/c[+-].*/)?c+parseInt(s.substring(1),10):s.match(/[+-].*/)?r+parseInt(s,10):parseInt(s,10);return isNaN(s)?r:s};b=i(g[0]);g=Math.max(b,
+i(g[1]||""));b=e?Math.max(b,e.getFullYear()):b;g=f?Math.min(g,f.getFullYear()):g;for(j+='<select class="ui-datepicker-year" onchange="DP_jQuery_'+y+".datepicker._selectMonthYear('#"+a.id+"', this, 'Y');\" onclick=\"DP_jQuery_"+y+".datepicker._clickMonthYear('#"+a.id+"');\">";b<=g;b++)j+='<option value="'+b+'"'+(b==c?' selected="selected"':"")+">"+b+"</option>";j+="</select>"}j+=this._get(a,"yearSuffix");if(u)j+=(h||!(k&&l)?"&#xa0;":"")+o;j+="</div>";return j},_adjustInstDate:function(a,b,c){var e=
+a.drawYear+(c=="Y"?b:0),f=a.drawMonth+(c=="M"?b:0);b=Math.min(a.selectedDay,this._getDaysInMonth(e,f))+(c=="D"?b:0);e=this._restrictMinMax(a,this._daylightSavingAdjust(new Date(e,f,b)));a.selectedDay=e.getDate();a.drawMonth=a.selectedMonth=e.getMonth();a.drawYear=a.selectedYear=e.getFullYear();if(c=="M"||c=="Y")this._notifyChange(a)},_restrictMinMax:function(a,b){var c=this._getMinMaxDate(a,"min");a=this._getMinMaxDate(a,"max");b=c&&b<c?c:b;return b=a&&b>a?a:b},_notifyChange:function(a){var b=this._get(a,
+"onChangeMonthYear");if(b)b.apply(a.input?a.input[0]:null,[a.selectedYear,a.selectedMonth+1,a])},_getNumberOfMonths:function(a){a=this._get(a,"numberOfMonths");return a==null?[1,1]:typeof a=="number"?[1,a]:a},_getMinMaxDate:function(a,b){return this._determineDate(a,this._get(a,b+"Date"),null)},_getDaysInMonth:function(a,b){return 32-(new Date(a,b,32)).getDate()},_getFirstDayOfMonth:function(a,b){return(new Date(a,b,1)).getDay()},_canAdjustMonth:function(a,b,c,e){var f=this._getNumberOfMonths(a);
+c=this._daylightSavingAdjust(new Date(c,e+(b<0?b:f[0]*f[1]),1));b<0&&c.setDate(this._getDaysInMonth(c.getFullYear(),c.getMonth()));return this._isInRange(a,c)},_isInRange:function(a,b){var c=this._getMinMaxDate(a,"min");a=this._getMinMaxDate(a,"max");return(!c||b.getTime()>=c.getTime())&&(!a||b.getTime()<=a.getTime())},_getFormatConfig:function(a){var b=this._get(a,"shortYearCutoff");b=typeof b!="string"?b:(new Date).getFullYear()%100+parseInt(b,10);return{shortYearCutoff:b,dayNamesShort:this._get(a,
+"dayNamesShort"),dayNames:this._get(a,"dayNames"),monthNamesShort:this._get(a,"monthNamesShort"),monthNames:this._get(a,"monthNames")}},_formatDate:function(a,b,c,e){if(!b){a.currentDay=a.selectedDay;a.currentMonth=a.selectedMonth;a.currentYear=a.selectedYear}b=b?typeof b=="object"?b:this._daylightSavingAdjust(new Date(e,c,b)):this._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDay));return this.formatDate(this._get(a,"dateFormat"),b,this._getFormatConfig(a))}});d.fn.datepicker=
+function(a){if(!d.datepicker.initialized){d(document).mousedown(d.datepicker._checkExternalClick).find("body").append(d.datepicker.dpDiv);d.datepicker.initialized=true}var b=Array.prototype.slice.call(arguments,1);if(typeof a=="string"&&(a=="isDisabled"||a=="getDate"||a=="widget"))return d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this[0]].concat(b));if(a=="option"&&arguments.length==2&&typeof arguments[1]=="string")return d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this[0]].concat(b));
+return this.each(function(){typeof a=="string"?d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this].concat(b)):d.datepicker._attachDatepicker(this,a)})};d.datepicker=new L;d.datepicker.initialized=false;d.datepicker.uuid=(new Date).getTime();d.datepicker.version="1.8.5";window["DP_jQuery_"+y]=d})(jQuery);
+;/*
+ * jQuery UI Progressbar 1.8.5
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Progressbar
+ *
+ * Depends:
+ *   jquery.ui.core.js
+ *   jquery.ui.widget.js
+ */
+(function(b,c){b.widget("ui.progressbar",{options:{value:0},min:0,max:100,_create:function(){this.element.addClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").attr({role:"progressbar","aria-valuemin":this.min,"aria-valuemax":this.max,"aria-valuenow":this._value()});this.valueDiv=b("<div class='ui-progressbar-value ui-widget-header ui-corner-left'></div>").appendTo(this.element);this._refreshValue()},destroy:function(){this.element.removeClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow");
+this.valueDiv.remove();b.Widget.prototype.destroy.apply(this,arguments)},value:function(a){if(a===c)return this._value();this._setOption("value",a);return this},_setOption:function(a,d){if(a==="value"){this.options.value=d;this._refreshValue();this._trigger("change")}b.Widget.prototype._setOption.apply(this,arguments)},_value:function(){var a=this.options.value;if(typeof a!=="number")a=0;return Math.min(this.max,Math.max(this.min,a))},_refreshValue:function(){var a=this.value();this.valueDiv.toggleClass("ui-corner-right",
+a===this.max).width(a+"%");this.element.attr("aria-valuenow",a)}});b.extend(b.ui.progressbar,{version:"1.8.5"})})(jQuery);
+;/*
+ * jQuery UI Effects 1.8.5
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/
+ */
+jQuery.effects||function(f,j){function l(c){var a;if(c&&c.constructor==Array&&c.length==3)return c;if(a=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(c))return[parseInt(a[1],10),parseInt(a[2],10),parseInt(a[3],10)];if(a=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(c))return[parseFloat(a[1])*2.55,parseFloat(a[2])*2.55,parseFloat(a[3])*2.55];if(a=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(c))return[parseInt(a[1],
+16),parseInt(a[2],16),parseInt(a[3],16)];if(a=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(c))return[parseInt(a[1]+a[1],16),parseInt(a[2]+a[2],16),parseInt(a[3]+a[3],16)];if(/rgba\(0, 0, 0, 0\)/.exec(c))return m.transparent;return m[f.trim(c).toLowerCase()]}function r(c,a){var b;do{b=f.curCSS(c,a);if(b!=""&&b!="transparent"||f.nodeName(c,"body"))break;a="backgroundColor"}while(c=c.parentNode);return l(b)}function n(){var c=document.defaultView?document.defaultView.getComputedStyle(this,null):this.currentStyle,
+a={},b,d;if(c&&c.length&&c[0]&&c[c[0]])for(var e=c.length;e--;){b=c[e];if(typeof c[b]=="string"){d=b.replace(/\-(\w)/g,function(g,h){return h.toUpperCase()});a[d]=c[b]}}else for(b in c)if(typeof c[b]==="string")a[b]=c[b];return a}function o(c){var a,b;for(a in c){b=c[a];if(b==null||f.isFunction(b)||a in s||/scrollbar/.test(a)||!/color/i.test(a)&&isNaN(parseFloat(b)))delete c[a]}return c}function t(c,a){var b={_:0},d;for(d in a)if(c[d]!=a[d])b[d]=a[d];return b}function k(c,a,b,d){if(typeof c=="object"){d=
+a;b=null;a=c;c=a.effect}if(f.isFunction(a)){d=a;b=null;a={}}if(typeof a=="number"||f.fx.speeds[a]){d=b;b=a;a={}}if(f.isFunction(b)){d=b;b=null}a=a||{};b=b||a.duration;b=f.fx.off?0:typeof b=="number"?b:f.fx.speeds[b]||f.fx.speeds._default;d=d||a.complete;return[c,a,b,d]}f.effects={};f.each(["backgroundColor","borderBottomColor","borderLeftColor","borderRightColor","borderTopColor","color","outlineColor"],function(c,a){f.fx.step[a]=function(b){if(!b.colorInit){b.start=r(b.elem,a);b.end=l(b.end);b.colorInit=
+true}b.elem.style[a]="rgb("+Math.max(Math.min(parseInt(b.pos*(b.end[0]-b.start[0])+b.start[0],10),255),0)+","+Math.max(Math.min(parseInt(b.pos*(b.end[1]-b.start[1])+b.start[1],10),255),0)+","+Math.max(Math.min(parseInt(b.pos*(b.end[2]-b.start[2])+b.start[2],10),255),0)+")"}});var m={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,
+183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,
+165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0],transparent:[255,255,255]},p=["add","remove","toggle"],s={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};f.effects.animateClass=function(c,a,b,d){if(f.isFunction(b)){d=b;b=null}return this.each(function(){var e=f(this),g=e.attr("style")||" ",h=o(n.call(this)),q,u=e.attr("className");f.each(p,function(v,
+i){c[i]&&e[i+"Class"](c[i])});q=o(n.call(this));e.attr("className",u);e.animate(t(h,q),a,b,function(){f.each(p,function(v,i){c[i]&&e[i+"Class"](c[i])});if(typeof e.attr("style")=="object"){e.attr("style").cssText="";e.attr("style").cssText=g}else e.attr("style",g);d&&d.apply(this,arguments)})})};f.fn.extend({_addClass:f.fn.addClass,addClass:function(c,a,b,d){return a?f.effects.animateClass.apply(this,[{add:c},a,b,d]):this._addClass(c)},_removeClass:f.fn.removeClass,removeClass:function(c,a,b,d){return a?
+f.effects.animateClass.apply(this,[{remove:c},a,b,d]):this._removeClass(c)},_toggleClass:f.fn.toggleClass,toggleClass:function(c,a,b,d,e){return typeof a=="boolean"||a===j?b?f.effects.animateClass.apply(this,[a?{add:c}:{remove:c},b,d,e]):this._toggleClass(c,a):f.effects.animateClass.apply(this,[{toggle:c},a,b,d])},switchClass:function(c,a,b,d,e){return f.effects.animateClass.apply(this,[{add:a,remove:c},b,d,e])}});f.extend(f.effects,{version:"1.8.5",save:function(c,a){for(var b=0;b<a.length;b++)a[b]!==
+null&&c.data("ec.storage."+a[b],c[0].style[a[b]])},restore:function(c,a){for(var b=0;b<a.length;b++)a[b]!==null&&c.css(a[b],c.data("ec.storage."+a[b]))},setMode:function(c,a){if(a=="toggle")a=c.is(":hidden")?"show":"hide";return a},getBaseline:function(c,a){var b;switch(c[0]){case "top":b=0;break;case "middle":b=0.5;break;case "bottom":b=1;break;default:b=c[0]/a.height}switch(c[1]){case "left":c=0;break;case "center":c=0.5;break;case "right":c=1;break;default:c=c[1]/a.width}return{x:c,y:b}},createWrapper:function(c){if(c.parent().is(".ui-effects-wrapper"))return c.parent();
+var a={width:c.outerWidth(true),height:c.outerHeight(true),"float":c.css("float")},b=f("<div></div>").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0});c.wrap(b);b=c.parent();if(c.css("position")=="static"){b.css({position:"relative"});c.css({position:"relative"})}else{f.extend(a,{position:c.css("position"),zIndex:c.css("z-index")});f.each(["top","left","bottom","right"],function(d,e){a[e]=c.css(e);if(isNaN(parseInt(a[e],10)))a[e]="auto"});
+c.css({position:"relative",top:0,left:0})}return b.css(a).show()},removeWrapper:function(c){if(c.parent().is(".ui-effects-wrapper"))return c.parent().replaceWith(c);return c},setTransition:function(c,a,b,d){d=d||{};f.each(a,function(e,g){unit=c.cssUnit(g);if(unit[0]>0)d[g]=unit[0]*b+unit[1]});return d}});f.fn.extend({effect:function(c){var a=k.apply(this,arguments);a={options:a[1],duration:a[2],callback:a[3]};var b=f.effects[c];return b&&!f.fx.off?b.call(this,a):this},_show:f.fn.show,show:function(c){if(!c||
+typeof c=="number"||f.fx.speeds[c]||!f.effects[c])return this._show.apply(this,arguments);else{var a=k.apply(this,arguments);a[1].mode="show";return this.effect.apply(this,a)}},_hide:f.fn.hide,hide:function(c){if(!c||typeof c=="number"||f.fx.speeds[c]||!f.effects[c])return this._hide.apply(this,arguments);else{var a=k.apply(this,arguments);a[1].mode="hide";return this.effect.apply(this,a)}},__toggle:f.fn.toggle,toggle:function(c){if(!c||typeof c=="number"||f.fx.speeds[c]||!f.effects[c]||typeof c==
+"boolean"||f.isFunction(c))return this.__toggle.apply(this,arguments);else{var a=k.apply(this,arguments);a[1].mode="toggle";return this.effect.apply(this,a)}},cssUnit:function(c){var a=this.css(c),b=[];f.each(["em","px","%","pt"],function(d,e){if(a.indexOf(e)>0)b=[parseFloat(a),e]});return b}});f.easing.jswing=f.easing.swing;f.extend(f.easing,{def:"easeOutQuad",swing:function(c,a,b,d,e){return f.easing[f.easing.def](c,a,b,d,e)},easeInQuad:function(c,a,b,d,e){return d*(a/=e)*a+b},easeOutQuad:function(c,
+a,b,d,e){return-d*(a/=e)*(a-2)+b},easeInOutQuad:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a+b;return-d/2*(--a*(a-2)-1)+b},easeInCubic:function(c,a,b,d,e){return d*(a/=e)*a*a+b},easeOutCubic:function(c,a,b,d,e){return d*((a=a/e-1)*a*a+1)+b},easeInOutCubic:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a*a+b;return d/2*((a-=2)*a*a+2)+b},easeInQuart:function(c,a,b,d,e){return d*(a/=e)*a*a*a+b},easeOutQuart:function(c,a,b,d,e){return-d*((a=a/e-1)*a*a*a-1)+b},easeInOutQuart:function(c,a,b,d,e){if((a/=
+e/2)<1)return d/2*a*a*a*a+b;return-d/2*((a-=2)*a*a*a-2)+b},easeInQuint:function(c,a,b,d,e){return d*(a/=e)*a*a*a*a+b},easeOutQuint:function(c,a,b,d,e){return d*((a=a/e-1)*a*a*a*a+1)+b},easeInOutQuint:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a*a*a*a+b;return d/2*((a-=2)*a*a*a*a+2)+b},easeInSine:function(c,a,b,d,e){return-d*Math.cos(a/e*(Math.PI/2))+d+b},easeOutSine:function(c,a,b,d,e){return d*Math.sin(a/e*(Math.PI/2))+b},easeInOutSine:function(c,a,b,d,e){return-d/2*(Math.cos(Math.PI*a/e)-1)+
+b},easeInExpo:function(c,a,b,d,e){return a==0?b:d*Math.pow(2,10*(a/e-1))+b},easeOutExpo:function(c,a,b,d,e){return a==e?b+d:d*(-Math.pow(2,-10*a/e)+1)+b},easeInOutExpo:function(c,a,b,d,e){if(a==0)return b;if(a==e)return b+d;if((a/=e/2)<1)return d/2*Math.pow(2,10*(a-1))+b;return d/2*(-Math.pow(2,-10*--a)+2)+b},easeInCirc:function(c,a,b,d,e){return-d*(Math.sqrt(1-(a/=e)*a)-1)+b},easeOutCirc:function(c,a,b,d,e){return d*Math.sqrt(1-(a=a/e-1)*a)+b},easeInOutCirc:function(c,a,b,d,e){if((a/=e/2)<1)return-d/
+2*(Math.sqrt(1-a*a)-1)+b;return d/2*(Math.sqrt(1-(a-=2)*a)+1)+b},easeInElastic:function(c,a,b,d,e){c=1.70158;var g=0,h=d;if(a==0)return b;if((a/=e)==1)return b+d;g||(g=e*0.3);if(h<Math.abs(d)){h=d;c=g/4}else c=g/(2*Math.PI)*Math.asin(d/h);return-(h*Math.pow(2,10*(a-=1))*Math.sin((a*e-c)*2*Math.PI/g))+b},easeOutElastic:function(c,a,b,d,e){c=1.70158;var g=0,h=d;if(a==0)return b;if((a/=e)==1)return b+d;g||(g=e*0.3);if(h<Math.abs(d)){h=d;c=g/4}else c=g/(2*Math.PI)*Math.asin(d/h);return h*Math.pow(2,-10*
+a)*Math.sin((a*e-c)*2*Math.PI/g)+d+b},easeInOutElastic:function(c,a,b,d,e){c=1.70158;var g=0,h=d;if(a==0)return b;if((a/=e/2)==2)return b+d;g||(g=e*0.3*1.5);if(h<Math.abs(d)){h=d;c=g/4}else c=g/(2*Math.PI)*Math.asin(d/h);if(a<1)return-0.5*h*Math.pow(2,10*(a-=1))*Math.sin((a*e-c)*2*Math.PI/g)+b;return h*Math.pow(2,-10*(a-=1))*Math.sin((a*e-c)*2*Math.PI/g)*0.5+d+b},easeInBack:function(c,a,b,d,e,g){if(g==j)g=1.70158;return d*(a/=e)*a*((g+1)*a-g)+b},easeOutBack:function(c,a,b,d,e,g){if(g==j)g=1.70158;
+return d*((a=a/e-1)*a*((g+1)*a+g)+1)+b},easeInOutBack:function(c,a,b,d,e,g){if(g==j)g=1.70158;if((a/=e/2)<1)return d/2*a*a*(((g*=1.525)+1)*a-g)+b;return d/2*((a-=2)*a*(((g*=1.525)+1)*a+g)+2)+b},easeInBounce:function(c,a,b,d,e){return d-f.easing.easeOutBounce(c,e-a,0,d,e)+b},easeOutBounce:function(c,a,b,d,e){return(a/=e)<1/2.75?d*7.5625*a*a+b:a<2/2.75?d*(7.5625*(a-=1.5/2.75)*a+0.75)+b:a<2.5/2.75?d*(7.5625*(a-=2.25/2.75)*a+0.9375)+b:d*(7.5625*(a-=2.625/2.75)*a+0.984375)+b},easeInOutBounce:function(c,
+a,b,d,e){if(a<e/2)return f.easing.easeInBounce(c,a*2,0,d,e)*0.5+b;return f.easing.easeOutBounce(c,a*2-e,0,d,e)*0.5+d*0.5+b}})}(jQuery);
+;/*
+ * jQuery UI Effects Blind 1.8.5
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Blind
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(b){b.effects.blind=function(c){return this.queue(function(){var a=b(this),g=["position","top","left"],f=b.effects.setMode(a,c.options.mode||"hide"),d=c.options.direction||"vertical";b.effects.save(a,g);a.show();var e=b.effects.createWrapper(a).css({overflow:"hidden"}),h=d=="vertical"?"height":"width";d=d=="vertical"?e.height():e.width();f=="show"&&e.css(h,0);var i={};i[h]=f=="show"?d:0;e.animate(i,c.duration,c.options.easing,function(){f=="hide"&&a.hide();b.effects.restore(a,g);b.effects.removeWrapper(a);
+c.callback&&c.callback.apply(a[0],arguments);a.dequeue()})})}})(jQuery);
+;/*
+ * jQuery UI Effects Bounce 1.8.5
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Bounce
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(e){e.effects.bounce=function(b){return this.queue(function(){var a=e(this),l=["position","top","left"],h=e.effects.setMode(a,b.options.mode||"effect"),d=b.options.direction||"up",c=b.options.distance||20,m=b.options.times||5,i=b.duration||250;/show|hide/.test(h)&&l.push("opacity");e.effects.save(a,l);a.show();e.effects.createWrapper(a);var f=d=="up"||d=="down"?"top":"left";d=d=="up"||d=="left"?"pos":"neg";c=b.options.distance||(f=="top"?a.outerHeight({margin:true})/3:a.outerWidth({margin:true})/
+3);if(h=="show")a.css("opacity",0).css(f,d=="pos"?-c:c);if(h=="hide")c/=m*2;h!="hide"&&m--;if(h=="show"){var g={opacity:1};g[f]=(d=="pos"?"+=":"-=")+c;a.animate(g,i/2,b.options.easing);c/=2;m--}for(g=0;g<m;g++){var j={},k={};j[f]=(d=="pos"?"-=":"+=")+c;k[f]=(d=="pos"?"+=":"-=")+c;a.animate(j,i/2,b.options.easing).animate(k,i/2,b.options.easing);c=h=="hide"?c*2:c/2}if(h=="hide"){g={opacity:0};g[f]=(d=="pos"?"-=":"+=")+c;a.animate(g,i/2,b.options.easing,function(){a.hide();e.effects.restore(a,l);e.effects.removeWrapper(a);
+b.callback&&b.callback.apply(this,arguments)})}else{j={};k={};j[f]=(d=="pos"?"-=":"+=")+c;k[f]=(d=="pos"?"+=":"-=")+c;a.animate(j,i/2,b.options.easing).animate(k,i/2,b.options.easing,function(){e.effects.restore(a,l);e.effects.removeWrapper(a);b.callback&&b.callback.apply(this,arguments)})}a.queue("fx",function(){a.dequeue()});a.dequeue()})}})(jQuery);
+;/*
+ * jQuery UI Effects Clip 1.8.5
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Clip
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(b){b.effects.clip=function(e){return this.queue(function(){var a=b(this),i=["position","top","left","height","width"],f=b.effects.setMode(a,e.options.mode||"hide"),c=e.options.direction||"vertical";b.effects.save(a,i);a.show();var d=b.effects.createWrapper(a).css({overflow:"hidden"});d=a[0].tagName=="IMG"?d:a;var g={size:c=="vertical"?"height":"width",position:c=="vertical"?"top":"left"};c=c=="vertical"?d.height():d.width();if(f=="show"){d.css(g.size,0);d.css(g.position,c/2)}var h={};h[g.size]=
+f=="show"?c:0;h[g.position]=f=="show"?0:c/2;d.animate(h,{queue:false,duration:e.duration,easing:e.options.easing,complete:function(){f=="hide"&&a.hide();b.effects.restore(a,i);b.effects.removeWrapper(a);e.callback&&e.callback.apply(a[0],arguments);a.dequeue()}})})}})(jQuery);
+;/*
+ * jQuery UI Effects Drop 1.8.5
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Drop
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(c){c.effects.drop=function(d){return this.queue(function(){var a=c(this),h=["position","top","left","opacity"],e=c.effects.setMode(a,d.options.mode||"hide"),b=d.options.direction||"left";c.effects.save(a,h);a.show();c.effects.createWrapper(a);var f=b=="up"||b=="down"?"top":"left";b=b=="up"||b=="left"?"pos":"neg";var g=d.options.distance||(f=="top"?a.outerHeight({margin:true})/2:a.outerWidth({margin:true})/2);if(e=="show")a.css("opacity",0).css(f,b=="pos"?-g:g);var i={opacity:e=="show"?1:
+0};i[f]=(e=="show"?b=="pos"?"+=":"-=":b=="pos"?"-=":"+=")+g;a.animate(i,{queue:false,duration:d.duration,easing:d.options.easing,complete:function(){e=="hide"&&a.hide();c.effects.restore(a,h);c.effects.removeWrapper(a);d.callback&&d.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery);
+;/*
+ * jQuery UI Effects Explode 1.8.5
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Explode
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(j){j.effects.explode=function(a){return this.queue(function(){var c=a.options.pieces?Math.round(Math.sqrt(a.options.pieces)):3,d=a.options.pieces?Math.round(Math.sqrt(a.options.pieces)):3;a.options.mode=a.options.mode=="toggle"?j(this).is(":visible")?"hide":"show":a.options.mode;var b=j(this).show().css("visibility","hidden"),g=b.offset();g.top-=parseInt(b.css("marginTop"),10)||0;g.left-=parseInt(b.css("marginLeft"),10)||0;for(var h=b.outerWidth(true),i=b.outerHeight(true),e=0;e<c;e++)for(var f=
+0;f<d;f++)b.clone().appendTo("body").wrap("<div></div>").css({position:"absolute",visibility:"visible",left:-f*(h/d),top:-e*(i/c)}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:h/d,height:i/c,left:g.left+f*(h/d)+(a.options.mode=="show"?(f-Math.floor(d/2))*(h/d):0),top:g.top+e*(i/c)+(a.options.mode=="show"?(e-Math.floor(c/2))*(i/c):0),opacity:a.options.mode=="show"?0:1}).animate({left:g.left+f*(h/d)+(a.options.mode=="show"?0:(f-Math.floor(d/2))*(h/d)),top:g.top+
+e*(i/c)+(a.options.mode=="show"?0:(e-Math.floor(c/2))*(i/c)),opacity:a.options.mode=="show"?1:0},a.duration||500);setTimeout(function(){a.options.mode=="show"?b.css({visibility:"visible"}):b.css({visibility:"visible"}).hide();a.callback&&a.callback.apply(b[0]);b.dequeue();j("div.ui-effects-explode").remove()},a.duration||500)})}})(jQuery);
+;/*
+ * jQuery UI Effects Fade 1.8.5
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Fade
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(b){b.effects.fade=function(a){return this.queue(function(){var c=b(this),d=b.effects.setMode(c,a.options.mode||"hide");c.animate({opacity:d},{queue:false,duration:a.duration,easing:a.options.easing,complete:function(){a.callback&&a.callback.apply(this,arguments);c.dequeue()}})})}})(jQuery);
+;/*
+ * jQuery UI Effects Fold 1.8.5
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Fold
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(c){c.effects.fold=function(a){return this.queue(function(){var b=c(this),j=["position","top","left"],d=c.effects.setMode(b,a.options.mode||"hide"),g=a.options.size||15,h=!!a.options.horizFirst,k=a.duration?a.duration/2:c.fx.speeds._default/2;c.effects.save(b,j);b.show();var e=c.effects.createWrapper(b).css({overflow:"hidden"}),f=d=="show"!=h,l=f?["width","height"]:["height","width"];f=f?[e.width(),e.height()]:[e.height(),e.width()];var i=/([0-9]+)%/.exec(g);if(i)g=parseInt(i[1],10)/100*
+f[d=="hide"?0:1];if(d=="show")e.css(h?{height:0,width:g}:{height:g,width:0});h={};i={};h[l[0]]=d=="show"?f[0]:g;i[l[1]]=d=="show"?f[1]:0;e.animate(h,k,a.options.easing).animate(i,k,a.options.easing,function(){d=="hide"&&b.hide();c.effects.restore(b,j);c.effects.removeWrapper(b);a.callback&&a.callback.apply(b[0],arguments);b.dequeue()})})}})(jQuery);
+;/*
+ * jQuery UI Effects Highlight 1.8.5
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Highlight
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(b){b.effects.highlight=function(c){return this.queue(function(){var a=b(this),e=["backgroundImage","backgroundColor","opacity"],d=b.effects.setMode(a,c.options.mode||"show"),f={backgroundColor:a.css("backgroundColor")};if(d=="hide")f.opacity=0;b.effects.save(a,e);a.show().css({backgroundImage:"none",backgroundColor:c.options.color||"#ffff99"}).animate(f,{queue:false,duration:c.duration,easing:c.options.easing,complete:function(){d=="hide"&&a.hide();b.effects.restore(a,e);d=="show"&&!b.support.opacity&&
+this.style.removeAttribute("filter");c.callback&&c.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery);
+;/*
+ * jQuery UI Effects Pulsate 1.8.5
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Pulsate
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(d){d.effects.pulsate=function(a){return this.queue(function(){var b=d(this),c=d.effects.setMode(b,a.options.mode||"show");times=(a.options.times||5)*2-1;duration=a.duration?a.duration/2:d.fx.speeds._default/2;isVisible=b.is(":visible");animateTo=0;if(!isVisible){b.css("opacity",0).show();animateTo=1}if(c=="hide"&&isVisible||c=="show"&&!isVisible)times--;for(c=0;c<times;c++){b.animate({opacity:animateTo},duration,a.options.easing);animateTo=(animateTo+1)%2}b.animate({opacity:animateTo},duration,
+a.options.easing,function(){animateTo==0&&b.hide();a.callback&&a.callback.apply(this,arguments)});b.queue("fx",function(){b.dequeue()}).dequeue()})}})(jQuery);
+;/*
+ * jQuery UI Effects Scale 1.8.5
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Scale
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(c){c.effects.puff=function(b){return this.queue(function(){var a=c(this),e=c.effects.setMode(a,b.options.mode||"hide"),g=parseInt(b.options.percent,10)||150,h=g/100,i={height:a.height(),width:a.width()};c.extend(b.options,{fade:true,mode:e,percent:e=="hide"?g:100,from:e=="hide"?i:{height:i.height*h,width:i.width*h}});a.effect("scale",b.options,b.duration,b.callback);a.dequeue()})};c.effects.scale=function(b){return this.queue(function(){var a=c(this),e=c.extend(true,{},b.options),g=c.effects.setMode(a,
+b.options.mode||"effect"),h=parseInt(b.options.percent,10)||(parseInt(b.options.percent,10)==0?0:g=="hide"?0:100),i=b.options.direction||"both",f=b.options.origin;if(g!="effect"){e.origin=f||["middle","center"];e.restore=true}f={height:a.height(),width:a.width()};a.from=b.options.from||(g=="show"?{height:0,width:0}:f);h={y:i!="horizontal"?h/100:1,x:i!="vertical"?h/100:1};a.to={height:f.height*h.y,width:f.width*h.x};if(b.options.fade){if(g=="show"){a.from.opacity=0;a.to.opacity=1}if(g=="hide"){a.from.opacity=
+1;a.to.opacity=0}}e.from=a.from;e.to=a.to;e.mode=g;a.effect("size",e,b.duration,b.callback);a.dequeue()})};c.effects.size=function(b){return this.queue(function(){var a=c(this),e=["position","top","left","width","height","overflow","opacity"],g=["position","top","left","overflow","opacity"],h=["width","height","overflow"],i=["fontSize"],f=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"],k=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"],p=c.effects.setMode(a,
+b.options.mode||"effect"),n=b.options.restore||false,m=b.options.scale||"both",l=b.options.origin,j={height:a.height(),width:a.width()};a.from=b.options.from||j;a.to=b.options.to||j;if(l){l=c.effects.getBaseline(l,j);a.from.top=(j.height-a.from.height)*l.y;a.from.left=(j.width-a.from.width)*l.x;a.to.top=(j.height-a.to.height)*l.y;a.to.left=(j.width-a.to.width)*l.x}var d={from:{y:a.from.height/j.height,x:a.from.width/j.width},to:{y:a.to.height/j.height,x:a.to.width/j.width}};if(m=="box"||m=="both"){if(d.from.y!=
+d.to.y){e=e.concat(f);a.from=c.effects.setTransition(a,f,d.from.y,a.from);a.to=c.effects.setTransition(a,f,d.to.y,a.to)}if(d.from.x!=d.to.x){e=e.concat(k);a.from=c.effects.setTransition(a,k,d.from.x,a.from);a.to=c.effects.setTransition(a,k,d.to.x,a.to)}}if(m=="content"||m=="both")if(d.from.y!=d.to.y){e=e.concat(i);a.from=c.effects.setTransition(a,i,d.from.y,a.from);a.to=c.effects.setTransition(a,i,d.to.y,a.to)}c.effects.save(a,n?e:g);a.show();c.effects.createWrapper(a);a.css("overflow","hidden").css(a.from);
+if(m=="content"||m=="both"){f=f.concat(["marginTop","marginBottom"]).concat(i);k=k.concat(["marginLeft","marginRight"]);h=e.concat(f).concat(k);a.find("*[width]").each(function(){child=c(this);n&&c.effects.save(child,h);var o={height:child.height(),width:child.width()};child.from={height:o.height*d.from.y,width:o.width*d.from.x};child.to={height:o.height*d.to.y,width:o.width*d.to.x};if(d.from.y!=d.to.y){child.from=c.effects.setTransition(child,f,d.from.y,child.from);child.to=c.effects.setTransition(child,
+f,d.to.y,child.to)}if(d.from.x!=d.to.x){child.from=c.effects.setTransition(child,k,d.from.x,child.from);child.to=c.effects.setTransition(child,k,d.to.x,child.to)}child.css(child.from);child.animate(child.to,b.duration,b.options.easing,function(){n&&c.effects.restore(child,h)})})}a.animate(a.to,{queue:false,duration:b.duration,easing:b.options.easing,complete:function(){a.to.opacity===0&&a.css("opacity",a.from.opacity);p=="hide"&&a.hide();c.effects.restore(a,n?e:g);c.effects.removeWrapper(a);b.callback&&
+b.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery);
+;/*
+ * jQuery UI Effects Shake 1.8.5
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Shake
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(d){d.effects.shake=function(a){return this.queue(function(){var b=d(this),j=["position","top","left"];d.effects.setMode(b,a.options.mode||"effect");var c=a.options.direction||"left",e=a.options.distance||20,l=a.options.times||3,f=a.duration||a.options.duration||140;d.effects.save(b,j);b.show();d.effects.createWrapper(b);var g=c=="up"||c=="down"?"top":"left",h=c=="up"||c=="left"?"pos":"neg";c={};var i={},k={};c[g]=(h=="pos"?"-=":"+=")+e;i[g]=(h=="pos"?"+=":"-=")+e*2;k[g]=(h=="pos"?"-=":"+=")+
+e*2;b.animate(c,f,a.options.easing);for(e=1;e<l;e++)b.animate(i,f,a.options.easing).animate(k,f,a.options.easing);b.animate(i,f,a.options.easing).animate(c,f/2,a.options.easing,function(){d.effects.restore(b,j);d.effects.removeWrapper(b);a.callback&&a.callback.apply(this,arguments)});b.queue("fx",function(){b.dequeue()});b.dequeue()})}})(jQuery);
+;/*
+ * jQuery UI Effects Slide 1.8.5
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Slide
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(c){c.effects.slide=function(d){return this.queue(function(){var a=c(this),h=["position","top","left"],e=c.effects.setMode(a,d.options.mode||"show"),b=d.options.direction||"left";c.effects.save(a,h);a.show();c.effects.createWrapper(a).css({overflow:"hidden"});var f=b=="up"||b=="down"?"top":"left";b=b=="up"||b=="left"?"pos":"neg";var g=d.options.distance||(f=="top"?a.outerHeight({margin:true}):a.outerWidth({margin:true}));if(e=="show")a.css(f,b=="pos"?-g:g);var i={};i[f]=(e=="show"?b=="pos"?
+"+=":"-=":b=="pos"?"-=":"+=")+g;a.animate(i,{queue:false,duration:d.duration,easing:d.options.easing,complete:function(){e=="hide"&&a.hide();c.effects.restore(a,h);c.effects.removeWrapper(a);d.callback&&d.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery);
+;/*
+ * jQuery UI Effects Transfer 1.8.5
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Transfer
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(e){e.effects.transfer=function(a){return this.queue(function(){var b=e(this),c=e(a.options.to),d=c.offset();c={top:d.top,left:d.left,height:c.innerHeight(),width:c.innerWidth()};d=b.offset();var f=e('<div class="ui-effects-transfer"></div>').appendTo(document.body).addClass(a.options.className).css({top:d.top,left:d.left,height:b.innerHeight(),width:b.innerWidth(),position:"absolute"}).animate(c,a.duration,a.options.easing,function(){f.remove();a.callback&&a.callback.apply(b[0],arguments);
+b.dequeue()})})}})(jQuery);
+;
\ No newline at end of file
diff --git a/data/treeio/treeio/static/js/jquery.ba-serializeobject.js b/data/treeio/treeio/static/js/jquery.ba-serializeobject.js
new file mode 100644
index 0000000..03b905b
--- /dev/null
+++ b/data/treeio/treeio/static/js/jquery.ba-serializeobject.js
@@ -0,0 +1,31 @@
+/*!
+ * jQuery serializeObject - v0.2 - 1/20/2010
+ * http://benalman.com/projects/jquery-misc-plugins/
+ * 
+ * Copyright (c) 2010 "Cowboy" Ben Alman
+ * Dual licensed under the MIT and GPL licenses.
+ * http://benalman.com/about/license/
+ */
+
+// Whereas .serializeArray() serializes a form into an array, .serializeObject()
+// serializes a form into an (arguably more useful) object.
+
+(function($,undefined){
+  '$:nomunge'; // Used by YUI compressor.
+  
+  $.fn.serializeObject = function(){
+    var obj = {};
+    
+    $.each( this.serializeArray(), function(i,o){
+      var n = o.name,
+        v = o.value;
+        
+        obj[n] = obj[n] === undefined ? v
+          : $.isArray( obj[n] ) ? obj[n].concat( v )
+          : [ obj[n], v ];
+    });
+    
+    return obj;
+  };
+  
+})(jQuery);
diff --git a/data/treeio/treeio/static/js/jquery.ganttView.js b/data/treeio/treeio/static/js/jquery.ganttView.js
new file mode 100644
index 0000000..ec2aa21
--- /dev/null
+++ b/data/treeio/treeio/static/js/jquery.ganttView.js
@@ -0,0 +1,440 @@
+/*
+jQuery.ganttView v.0.8.8
+Copyright (c) 2010 JC Grubbs - jc.grubbs@devmynd.com
+MIT License Applies
+*/
+
+/*
+Options
+-----------------
+showWeekends: boolean
+data: object
+cellWidth: number
+cellHeight: number
+slideWidth: number
+dataUrl: string
+behavior: {
+	clickable: boolean,
+	draggable: boolean,
+	resizable: boolean,
+	onClick: function,
+	onDrag: function,
+	onResize: function
+}
+*/
+
+(function (jQuery) {
+	
+    jQuery.fn.ganttView = function () {
+    	
+    	var args = Array.prototype.slice.call(arguments);
+    	
+    	if (args.length == 1 && typeof(args[0]) == "object") {
+        	build.call(this, args[0]);
+    	}
+    	
+    	if (args.length == 2 && typeof(args[0]) == "string") {
+    		handleMethod.call(this, args[0], args[1]);
+    	}
+    };
+    
+    function build(options) {
+    	
+    	var els = this;
+        var defaults = {
+            showWeekends: true,
+            cellWidth: 21,
+            cellHeight: 31,
+            slideWidth: 400,
+            vHeaderWidth: 100,
+            behavior: {
+            	clickable: true,
+            	draggable: true,
+            	resizable: true
+            }
+        };
+        
+        var opts = jQuery.extend(true, defaults, options);
+
+		if (opts.data) {
+			build();
+		} else if (opts.dataUrl) {
+			jQuery.getJSON(opts.dataUrl, function (data) { opts.data = data; build(); });
+		}
+
+		function build() {
+			
+			var minDays = Math.floor((opts.slideWidth / opts.cellWidth)  + 5);
+			var startEnd = DateUtils.getBoundaryDatesFromData(opts.data, minDays);
+			opts.start = startEnd[0];
+			opts.end = startEnd[1];
+			
+	        els.each(function () {
+
+	            var container = jQuery(this);
+	            var div = jQuery("<div>", { "class": "ganttview" });
+	            new Chart(div, opts).render();
+				container.append(div);
+				
+				var w = jQuery("div.ganttview-vtheader", container).outerWidth() +
+					jQuery("div.ganttview-slide-container", container).outerWidth();
+	            container.css("width", (w + 2) + "px");
+	            
+	            new Behavior(container, opts).apply();
+	        });
+		}
+    }
+
+$(window).resize(function () { $("#ganttChart").ganttView("setSlideWidth", $("div.module-block").width() - $('td.module-sidebar').width() - 60); });   
+    
+	function handleMethod(method, value) {
+		
+		if (method == "setSlideWidth") {
+			var div = $("div.ganttview", this);
+			var divchart = $("div#ganttChart", this);
+			div.each(function () {
+				var vtWidth = $("div.ganttview-vtheader", div).outerWidth();
+				$(div).width(value + 1);
+				
+				$("div.ganttview-slide-container", this).width(value - vtWidth);
+				build();
+				
+			});
+			
+			
+		}
+		$('#ganttChart').width(value);
+	}
+
+	var Chart = function(div, opts) {
+		
+		function render() {
+			addVtHeader(div, opts.data, opts.cellHeight);
+
+            var slideDiv = jQuery("<div>", {
+                "class": "ganttview-slide-container",
+                "css": { "width": opts.slideWidth + "px" }
+            });
+			
+            dates = getDates(opts.start, opts.end);
+            addHzHeader(slideDiv, dates, opts.cellWidth);
+            addGrid(slideDiv, opts.data, dates, opts.cellWidth, opts.showWeekends);
+            addBlockContainers(slideDiv, opts.data);
+            addBlocks(slideDiv, opts.data, opts.cellWidth, opts.start);
+            div.append(slideDiv);
+            applyLastClass(div.parent());
+		}
+		
+		var monthNames = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
+
+		// Creates a 3 dimensional array [year][month][day] of every day 
+		// between the given start and end dates
+        function getDates(start, end) {
+            var dates = [];
+			dates[start.getFullYear()] = [];
+			dates[start.getFullYear()][start.getMonth()] = [start]
+			var last = start;
+			while (last.compareTo(end) == -1) {
+				var next = last.clone().addDays(1);
+				if (!dates[next.getFullYear()]) { dates[next.getFullYear()] = []; }
+				if (!dates[next.getFullYear()][next.getMonth()]) { 
+					dates[next.getFullYear()][next.getMonth()] = []; 
+				}
+				dates[next.getFullYear()][next.getMonth()].push(next);
+				last = next;
+			}
+			return dates;
+        }
+
+        function addVtHeader(div, data, cellHeight) {
+            var headerDiv = jQuery("<div>", { "class": "ganttview-vtheader" });
+            for (var i = 0; i < data.length; i++) {
+                var itemDiv = jQuery("<div>", { "class": "ganttview-vtheader-item" });
+                itemDiv.append(jQuery("<div>", {
+                    "class": "ganttview-vtheader-item-name",
+                    "css": { "height": (data[i].series.length * cellHeight) + "px" }
+                }).append(data[i].name));
+                var seriesDiv = jQuery("<div>", { "class": "ganttview-vtheader-series" });
+                var m_start = data[i].start;
+		var m_end = data[i].end;
+		if (typeof m_start !== 'undefined' && m_start !== false &&
+			typeof m_end !== 'undefined' && m_end !== false) {
+			seriesDiv.append(jQuery("<div>", { "class": "ganttview-vtheader-series-name" })
+						.append(''));			
+						itemDiv.append(seriesDiv);
+			
+		}
+		
+                for (var j = 0; j < data[i].series.length; j++) {
+                    seriesDiv.append(jQuery("<div>", { "class": "ganttview-vtheader-series-name" })
+						.append(data[i].series[j].name));
+                }
+                itemDiv.append(seriesDiv);
+                headerDiv.append(itemDiv);
+            }
+            div.append(headerDiv);
+        }
+
+        function addHzHeader(div, dates, cellWidth) {
+            var headerDiv = jQuery("<div>", { "class": "ganttview-hzheader" });
+            var monthsDiv = jQuery("<div>", { "class": "ganttview-hzheader-months" });
+            var daysDiv = jQuery("<div>", { "class": "ganttview-hzheader-days" });
+            var totalW = 0;
+			for (var y in dates) {
+				for (var m in dates[y]) {
+					var w = dates[y][m].length * cellWidth;
+					totalW = totalW + w;
+					monthsDiv.append(jQuery("<div>", {
+						"class": "ganttview-hzheader-month",
+						"css": { "width": (w - 1) + "px" }
+					}).append(monthNames[m] + "/" + y));
+					for (var d in dates[y][m]) {
+						daysDiv.append(jQuery("<div>", { "class": "ganttview-hzheader-day" })
+							.append(dates[y][m][d].getDate()));
+					}
+				}
+			}
+            monthsDiv.css("width", totalW + "px");
+            daysDiv.css("width", totalW + "px");
+            headerDiv.append(monthsDiv).append(daysDiv);
+            div.append(headerDiv);
+        }
+
+        function addGrid(div, data, dates, cellWidth, showWeekends) {
+            var gridDiv = jQuery("<div>", { "class": "ganttview-grid" });
+            var rowDiv = jQuery("<div>", { "class": "ganttview-grid-row" });
+			for (var y in dates) {
+				for (var m in dates[y]) {
+					for (var d in dates[y][m]) {
+						var cellDiv = jQuery("<div>", { "class": "ganttview-grid-row-cell" });
+						if (DateUtils.isWeekend(dates[y][m][d]) && showWeekends) { 
+							cellDiv.addClass("ganttview-weekend"); 
+						}
+						rowDiv.append(cellDiv);
+					}
+				}
+			}
+            var w = jQuery("div.ganttview-grid-row-cell", rowDiv).length * cellWidth;
+            rowDiv.css("width", w + "px");
+            gridDiv.css("width", w + "px");
+            for (var i = 0; i < data.length; i++) {
+		var m_start = data[i].start;
+		var m_end = data[i].end;
+		if (typeof m_start !== 'undefined' && m_start !== false &&
+			typeof m_end !== 'undefined' && m_end !== false) {		
+			gridDiv.append(rowDiv.clone());
+		}
+                for (var j = 0; j < data[i].series.length; j++) {
+                    gridDiv.append(rowDiv.clone());
+                }
+            }
+            div.append(gridDiv);
+        }
+
+        function addBlockContainers(div, data) {
+            var blocksDiv = jQuery("<div>", { "class": "ganttview-blocks" });
+            for (var i = 0; i < data.length; i++) {
+		var m_start = data[i].start;
+		var m_end = data[i].end;
+		if (typeof m_start !== 'undefined' && m_start !== false &&
+			typeof m_end !== 'undefined' && m_end !== false) {		
+			blocksDiv.append(jQuery("<div>", { "class": "ganttview-block-container" }));
+		}
+                for (var j = 0; j < data[i].series.length; j++) {
+                    blocksDiv.append(jQuery("<div>", { "class": "ganttview-block-container" }));
+                }
+            }
+            div.append(blocksDiv);
+        }
+
+        function addBlocks(div, data, cellWidth, start) {
+            var rows = jQuery("div.ganttview-blocks div.ganttview-block-container", div);
+            var rowIdx = 0;
+            for (var i = 0; i < data.length; i++) {
+		var m_start = data[i].start;
+		var m_end = data[i].end;
+		if (typeof m_start !== 'undefined' && m_start !== false &&
+			typeof m_end !== 'undefined' && m_end !== false) {
+			// Milestone has start and end dates
+			var size = DateUtils.daysBetween(m_start, m_end) + 1;
+			var offset = DateUtils.daysBetween(start, m_start);
+			var block = jQuery("<div>", {
+				"class": "ganttview-block",
+				"title": data[i].label + ", " + size + " days",
+				"css": {
+				    "width": ((size * cellWidth) - 9) + "px",
+				    "margin-left": ((offset * cellWidth) + 3) + "px"
+                        }
+                    });
+                    addBlockData(block, data[i], ['']);
+                    if (data[i].color) {
+                        block.css("background-color", data[i].color);
+                    }
+                    block.append(jQuery("<div>", { "class": "ganttview-block-text" }).text(size));
+                    jQuery(rows[rowIdx]).append(block);
+                    rowIdx = rowIdx + 1;
+			
+		}
+                for (var j = 0; j < data[i].series.length; j++) {
+                    var series = data[i].series[j];
+                    var size = DateUtils.daysBetween(series.start, series.end) + 1;
+					var offset = DateUtils.daysBetween(start, series.start);
+					var block = jQuery("<div>", {
+                        "class": "ganttview-block",
+                        "title": series.label + ", " + size + " days",
+                        "css": {
+                            "width": ((size * cellWidth) - 9) + "px",
+                            "margin-left": ((offset * cellWidth) + 3) + "px"
+                        }
+                    });
+                    addBlockData(block, data[i], series);
+                    if (data[i].series[j].color) {
+                        block.css("background-color", data[i].series[j].color);
+                    }
+                    block.append(jQuery("<div>", { "class": "ganttview-block-text" }).text(size));
+                    jQuery(rows[rowIdx]).append(block);
+                    rowIdx = rowIdx + 1;
+                }
+            }
+        }
+        
+        function addBlockData(block, data, series) {
+        	// This allows custom attributes to be added to the series data objects
+        	// and makes them available to the 'data' argument of click, resize, and drag handlers
+        	var blockData = { id: data.id, name: data.name };
+        	jQuery.extend(blockData, series);
+        	block.data("block-data", blockData);
+        }
+
+        function applyLastClass(div) {
+            jQuery("div.ganttview-grid-row div.ganttview-grid-row-cell:last-child", div).addClass("last");
+            jQuery("div.ganttview-hzheader-days div.ganttview-hzheader-day:last-child", div).addClass("last");
+            jQuery("div.ganttview-hzheader-months div.ganttview-hzheader-month:last-child", div).addClass("last");
+        }
+		
+		return {
+			render: render
+		};
+	}
+
+	var Behavior = function (div, opts) {
+		
+		function apply() {
+			
+			if (opts.behavior.clickable) { 
+            	bindBlockClick(div, opts.behavior.onClick); 
+        	}
+        	
+            if (opts.behavior.resizable) { 
+            	bindBlockResize(div, opts.cellWidth, opts.start, opts.behavior.onResize); 
+        	}
+            
+            if (opts.behavior.draggable) { 
+            	bindBlockDrag(div, opts.cellWidth, opts.start, opts.behavior.onDrag); 
+        	}
+		}
+
+        function bindBlockClick(div, callback) {
+            jQuery("div.ganttview-block", div).live("click", function () {
+                if (callback) { callback(jQuery(this).data("block-data")); }
+            });
+        }
+        
+        function bindBlockResize(div, cellWidth, startDate, callback) {
+        	jQuery("div.ganttview-block", div).resizable({
+        		grid: cellWidth, 
+        		handles: "e,w",
+        		stop: function () {
+        			var block = jQuery(this);
+        			updateDataAndPosition(div, block, cellWidth, startDate);
+        			if (callback) { callback(block.data("block-data")); }
+        		}
+        	});
+        }
+        
+        function bindBlockDrag(div, cellWidth, startDate, callback) {
+        	jQuery("div.ganttview-block", div).draggable({
+        		axis: "x", 
+        		grid: [cellWidth, cellWidth],
+        		stop: function () {
+        			var block = jQuery(this);
+        			updateDataAndPosition(div, block, cellWidth, startDate);
+        			if (callback) { callback(block.data("block-data")); }
+        		}
+        	});
+        }
+        
+        function updateDataAndPosition(div, block, cellWidth, startDate) {
+        	var container = jQuery("div.ganttview-slide-container", div);
+        	var scroll = container.scrollLeft();
+			var offset = block.offset().left - container.offset().left - 1 + scroll;
+			
+			// Set new start date
+			var daysFromStart = Math.round(offset / cellWidth);
+			var newStart = startDate.clone().addDays(daysFromStart);
+			block.data("block-data").start = newStart;
+
+			// Set new end date
+        	var width = block.outerWidth();
+			var numberOfDays = Math.round(width / cellWidth) - 1;
+			block.data("block-data").end = newStart.clone().addDays(numberOfDays);
+			jQuery("div.ganttview-block-text", block).text(numberOfDays + 1);
+			
+			// Remove top and left properties to avoid incorrect block positioning,
+        	// set position to relative to keep blocks relative to scrollbar when scrolling
+			block.css("top", "").css("left", "")
+				.css("position", "relative").css("margin-left", offset + "px");
+        }
+        
+        return {
+        	apply: apply	
+        };
+	}
+
+    var ArrayUtils = {
+	
+        contains: function (arr, obj) {
+            var has = false;
+            for (var i = 0; i < arr.length; i++) { if (arr[i] == obj) { has = true; } }
+            return has;
+        }
+    };
+
+    var DateUtils = {
+    	
+        daysBetween: function (start, end) {
+            if (!start || !end) { return 0; }
+            start = Date.parse(start); end = Date.parse(end);
+            if (start.getYear() == 1901 || end.getYear() == 8099) { return 0; }
+            var count = 0, date = start.clone();
+            while (date.compareTo(end) == -1) { count = count + 1; date.addDays(1); }
+            return count;
+        },
+        
+        isWeekend: function (date) {
+            return date.getDay() % 6 == 0;
+        },
+
+		getBoundaryDatesFromData: function (data, minDays) {
+			var minStart = new Date(); maxEnd = new Date();
+			for (var i = 0; i < data.length; i++) {
+				for (var j = 0; j < data[i].series.length; j++) {
+					var start = Date.parse(data[i].series[j].start);
+					var end = Date.parse(data[i].series[j].end)
+					if (i == 0 && j == 0) { minStart = start; maxEnd = end; }
+					if (minStart.compareTo(start) == 1) { minStart = start; }
+					if (maxEnd.compareTo(end) == -1) { maxEnd = end; }
+				}
+			}
+			
+			// Insure that the width of the chart is at least the slide width to avoid empty
+			// whitespace to the right of the grid
+			if (DateUtils.daysBetween(minStart, maxEnd) < minDays) {
+				maxEnd = minStart.clone().addDays(minDays);
+			}
+			
+			return [minStart, maxEnd];
+		}
+    };
+
+})(jQuery);
\ No newline at end of file
diff --git a/data/treeio/treeio/static/js/jquery.gritter.js b/data/treeio/treeio/static/js/jquery.gritter.js
new file mode 100644
index 0000000..811d27d
--- /dev/null
+++ b/data/treeio/treeio/static/js/jquery.gritter.js
@@ -0,0 +1,401 @@
+/*
+ * Gritter for jQuery
+ * http://www.boedesign.com/
+ *
+ * Copyright (c) 2009 Jordan Boesch
+ * Dual licensed under the MIT and GPL licenses.
+ *
+ * Date: December 1, 2009
+ * Version: 1.6
+ */
+
+(function($){
+ 	
+	/**
+	* Set it up as an object under the jQuery namespace
+	*/
+	$.gritter = {};
+	
+	/**
+	* Set up global options that the user can over-ride
+	*/
+	$.gritter.options = {
+		fade_in_speed: 'medium', // how fast notifications fade in
+		fade_out_speed: 1000, // how fast the notices fade out
+		time: 6000 // hang on the screen for...
+	}
+	
+	/**
+	* Add a gritter notification to the screen
+	* @see Gritter#add();
+	*/
+	$.gritter.add = function(params){
+
+		try {
+			return Gritter.add(params || {});
+		} catch(e) {
+		
+			var err = 'Gritter Error: ' + e;
+			(typeof(console) != 'undefined' && console.error) ? 
+				console.error(err, params) : 
+				alert(err);
+				
+		}
+		
+	}
+	
+	/**
+	* Remove a gritter notification from the screen
+	* @see Gritter#removeSpecific();
+	*/
+	$.gritter.remove = function(id, params){
+		Gritter.removeSpecific(id, params || {});
+	}
+	
+	/**
+	* Remove all notifications
+	* @see Gritter#stop();
+	*/
+	$.gritter.removeAll = function(params){
+		Gritter.stop(params || {});
+	}
+	
+	/**
+	* Big fat Gritter object
+	* @constructor (not really since it's object literal)
+	*/
+	var Gritter = {
+	    
+		// Public - options to over-ride with $.gritter.options in "add"
+		fade_in_speed: '',
+		fade_out_speed: '',
+		time: '',
+	    
+		// Private - no touchy the private parts
+		_custom_timer: 0,
+		_item_count: 0,
+		_is_setup: 0,
+		_tpl_close: '<div class="gritter-close"></div>',
+		_tpl_item: '<div id="gritter-item-[[number]]" class="gritter-item-wrapper [[item_class]]" style="display:none"><div class="gritter-top"></div><div class="gritter-item">[[image]]<div class="[[class_name]]"><span class="gritter-title">[[username]]</span><p>[[text]]</p></div><div style="clear:both"></div></div><div class="gritter-bottom"></div></div>',
+		_tpl_wrap: '<div id="gritter-notice-wrapper"></div>',
+	    
+		/**
+		* Add a gritter notification to the screen
+		* @param {Object} params The object that contains all the options for drawing the notification
+		* @return {Integer} The specific numeric id to that gritter notification
+		*/
+		add: function(params){
+	        
+			// We might have some issues if we don't have a title or text!
+			if(!params.title || !params.text){
+				throw 'You need to fill out the first 2 params: "title" and "text"'; 
+			}
+			
+			// Check the options and set them once
+			if(!this._is_setup){
+				this._runSetup();
+			}
+	        
+			// Basics
+			var user = params.title, 
+				text = params.text,
+				image = params.image || '',
+				sticky = params.sticky || false,
+				item_class = params.class_name || '',
+				time_alive = params.time || '';
+			
+			this._verifyWrapper();
+			
+			this._item_count++;
+			var number = this._item_count, 
+				tmp = this._tpl_item;
+			
+			// Assign callbacks
+			$(['before_open', 'after_open', 'before_close', 'after_close']).each(function(i, val){
+				Gritter['_' + val + '_' + number] = ($.isFunction(params[val])) ? params[val] : function(){}
+			});
+
+			// Reset
+			this._custom_timer = 0;
+			
+			// A custom fade time set
+			if(time_alive){
+				this._custom_timer = time_alive;
+			}
+			
+			var image_str = (image != '') ? '<img src="' + image + '" class="gritter-image" />' : '',
+				class_name = (image != '') ? 'gritter-with-image' : 'gritter-without-image';
+			
+			// String replacements on the template
+			tmp = this._str_replace(
+				['[[username]]', '[[text]]', '[[image]]', '[[number]]', '[[class_name]]', '[[item_class]]'],
+				[user, text, image_str, this._item_count, class_name, item_class], tmp
+			);
+	        
+			this['_before_open_' + number]();
+			$('#gritter-notice-wrapper').append(tmp);
+			
+			var item = $('#gritter-item-' + this._item_count);
+			
+			item.fadeIn(this.fade_in_speed, function(){
+				Gritter['_after_open_' + number]($(this));
+			});
+	        
+			if(!sticky){
+				this._setFadeTimer(item, number);
+			}
+			
+			// Bind the hover/unhover states
+			$(item).bind('mouseenter mouseleave', function(event){
+				if(event.type == 'mouseenter'){
+					if(!sticky){ 
+						Gritter._restoreItemIfFading($(this), number);
+					}
+				}
+				else {
+					if(!sticky){
+						Gritter._setFadeTimer($(this), number);
+					}
+				}
+				Gritter._hoverState($(this), event.type);
+			});
+			
+			return number;
+	    
+		},
+		
+		/**
+		* If we don't have any more gritter notifications, get rid of the wrapper using this check
+		* @private
+		* @param {Integer} unique_id The ID of the element that was just deleted, use it for a callback
+		* @param {Object} e The jQuery element that we're going to perform the remove() action on
+		*/
+		_countRemoveWrapper: function(unique_id, e){
+		    
+			// Remove it then run the callback function
+			e.remove();
+			this['_after_close_' + unique_id](e);
+			
+			// Check if the wrapper is empty, if it is.. remove the wrapper
+			if($('.gritter-item-wrapper').length == 0){
+				$('#gritter-notice-wrapper').remove();
+			}
+		
+		},
+		
+		/**
+		* Fade out an element after it's been on the screen for x amount of time
+		* @private
+		* @param {Object} e The jQuery element to get rid of
+		* @param {Integer} unique_id The id of the element to remove
+		* @param {Object} params An optional list of params to set fade speeds etc.
+		* @param {Boolean} unbind_events Unbind the mouseenter/mouseleave events if they click (X)
+		*/
+		_fade: function(e, unique_id, params, unbind_events){
+			
+			var params = params || {},
+				fade = (typeof(params.fade) != 'undefined') ? params.fade : true;
+				fade_out_speed = params.speed || this.fade_out_speed;
+			
+			this['_before_close_' + unique_id](e);
+			
+			// If this is true, then we are coming from clicking the (X)
+			if(unbind_events){
+				e.unbind('mouseenter mouseleave');
+			}
+			
+			// Fade it out or remove it
+			if(fade){
+			
+				e.animate({
+					opacity: 0
+				}, fade_out_speed, function(){
+					e.animate({ height: 0 }, 300, function(){
+						Gritter._countRemoveWrapper(unique_id, e);
+					})
+				})
+				
+			}
+			else {
+				
+				this._countRemoveWrapper(unique_id, e);
+				
+			}
+					    
+		},
+		
+		/**
+		* Perform actions based on the type of bind (mouseenter, mouseleave) 
+		* @private
+		* @param {Object} e The jQuery element
+		* @param {String} type The type of action we're performing: mouseenter or mouseleave
+		*/
+		_hoverState: function(e, type){
+			
+			// Change the border styles and add the (X) close button when you hover
+			if(type == 'mouseenter'){
+		    	
+				e.addClass('hover');
+				var find_img = e.find('img');
+		    	
+				// Insert the close button before what element
+				(find_img.length) ? 
+					find_img.before(this._tpl_close) : 
+					e.find('span').before(this._tpl_close);
+				
+				// Clicking (X) makes the perdy thing close
+				e.find('.gritter-close').click(function(){
+				
+					var unique_id = e.attr('id').split('-')[2];
+					Gritter.removeSpecific(unique_id, {}, e, true);
+					
+				});
+			
+			}
+			// Remove the border styles and (X) close button when you mouse out
+			else {
+				
+				e.removeClass('hover');
+				e.find('.gritter-close').remove();
+				
+			}
+		    
+		},
+		
+		/**
+		* Remove a specific notification based on an ID
+		* @param {Integer} unique_id The ID used to delete a specific notification
+		* @param {Object} params A set of options passed in to determine how to get rid of it
+		* @param {Object} e The jQuery element that we're "fading" then removing
+		* @param {Boolean} unbind_events If we clicked on the (X) we set this to true to unbind mouseenter/mouseleave
+		*/
+		removeSpecific: function(unique_id, params, e, unbind_events){
+			
+			if(!e){
+				var e = $('#gritter-item-' + unique_id);
+			}
+			
+			// We set the fourth param to let the _fade function know to 
+			// unbind the "mouseleave" event.  Once you click (X) there's no going back!
+			this._fade(e, unique_id, params || {}, unbind_events);
+			
+		},
+		
+		/**
+		* If the item is fading out and we hover over it, restore it!
+		* @private
+		* @param {Object} e The HTML element to remove
+		* @param {Integer} unique_id The ID of the element
+		*/
+		_restoreItemIfFading: function(e, unique_id){
+			
+			clearTimeout(this['_int_id_' + unique_id]);
+			e.stop().css({ opacity: '' });
+		    
+		},
+		
+		/**
+		* Setup the global options - only once
+		* @private
+		*/
+		_runSetup: function(){
+		
+			for(opt in $.gritter.options){
+				this[opt] = $.gritter.options[opt];
+			}
+			this._is_setup = 1;
+		    
+		},
+		
+		/**
+		* Set the notification to fade out after a certain amount of time
+		* @private
+		* @param {Object} item The HTML element we're dealing with
+		* @param {Integer} unique_id The ID of the element
+		*/
+		_setFadeTimer: function(e, unique_id){
+			
+			var timer_str = (this._custom_timer) ? this._custom_timer : this.time;
+			this['_int_id_' + unique_id] = setTimeout(function(){ 
+				Gritter._fade(e, unique_id); 
+			}, timer_str);
+		
+		},
+		
+		/**
+		* Bring everything to a halt
+		* @param {Object} params A list of callback functions to pass when all notifications are removed
+		*/  
+		stop: function(params){
+			
+			// callbacks (if passed)
+			var before_close = ($.isFunction(params.before_close)) ? params.before_close : function(){};
+			var after_close = ($.isFunction(params.after_close)) ? params.after_close : function(){};
+			
+			var wrap = $('#gritter-notice-wrapper');
+			before_close(wrap);
+			wrap.fadeOut(function(){
+				$(this).remove();
+				after_close();
+			});
+		
+		},
+		
+		/**
+		* An extremely handy PHP function ported to JS, works well for templating
+		* @private
+		* @param {String/Array} search A list of things to search for
+		* @param {String/Array} replace A list of things to replace the searches with
+		* @return {String} sa The output
+		*/  
+		_str_replace: function(search, replace, subject, count){
+		
+			var i = 0, j = 0, temp = '', repl = '', sl = 0, fl = 0,
+				f = [].concat(search),
+				r = [].concat(replace),
+				s = subject,
+				ra = r instanceof Array, sa = s instanceof Array;
+			s = [].concat(s);
+			
+			if(count){
+				this.window[count] = 0;
+			}
+		
+			for(i = 0, sl = s.length; i < sl; i++){
+				
+				if(s[i] === ''){
+					continue;
+				}
+				
+		        for (j = 0, fl = f.length; j < fl; j++){
+					
+					temp = s[i] + '';
+					repl = ra ? (r[j] !== undefined ? r[j] : '') : r[0];
+					s[i] = (temp).split(f[j]).join(repl);
+					
+					if(count && s[i] !== temp){
+						this.window[count] += (temp.length-s[i].length) / f[j].length;
+					}
+					
+				}
+			}
+			
+			return sa ? s : s[0];
+		    
+		},
+		
+		/**
+		* A check to make sure we have something to wrap our notices with
+		* @private
+		*/  
+		_verifyWrapper: function(){
+		  
+			if($('#gritter-notice-wrapper').length == 0){
+				$('body').append(this._tpl_wrap);
+			}
+		
+		}
+	    
+	}
+	
+})(jQuery);
diff --git a/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/advimage/js/image.js b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/advimage/js/image.js
new file mode 100644
index 0000000..02495fb
--- /dev/null
+++ b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/advimage/js/image.js
@@ -0,0 +1,464 @@
+var ImageDialog = {
+	preInit : function() {
+		var url;
+
+		tinyMCEPopup.requireLangPack();
+
+		if (url = tinyMCEPopup.getParam("external_image_list_url"))
+			document.write('<script language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');
+	},
+
+	init : function(ed) {
+		var f = document.forms[0], nl = f.elements, ed = tinyMCEPopup.editor, dom = ed.dom, n = ed.selection.getNode(), fl = tinyMCEPopup.getParam('external_image_list', 'tinyMCEImageList');
+
+		tinyMCEPopup.resizeToInnerSize();
+		this.fillClassList('class_list');
+		this.fillFileList('src_list', fl);
+		this.fillFileList('over_list', fl);
+		this.fillFileList('out_list', fl);
+		TinyMCE_EditableSelects.init();
+
+		if (n.nodeName == 'IMG') {
+			nl.src.value = dom.getAttrib(n, 'src');
+			nl.width.value = dom.getAttrib(n, 'width');
+			nl.height.value = dom.getAttrib(n, 'height');
+			nl.alt.value = dom.getAttrib(n, 'alt');
+			nl.title.value = dom.getAttrib(n, 'title');
+			nl.vspace.value = this.getAttrib(n, 'vspace');
+			nl.hspace.value = this.getAttrib(n, 'hspace');
+			nl.border.value = this.getAttrib(n, 'border');
+			selectByValue(f, 'align', this.getAttrib(n, 'align'));
+			selectByValue(f, 'class_list', dom.getAttrib(n, 'class'), true, true);
+			nl.style.value = dom.getAttrib(n, 'style');
+			nl.id.value = dom.getAttrib(n, 'id');
+			nl.dir.value = dom.getAttrib(n, 'dir');
+			nl.lang.value = dom.getAttrib(n, 'lang');
+			nl.usemap.value = dom.getAttrib(n, 'usemap');
+			nl.longdesc.value = dom.getAttrib(n, 'longdesc');
+			nl.insert.value = ed.getLang('update');
+
+			if (/^\s*this.src\s*=\s*\'([^\']+)\';?\s*$/.test(dom.getAttrib(n, 'onmouseover')))
+				nl.onmouseoversrc.value = dom.getAttrib(n, 'onmouseover').replace(/^\s*this.src\s*=\s*\'([^\']+)\';?\s*$/, '$1');
+
+			if (/^\s*this.src\s*=\s*\'([^\']+)\';?\s*$/.test(dom.getAttrib(n, 'onmouseout')))
+				nl.onmouseoutsrc.value = dom.getAttrib(n, 'onmouseout').replace(/^\s*this.src\s*=\s*\'([^\']+)\';?\s*$/, '$1');
+
+			if (ed.settings.inline_styles) {
+				// Move attribs to styles
+				if (dom.getAttrib(n, 'align'))
+					this.updateStyle('align');
+
+				if (dom.getAttrib(n, 'hspace'))
+					this.updateStyle('hspace');
+
+				if (dom.getAttrib(n, 'border'))
+					this.updateStyle('border');
+
+				if (dom.getAttrib(n, 'vspace'))
+					this.updateStyle('vspace');
+			}
+		}
+
+		// Setup browse button
+		document.getElementById('srcbrowsercontainer').innerHTML = getBrowserHTML('srcbrowser','src','image','theme_advanced_image');
+		if (isVisible('srcbrowser'))
+			document.getElementById('src').style.width = '260px';
+
+		// Setup browse button
+		document.getElementById('onmouseoversrccontainer').innerHTML = getBrowserHTML('overbrowser','onmouseoversrc','image','theme_advanced_image');
+		if (isVisible('overbrowser'))
+			document.getElementById('onmouseoversrc').style.width = '260px';
+
+		// Setup browse button
+		document.getElementById('onmouseoutsrccontainer').innerHTML = getBrowserHTML('outbrowser','onmouseoutsrc','image','theme_advanced_image');
+		if (isVisible('outbrowser'))
+			document.getElementById('onmouseoutsrc').style.width = '260px';
+
+		// If option enabled default contrain proportions to checked
+		if (ed.getParam("advimage_constrain_proportions", true))
+			f.constrain.checked = true;
+
+		// Check swap image if valid data
+		if (nl.onmouseoversrc.value || nl.onmouseoutsrc.value)
+			this.setSwapImage(true);
+		else
+			this.setSwapImage(false);
+
+		this.changeAppearance();
+		this.showPreviewImage(nl.src.value, 1);
+	},
+
+	insert : function(file, title) {
+		var ed = tinyMCEPopup.editor, t = this, f = document.forms[0];
+
+		if (f.src.value === '') {
+			if (ed.selection.getNode().nodeName == 'IMG') {
+				ed.dom.remove(ed.selection.getNode());
+				ed.execCommand('mceRepaint');
+			}
+
+			tinyMCEPopup.close();
+			return;
+		}
+
+		if (tinyMCEPopup.getParam("accessibility_warnings", 1)) {
+			if (!f.alt.value) {
+				tinyMCEPopup.confirm(tinyMCEPopup.getLang('advimage_dlg.missing_alt'), function(s) {
+					if (s)
+						t.insertAndClose();
+				});
+
+				return;
+			}
+		}
+
+		t.insertAndClose();
+	},
+
+	insertAndClose : function() {
+		var ed = tinyMCEPopup.editor, f = document.forms[0], nl = f.elements, v, args = {}, el;
+
+		tinyMCEPopup.restoreSelection();
+
+		// Fixes crash in Safari
+		if (tinymce.isWebKit)
+			ed.getWin().focus();
+
+		if (!ed.settings.inline_styles) {
+			args = {
+				vspace : nl.vspace.value,
+				hspace : nl.hspace.value,
+				border : nl.border.value,
+				align : getSelectValue(f, 'align')
+			};
+		} else {
+			// Remove deprecated values
+			args = {
+				vspace : '',
+				hspace : '',
+				border : '',
+				align : ''
+			};
+		}
+
+		tinymce.extend(args, {
+			src : nl.src.value.replace(/ /g, '%20'),
+			width : nl.width.value,
+			height : nl.height.value,
+			alt : nl.alt.value,
+			title : nl.title.value,
+			'class' : getSelectValue(f, 'class_list'),
+			style : nl.style.value,
+			id : nl.id.value,
+			dir : nl.dir.value,
+			lang : nl.lang.value,
+			usemap : nl.usemap.value,
+			longdesc : nl.longdesc.value
+		});
+
+		args.onmouseover = args.onmouseout = '';
+
+		if (f.onmousemovecheck.checked) {
+			if (nl.onmouseoversrc.value)
+				args.onmouseover = "this.src='" + nl.onmouseoversrc.value + "';";
+
+			if (nl.onmouseoutsrc.value)
+				args.onmouseout = "this.src='" + nl.onmouseoutsrc.value + "';";
+		}
+
+		el = ed.selection.getNode();
+
+		if (el && el.nodeName == 'IMG') {
+			ed.dom.setAttribs(el, args);
+		} else {
+			tinymce.each(args, function(value, name) {
+				if (value === "") {
+					delete args[name];
+				}
+			});
+
+			ed.execCommand('mceInsertContent', false, tinyMCEPopup.editor.dom.createHTML('img', args), {skip_undo : 1});
+			ed.undoManager.add();
+		}
+
+		tinyMCEPopup.editor.execCommand('mceRepaint');
+		tinyMCEPopup.editor.focus();
+		tinyMCEPopup.close();
+	},
+
+	getAttrib : function(e, at) {
+		var ed = tinyMCEPopup.editor, dom = ed.dom, v, v2;
+
+		if (ed.settings.inline_styles) {
+			switch (at) {
+				case 'align':
+					if (v = dom.getStyle(e, 'float'))
+						return v;
+
+					if (v = dom.getStyle(e, 'vertical-align'))
+						return v;
+
+					break;
+
+				case 'hspace':
+					v = dom.getStyle(e, 'margin-left')
+					v2 = dom.getStyle(e, 'margin-right');
+
+					if (v && v == v2)
+						return parseInt(v.replace(/[^0-9]/g, ''));
+
+					break;
+
+				case 'vspace':
+					v = dom.getStyle(e, 'margin-top')
+					v2 = dom.getStyle(e, 'margin-bottom');
+					if (v && v == v2)
+						return parseInt(v.replace(/[^0-9]/g, ''));
+
+					break;
+
+				case 'border':
+					v = 0;
+
+					tinymce.each(['top', 'right', 'bottom', 'left'], function(sv) {
+						sv = dom.getStyle(e, 'border-' + sv + '-width');
+
+						// False or not the same as prev
+						if (!sv || (sv != v && v !== 0)) {
+							v = 0;
+							return false;
+						}
+
+						if (sv)
+							v = sv;
+					});
+
+					if (v)
+						return parseInt(v.replace(/[^0-9]/g, ''));
+
+					break;
+			}
+		}
+
+		if (v = dom.getAttrib(e, at))
+			return v;
+
+		return '';
+	},
+
+	setSwapImage : function(st) {
+		var f = document.forms[0];
+
+		f.onmousemovecheck.checked = st;
+		setBrowserDisabled('overbrowser', !st);
+		setBrowserDisabled('outbrowser', !st);
+
+		if (f.over_list)
+			f.over_list.disabled = !st;
+
+		if (f.out_list)
+			f.out_list.disabled = !st;
+
+		f.onmouseoversrc.disabled = !st;
+		f.onmouseoutsrc.disabled  = !st;
+	},
+
+	fillClassList : function(id) {
+		var dom = tinyMCEPopup.dom, lst = dom.get(id), v, cl;
+
+		if (v = tinyMCEPopup.getParam('theme_advanced_styles')) {
+			cl = [];
+
+			tinymce.each(v.split(';'), function(v) {
+				var p = v.split('=');
+
+				cl.push({'title' : p[0], 'class' : p[1]});
+			});
+		} else
+			cl = tinyMCEPopup.editor.dom.getClasses();
+
+		if (cl.length > 0) {
+			lst.options.length = 0;
+			lst.options[lst.options.length] = new Option(tinyMCEPopup.getLang('not_set'), '');
+
+			tinymce.each(cl, function(o) {
+				lst.options[lst.options.length] = new Option(o.title || o['class'], o['class']);
+			});
+		} else
+			dom.remove(dom.getParent(id, 'tr'));
+	},
+
+	fillFileList : function(id, l) {
+		var dom = tinyMCEPopup.dom, lst = dom.get(id), v, cl;
+
+		l = typeof(l) === 'function' ? l() : window[l];
+		lst.options.length = 0;
+
+		if (l && l.length > 0) {
+			lst.options[lst.options.length] = new Option('', '');
+
+			tinymce.each(l, function(o) {
+				lst.options[lst.options.length] = new Option(o[0], o[1]);
+			});
+		} else
+			dom.remove(dom.getParent(id, 'tr'));
+	},
+
+	resetImageData : function() {
+		var f = document.forms[0];
+
+		f.elements.width.value = f.elements.height.value = '';
+	},
+
+	updateImageData : function(img, st) {
+		var f = document.forms[0];
+
+		if (!st) {
+			f.elements.width.value = img.width;
+			f.elements.height.value = img.height;
+		}
+
+		this.preloadImg = img;
+	},
+
+	changeAppearance : function() {
+		var ed = tinyMCEPopup.editor, f = document.forms[0], img = document.getElementById('alignSampleImg');
+
+		if (img) {
+			if (ed.getParam('inline_styles')) {
+				ed.dom.setAttrib(img, 'style', f.style.value);
+			} else {
+				img.align = f.align.value;
+				img.border = f.border.value;
+				img.hspace = f.hspace.value;
+				img.vspace = f.vspace.value;
+			}
+		}
+	},
+
+	changeHeight : function() {
+		var f = document.forms[0], tp, t = this;
+
+		if (!f.constrain.checked || !t.preloadImg) {
+			return;
+		}
+
+		if (f.width.value == "" || f.height.value == "")
+			return;
+
+		tp = (parseInt(f.width.value) / parseInt(t.preloadImg.width)) * t.preloadImg.height;
+		f.height.value = tp.toFixed(0);
+	},
+
+	changeWidth : function() {
+		var f = document.forms[0], tp, t = this;
+
+		if (!f.constrain.checked || !t.preloadImg) {
+			return;
+		}
+
+		if (f.width.value == "" || f.height.value == "")
+			return;
+
+		tp = (parseInt(f.height.value) / parseInt(t.preloadImg.height)) * t.preloadImg.width;
+		f.width.value = tp.toFixed(0);
+	},
+
+	updateStyle : function(ty) {
+		var dom = tinyMCEPopup.dom, b, bStyle, bColor, v, isIE = tinymce.isIE, f = document.forms[0], img = dom.create('img', {style : dom.get('style').value});
+
+		if (tinyMCEPopup.editor.settings.inline_styles) {
+			// Handle align
+			if (ty == 'align') {
+				dom.setStyle(img, 'float', '');
+				dom.setStyle(img, 'vertical-align', '');
+
+				v = getSelectValue(f, 'align');
+				if (v) {
+					if (v == 'left' || v == 'right')
+						dom.setStyle(img, 'float', v);
+					else
+						img.style.verticalAlign = v;
+				}
+			}
+
+			// Handle border
+			if (ty == 'border') {
+				b = img.style.border ? img.style.border.split(' ') : [];
+				bStyle = dom.getStyle(img, 'border-style');
+				bColor = dom.getStyle(img, 'border-color');
+
+				dom.setStyle(img, 'border', '');
+
+				v = f.border.value;
+				if (v || v == '0') {
+					if (v == '0')
+						img.style.border = isIE ? '0' : '0 none none';
+					else {
+						var isOldIE = tinymce.isIE && (!document.documentMode || document.documentMode < 9);
+
+						if (b.length == 3 && b[isOldIE ? 2 : 1])
+							bStyle = b[isOldIE ? 2 : 1];
+						else if (!bStyle || bStyle == 'none')
+							bStyle = 'solid';
+						if (b.length == 3 && b[isIE ? 0 : 2])
+							bColor = b[isOldIE ? 0 : 2];
+						else if (!bColor || bColor == 'none')
+							bColor = 'black';
+						img.style.border = v + 'px ' + bStyle + ' ' + bColor;
+					}
+				}
+			}
+
+			// Handle hspace
+			if (ty == 'hspace') {
+				dom.setStyle(img, 'marginLeft', '');
+				dom.setStyle(img, 'marginRight', '');
+
+				v = f.hspace.value;
+				if (v) {
+					img.style.marginLeft = v + 'px';
+					img.style.marginRight = v + 'px';
+				}
+			}
+
+			// Handle vspace
+			if (ty == 'vspace') {
+				dom.setStyle(img, 'marginTop', '');
+				dom.setStyle(img, 'marginBottom', '');
+
+				v = f.vspace.value;
+				if (v) {
+					img.style.marginTop = v + 'px';
+					img.style.marginBottom = v + 'px';
+				}
+			}
+
+			// Merge
+			dom.get('style').value = dom.serializeStyle(dom.parseStyle(img.style.cssText), 'img');
+		}
+	},
+
+	changeMouseMove : function() {
+	},
+
+	showPreviewImage : function(u, st) {
+		if (!u) {
+			tinyMCEPopup.dom.setHTML('prev', '');
+			return;
+		}
+
+		if (!st && tinyMCEPopup.getParam("advimage_update_dimensions_onchange", true))
+			this.resetImageData();
+
+		u = tinyMCEPopup.editor.documentBaseURI.toAbsolute(u);
+
+		if (!st)
+			tinyMCEPopup.dom.setHTML('prev', '<img id="previewImg" src="' + u + '" border="0" onload="ImageDialog.updateImageData(this);" onerror="ImageDialog.resetImageData();" />');
+		else
+			tinyMCEPopup.dom.setHTML('prev', '<img id="previewImg" src="' + u + '" border="0" onload="ImageDialog.updateImageData(this, 1);" />');
+	}
+};
+
+ImageDialog.preInit();
+tinyMCEPopup.onInit.add(ImageDialog.init, ImageDialog);
diff --git a/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/advlink/js/advlink.js b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/advlink/js/advlink.js
new file mode 100644
index 0000000..5bf8070
--- /dev/null
+++ b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/advlink/js/advlink.js
@@ -0,0 +1,543 @@
+/* Functions for the advlink plugin popup */
+
+tinyMCEPopup.requireLangPack();
+
+var templates = {
+	"window.open" : "window.open('${url}','${target}','${options}')"
+};
+
+function preinit() {
+	var url;
+
+	if (url = tinyMCEPopup.getParam("external_link_list_url"))
+		document.write('<script language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');
+}
+
+function changeClass() {
+	var f = document.forms[0];
+
+	f.classes.value = getSelectValue(f, 'classlist');
+}
+
+function init() {
+	tinyMCEPopup.resizeToInnerSize();
+
+	var formObj = document.forms[0];
+	var inst = tinyMCEPopup.editor;
+	var elm = inst.selection.getNode();
+	var action = "insert";
+	var html;
+
+	document.getElementById('hrefbrowsercontainer').innerHTML = getBrowserHTML('hrefbrowser','href','file','advlink');
+	document.getElementById('popupurlbrowsercontainer').innerHTML = getBrowserHTML('popupurlbrowser','popupurl','file','advlink');
+	document.getElementById('targetlistcontainer').innerHTML = getTargetListHTML('targetlist','target');
+
+	// Link list
+	html = getLinkListHTML('linklisthref','href');
+	if (html == "")
+		document.getElementById("linklisthrefrow").style.display = 'none';
+	else
+		document.getElementById("linklisthrefcontainer").innerHTML = html;
+
+	// Anchor list
+	html = getAnchorListHTML('anchorlist','href');
+	if (html == "")
+		document.getElementById("anchorlistrow").style.display = 'none';
+	else
+		document.getElementById("anchorlistcontainer").innerHTML = html;
+
+	// Resize some elements
+	if (isVisible('hrefbrowser'))
+		document.getElementById('href').style.width = '260px';
+
+	if (isVisible('popupurlbrowser'))
+		document.getElementById('popupurl').style.width = '180px';
+
+	elm = inst.dom.getParent(elm, "A");
+	if (elm == null) {
+		var prospect = inst.dom.create("p", null, inst.selection.getContent());
+		if (prospect.childNodes.length === 1) {
+			elm = prospect.firstChild;
+		}
+	}
+
+	if (elm != null && elm.nodeName == "A")
+		action = "update";
+
+	formObj.insert.value = tinyMCEPopup.getLang(action, 'Insert', true);
+
+	setPopupControlsDisabled(true);
+
+	if (action == "update") {
+		var href = inst.dom.getAttrib(elm, 'href');
+		var onclick = inst.dom.getAttrib(elm, 'onclick');
+		var linkTarget = inst.dom.getAttrib(elm, 'target') ? inst.dom.getAttrib(elm, 'target') : "_self";
+
+		// Setup form data
+		setFormValue('href', href);
+		setFormValue('title', inst.dom.getAttrib(elm, 'title'));
+		setFormValue('id', inst.dom.getAttrib(elm, 'id'));
+		setFormValue('style', inst.dom.getAttrib(elm, "style"));
+		setFormValue('rel', inst.dom.getAttrib(elm, 'rel'));
+		setFormValue('rev', inst.dom.getAttrib(elm, 'rev'));
+		setFormValue('charset', inst.dom.getAttrib(elm, 'charset'));
+		setFormValue('hreflang', inst.dom.getAttrib(elm, 'hreflang'));
+		setFormValue('dir', inst.dom.getAttrib(elm, 'dir'));
+		setFormValue('lang', inst.dom.getAttrib(elm, 'lang'));
+		setFormValue('tabindex', inst.dom.getAttrib(elm, 'tabindex', typeof(elm.tabindex) != "undefined" ? elm.tabindex : ""));
+		setFormValue('accesskey', inst.dom.getAttrib(elm, 'accesskey', typeof(elm.accesskey) != "undefined" ? elm.accesskey : ""));
+		setFormValue('type', inst.dom.getAttrib(elm, 'type'));
+		setFormValue('onfocus', inst.dom.getAttrib(elm, 'onfocus'));
+		setFormValue('onblur', inst.dom.getAttrib(elm, 'onblur'));
+		setFormValue('onclick', onclick);
+		setFormValue('ondblclick', inst.dom.getAttrib(elm, 'ondblclick'));
+		setFormValue('onmousedown', inst.dom.getAttrib(elm, 'onmousedown'));
+		setFormValue('onmouseup', inst.dom.getAttrib(elm, 'onmouseup'));
+		setFormValue('onmouseover', inst.dom.getAttrib(elm, 'onmouseover'));
+		setFormValue('onmousemove', inst.dom.getAttrib(elm, 'onmousemove'));
+		setFormValue('onmouseout', inst.dom.getAttrib(elm, 'onmouseout'));
+		setFormValue('onkeypress', inst.dom.getAttrib(elm, 'onkeypress'));
+		setFormValue('onkeydown', inst.dom.getAttrib(elm, 'onkeydown'));
+		setFormValue('onkeyup', inst.dom.getAttrib(elm, 'onkeyup'));
+		setFormValue('target', linkTarget);
+		setFormValue('classes', inst.dom.getAttrib(elm, 'class'));
+
+		// Parse onclick data
+		if (onclick != null && onclick.indexOf('window.open') != -1)
+			parseWindowOpen(onclick);
+		else
+			parseFunction(onclick);
+
+		// Select by the values
+		selectByValue(formObj, 'dir', inst.dom.getAttrib(elm, 'dir'));
+		selectByValue(formObj, 'rel', inst.dom.getAttrib(elm, 'rel'));
+		selectByValue(formObj, 'rev', inst.dom.getAttrib(elm, 'rev'));
+		selectByValue(formObj, 'linklisthref', href);
+
+		if (href.charAt(0) == '#')
+			selectByValue(formObj, 'anchorlist', href);
+
+		addClassesToList('classlist', 'advlink_styles');
+
+		selectByValue(formObj, 'classlist', inst.dom.getAttrib(elm, 'class'), true);
+		selectByValue(formObj, 'targetlist', linkTarget, true);
+	} else
+		addClassesToList('classlist', 'advlink_styles');
+}
+
+function checkPrefix(n) {
+	if (n.value && Validator.isEmail(n) && !/^\s*mailto:/i.test(n.value) && confirm(tinyMCEPopup.getLang('advlink_dlg.is_email')))
+		n.value = 'mailto:' + n.value;
+
+	if (/^\s*www\./i.test(n.value) && confirm(tinyMCEPopup.getLang('advlink_dlg.is_external')))
+		n.value = 'http://' + n.value;
+}
+
+function setFormValue(name, value) {
+	document.forms[0].elements[name].value = value;
+}
+
+function parseWindowOpen(onclick) {
+	var formObj = document.forms[0];
+
+	// Preprocess center code
+	if (onclick.indexOf('return false;') != -1) {
+		formObj.popupreturn.checked = true;
+		onclick = onclick.replace('return false;', '');
+	} else
+		formObj.popupreturn.checked = false;
+
+	var onClickData = parseLink(onclick);
+
+	if (onClickData != null) {
+		formObj.ispopup.checked = true;
+		setPopupControlsDisabled(false);
+
+		var onClickWindowOptions = parseOptions(onClickData['options']);
+		var url = onClickData['url'];
+
+		formObj.popupname.value = onClickData['target'];
+		formObj.popupurl.value = url;
+		formObj.popupwidth.value = getOption(onClickWindowOptions, 'width');
+		formObj.popupheight.value = getOption(onClickWindowOptions, 'height');
+
+		formObj.popupleft.value = getOption(onClickWindowOptions, 'left');
+		formObj.popuptop.value = getOption(onClickWindowOptions, 'top');
+
+		if (formObj.popupleft.value.indexOf('screen') != -1)
+			formObj.popupleft.value = "c";
+
+		if (formObj.popuptop.value.indexOf('screen') != -1)
+			formObj.popuptop.value = "c";
+
+		formObj.popuplocation.checked = getOption(onClickWindowOptions, 'location') == "yes";
+		formObj.popupscrollbars.checked = getOption(onClickWindowOptions, 'scrollbars') == "yes";
+		formObj.popupmenubar.checked = getOption(onClickWindowOptions, 'menubar') == "yes";
+		formObj.popupresizable.checked = getOption(onClickWindowOptions, 'resizable') == "yes";
+		formObj.popuptoolbar.checked = getOption(onClickWindowOptions, 'toolbar') == "yes";
+		formObj.popupstatus.checked = getOption(onClickWindowOptions, 'status') == "yes";
+		formObj.popupdependent.checked = getOption(onClickWindowOptions, 'dependent') == "yes";
+
+		buildOnClick();
+	}
+}
+
+function parseFunction(onclick) {
+	var formObj = document.forms[0];
+	var onClickData = parseLink(onclick);
+
+	// TODO: Add stuff here
+}
+
+function getOption(opts, name) {
+	return typeof(opts[name]) == "undefined" ? "" : opts[name];
+}
+
+function setPopupControlsDisabled(state) {
+	var formObj = document.forms[0];
+
+	formObj.popupname.disabled = state;
+	formObj.popupurl.disabled = state;
+	formObj.popupwidth.disabled = state;
+	formObj.popupheight.disabled = state;
+	formObj.popupleft.disabled = state;
+	formObj.popuptop.disabled = state;
+	formObj.popuplocation.disabled = state;
+	formObj.popupscrollbars.disabled = state;
+	formObj.popupmenubar.disabled = state;
+	formObj.popupresizable.disabled = state;
+	formObj.popuptoolbar.disabled = state;
+	formObj.popupstatus.disabled = state;
+	formObj.popupreturn.disabled = state;
+	formObj.popupdependent.disabled = state;
+
+	setBrowserDisabled('popupurlbrowser', state);
+}
+
+function parseLink(link) {
+	link = link.replace(new RegExp('&#39;', 'g'), "'");
+
+	var fnName = link.replace(new RegExp("\\s*([A-Za-z0-9\.]*)\\s*\\(.*", "gi"), "$1");
+
+	// Is function name a template function
+	var template = templates[fnName];
+	if (template) {
+		// Build regexp
+		var variableNames = template.match(new RegExp("'?\\$\\{[A-Za-z0-9\.]*\\}'?", "gi"));
+		var regExp = "\\s*[A-Za-z0-9\.]*\\s*\\(";
+		var replaceStr = "";
+		for (var i=0; i<variableNames.length; i++) {
+			// Is string value
+			if (variableNames[i].indexOf("'${") != -1)
+				regExp += "'(.*)'";
+			else // Number value
+				regExp += "([0-9]*)";
+
+			replaceStr += "$" + (i+1);
+
+			// Cleanup variable name
+			variableNames[i] = variableNames[i].replace(new RegExp("[^A-Za-z0-9]", "gi"), "");
+
+			if (i != variableNames.length-1) {
+				regExp += "\\s*,\\s*";
+				replaceStr += "<delim>";
+			} else
+				regExp += ".*";
+		}
+
+		regExp += "\\);?";
+
+		// Build variable array
+		var variables = [];
+		variables["_function"] = fnName;
+		var variableValues = link.replace(new RegExp(regExp, "gi"), replaceStr).split('<delim>');
+		for (var i=0; i<variableNames.length; i++)
+			variables[variableNames[i]] = variableValues[i];
+
+		return variables;
+	}
+
+	return null;
+}
+
+function parseOptions(opts) {
+	if (opts == null || opts == "")
+		return [];
+
+	// Cleanup the options
+	opts = opts.toLowerCase();
+	opts = opts.replace(/;/g, ",");
+	opts = opts.replace(/[^0-9a-z=,]/g, "");
+
+	var optionChunks = opts.split(',');
+	var options = [];
+
+	for (var i=0; i<optionChunks.length; i++) {
+		var parts = optionChunks[i].split('=');
+
+		if (parts.length == 2)
+			options[parts[0]] = parts[1];
+	}
+
+	return options;
+}
+
+function buildOnClick() {
+	var formObj = document.forms[0];
+
+	if (!formObj.ispopup.checked) {
+		formObj.onclick.value = "";
+		return;
+	}
+
+	var onclick = "window.open('";
+	var url = formObj.popupurl.value;
+
+	onclick += url + "','";
+	onclick += formObj.popupname.value + "','";
+
+	if (formObj.popuplocation.checked)
+		onclick += "location=yes,";
+
+	if (formObj.popupscrollbars.checked)
+		onclick += "scrollbars=yes,";
+
+	if (formObj.popupmenubar.checked)
+		onclick += "menubar=yes,";
+
+	if (formObj.popupresizable.checked)
+		onclick += "resizable=yes,";
+
+	if (formObj.popuptoolbar.checked)
+		onclick += "toolbar=yes,";
+
+	if (formObj.popupstatus.checked)
+		onclick += "status=yes,";
+
+	if (formObj.popupdependent.checked)
+		onclick += "dependent=yes,";
+
+	if (formObj.popupwidth.value != "")
+		onclick += "width=" + formObj.popupwidth.value + ",";
+
+	if (formObj.popupheight.value != "")
+		onclick += "height=" + formObj.popupheight.value + ",";
+
+	if (formObj.popupleft.value != "") {
+		if (formObj.popupleft.value != "c")
+			onclick += "left=" + formObj.popupleft.value + ",";
+		else
+			onclick += "left='+(screen.availWidth/2-" + (formObj.popupwidth.value/2) + ")+',";
+	}
+
+	if (formObj.popuptop.value != "") {
+		if (formObj.popuptop.value != "c")
+			onclick += "top=" + formObj.popuptop.value + ",";
+		else
+			onclick += "top='+(screen.availHeight/2-" + (formObj.popupheight.value/2) + ")+',";
+	}
+
+	if (onclick.charAt(onclick.length-1) == ',')
+		onclick = onclick.substring(0, onclick.length-1);
+
+	onclick += "');";
+
+	if (formObj.popupreturn.checked)
+		onclick += "return false;";
+
+	// tinyMCE.debug(onclick);
+
+	formObj.onclick.value = onclick;
+
+	if (formObj.href.value == "")
+		formObj.href.value = url;
+}
+
+function setAttrib(elm, attrib, value) {
+	var formObj = document.forms[0];
+	var valueElm = formObj.elements[attrib.toLowerCase()];
+	var dom = tinyMCEPopup.editor.dom;
+
+	if (typeof(value) == "undefined" || value == null) {
+		value = "";
+
+		if (valueElm)
+			value = valueElm.value;
+	}
+
+	// Clean up the style
+	if (attrib == 'style')
+		value = dom.serializeStyle(dom.parseStyle(value), 'a');
+
+	dom.setAttrib(elm, attrib, value);
+}
+
+function getAnchorListHTML(id, target) {
+	var ed = tinyMCEPopup.editor, nodes = ed.dom.select('a'), name, i, len, html = "";
+
+	for (i=0, len=nodes.length; i<len; i++) {
+		if ((name = ed.dom.getAttrib(nodes[i], "name")) != "")
+			html += '<option value="#' + name + '">' + name + '</option>';
+
+		if ((name = nodes[i].id) != "" && !nodes[i].href)
+			html += '<option value="#' + name + '">' + name + '</option>';
+	}
+
+	if (html == "")
+		return "";
+
+	html = '<select id="' + id + '" name="' + id + '" class="mceAnchorList"'
+		+ ' onchange="this.form.' + target + '.value=this.options[this.selectedIndex].value"'
+		+ '>'
+		+ '<option value="">---</option>'
+		+ html
+		+ '</select>';
+
+	return html;
+}
+
+function insertAction() {
+	var inst = tinyMCEPopup.editor;
+	var elm, elementArray, i;
+
+	elm = inst.selection.getNode();
+	checkPrefix(document.forms[0].href);
+
+	elm = inst.dom.getParent(elm, "A");
+
+	// Remove element if there is no href
+	if (!document.forms[0].href.value) {
+		i = inst.selection.getBookmark();
+		inst.dom.remove(elm, 1);
+		inst.selection.moveToBookmark(i);
+		tinyMCEPopup.execCommand("mceEndUndoLevel");
+		tinyMCEPopup.close();
+		return;
+	}
+
+	// Create new anchor elements
+	if (elm == null) {
+		inst.getDoc().execCommand("unlink", false, null);
+		tinyMCEPopup.execCommand("mceInsertLink", false, "#mce_temp_url#", {skip_undo : 1});
+
+		elementArray = tinymce.grep(inst.dom.select("a"), function(n) {return inst.dom.getAttrib(n, 'href') == '#mce_temp_url#';});
+		for (i=0; i<elementArray.length; i++)
+			setAllAttribs(elm = elementArray[i]);
+	} else
+		setAllAttribs(elm);
+
+	// Don't move caret if selection was image
+	if (elm.childNodes.length != 1 || elm.firstChild.nodeName != 'IMG') {
+		inst.focus();
+		inst.selection.select(elm);
+		inst.selection.collapse(0);
+		tinyMCEPopup.storeSelection();
+	}
+
+	tinyMCEPopup.execCommand("mceEndUndoLevel");
+	tinyMCEPopup.close();
+}
+
+function setAllAttribs(elm) {
+	var formObj = document.forms[0];
+	var href = formObj.href.value.replace(/ /g, '%20');
+	var target = getSelectValue(formObj, 'targetlist');
+
+	setAttrib(elm, 'href', href);
+	setAttrib(elm, 'title');
+	setAttrib(elm, 'target', target == '_self' ? '' : target);
+	setAttrib(elm, 'id');
+	setAttrib(elm, 'style');
+	setAttrib(elm, 'class', getSelectValue(formObj, 'classlist'));
+	setAttrib(elm, 'rel');
+	setAttrib(elm, 'rev');
+	setAttrib(elm, 'charset');
+	setAttrib(elm, 'hreflang');
+	setAttrib(elm, 'dir');
+	setAttrib(elm, 'lang');
+	setAttrib(elm, 'tabindex');
+	setAttrib(elm, 'accesskey');
+	setAttrib(elm, 'type');
+	setAttrib(elm, 'onfocus');
+	setAttrib(elm, 'onblur');
+	setAttrib(elm, 'onclick');
+	setAttrib(elm, 'ondblclick');
+	setAttrib(elm, 'onmousedown');
+	setAttrib(elm, 'onmouseup');
+	setAttrib(elm, 'onmouseover');
+	setAttrib(elm, 'onmousemove');
+	setAttrib(elm, 'onmouseout');
+	setAttrib(elm, 'onkeypress');
+	setAttrib(elm, 'onkeydown');
+	setAttrib(elm, 'onkeyup');
+
+	// Refresh in old MSIE
+	if (tinyMCE.isMSIE5)
+		elm.outerHTML = elm.outerHTML;
+}
+
+function getSelectValue(form_obj, field_name) {
+	var elm = form_obj.elements[field_name];
+
+	if (!elm || elm.options == null || elm.selectedIndex == -1)
+		return "";
+
+	return elm.options[elm.selectedIndex].value;
+}
+
+function getLinkListHTML(elm_id, target_form_element, onchange_func) {
+	if (typeof(tinyMCELinkList) == "undefined" || tinyMCELinkList.length == 0)
+		return "";
+
+	var html = "";
+
+	html += '<select id="' + elm_id + '" name="' + elm_id + '"';
+	html += ' class="mceLinkList" onchange="this.form.' + target_form_element + '.value=';
+	html += 'this.options[this.selectedIndex].value;';
+
+	if (typeof(onchange_func) != "undefined")
+		html += onchange_func + '(\'' + target_form_element + '\',this.options[this.selectedIndex].text,this.options[this.selectedIndex].value);';
+
+	html += '"><option value="">---</option>';
+
+	for (var i=0; i<tinyMCELinkList.length; i++)
+		html += '<option value="' + tinyMCELinkList[i][1] + '">' + tinyMCELinkList[i][0] + '</option>';
+
+	html += '</select>';
+
+	return html;
+
+	// tinyMCE.debug('-- image list start --', html, '-- image list end --');
+}
+
+function getTargetListHTML(elm_id, target_form_element) {
+	var targets = tinyMCEPopup.getParam('theme_advanced_link_targets', '').split(';');
+	var html = '';
+
+	html += '<select id="' + elm_id + '" name="' + elm_id + '" onchange="this.form.' + target_form_element + '.value=';
+	html += 'this.options[this.selectedIndex].value;">';
+	html += '<option value="_self">' + tinyMCEPopup.getLang('advlink_dlg.target_same') + '</option>';
+	html += '<option value="_blank">' + tinyMCEPopup.getLang('advlink_dlg.target_blank') + ' (_blank)</option>';
+	html += '<option value="_parent">' + tinyMCEPopup.getLang('advlink_dlg.target_parent') + ' (_parent)</option>';
+	html += '<option value="_top">' + tinyMCEPopup.getLang('advlink_dlg.target_top') + ' (_top)</option>';
+
+	for (var i=0; i<targets.length; i++) {
+		var key, value;
+
+		if (targets[i] == "")
+			continue;
+
+		key = targets[i].split('=')[0];
+		value = targets[i].split('=')[1];
+
+		html += '<option value="' + key + '">' + value + ' (' + key + ')</option>';
+	}
+
+	html += '</select>';
+
+	return html;
+}
+
+// While loading
+preinit();
+tinyMCEPopup.onInit.add(init);
diff --git a/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin_src.js b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin_src.js
new file mode 100644
index 0000000..237cbf5
--- /dev/null
+++ b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin_src.js
@@ -0,0 +1,163 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	var Event = tinymce.dom.Event, each = tinymce.each, DOM = tinymce.DOM;
+
+	/**
+	 * This plugin a context menu to TinyMCE editor instances.
+	 *
+	 * @class tinymce.plugins.ContextMenu
+	 */
+	tinymce.create('tinymce.plugins.ContextMenu', {
+		/**
+		 * Initializes the plugin, this will be executed after the plugin has been created.
+		 * This call is done before the editor instance has finished it's initialization so use the onInit event
+		 * of the editor instance to intercept that event.
+		 *
+		 * @method init
+		 * @param {tinymce.Editor} ed Editor instance that the plugin is initialized in.
+		 * @param {string} url Absolute URL to where the plugin is located.
+		 */
+		init : function(ed) {
+			var t = this, showMenu, contextmenuNeverUseNative, realCtrlKey, hideMenu;
+
+			t.editor = ed;
+
+			contextmenuNeverUseNative = ed.settings.contextmenu_never_use_native;
+
+			/**
+			 * This event gets fired when the context menu is shown.
+			 *
+			 * @event onContextMenu
+			 * @param {tinymce.plugins.ContextMenu} sender Plugin instance sending the event.
+			 * @param {tinymce.ui.DropMenu} menu Drop down menu to fill with more items if needed.
+			 */
+			t.onContextMenu = new tinymce.util.Dispatcher(this);
+
+			hideMenu = function(e) {
+				hide(ed, e);
+			};
+
+			showMenu = ed.onContextMenu.add(function(ed, e) {
+				// Block TinyMCE menu on ctrlKey and work around Safari issue
+				if ((realCtrlKey !== 0 ? realCtrlKey : e.ctrlKey) && !contextmenuNeverUseNative)
+					return;
+
+				Event.cancel(e);
+
+				// Select the image if it's clicked. WebKit would other wise expand the selection
+				if (e.target.nodeName == 'IMG')
+					ed.selection.select(e.target);
+
+				t._getMenu(ed).showMenu(e.clientX || e.pageX, e.clientY || e.pageY);
+				Event.add(ed.getDoc(), 'click', hideMenu);
+
+				ed.nodeChanged();
+			});
+			
+			ed.onRemove.add(function() {
+				if (t._menu)
+					t._menu.removeAll();
+			});
+
+			function hide(ed, e) {
+				realCtrlKey = 0;
+
+				// Since the contextmenu event moves
+				// the selection we need to store it away
+				if (e && e.button == 2) {
+					realCtrlKey = e.ctrlKey;
+					return;
+				}
+
+				if (t._menu) {
+					t._menu.removeAll();
+					 t._menu.destroy();
+					Event.remove(ed.getDoc(), 'click', hideMenu);
+					t._menu = null;
+				}
+			};
+
+			ed.onMouseDown.add(hide);
+			ed.onKeyDown.add(hide);
+			ed.onKeyDown.add(function(ed, e) {
+				if (e.shiftKey && !e.ctrlKey && !e.altKey && e.keyCode === 121) {
+					Event.cancel(e);
+					showMenu(ed, e);
+				}
+			});
+		},
+
+		/**
+		 * Returns information about the plugin as a name/value array.
+		 * The current keys are longname, author, authorurl, infourl and version.
+		 *
+		 * @method getInfo
+		 * @return {Object} Name/value array containing information about the plugin.
+		 */
+		getInfo : function() {
+			return {
+				longname : 'Contextmenu',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/contextmenu',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		},
+
+		_getMenu : function(ed) {
+			var t = this, m = t._menu, se = ed.selection, col = se.isCollapsed(), el = se.getNode() || ed.getBody(), am, p;
+
+			if (m) {
+				m.removeAll();
+				m.destroy();
+			}
+
+			p = DOM.getPos(ed.getContentAreaContainer());
+
+			m = ed.controlManager.createDropMenu('contextmenu', {
+				offset_x : p.x + ed.getParam('contextmenu_offset_x', 0),
+				offset_y : p.y + ed.getParam('contextmenu_offset_y', 0),
+				constrain : 1,
+				keyboard_focus: true
+			});
+
+			t._menu = m;
+
+			m.add({title : 'advanced.cut_desc', icon : 'cut', cmd : 'Cut'}).setDisabled(col);
+			m.add({title : 'advanced.copy_desc', icon : 'copy', cmd : 'Copy'}).setDisabled(col);
+			m.add({title : 'advanced.paste_desc', icon : 'paste', cmd : 'Paste'});
+
+			if ((el.nodeName == 'A' && !ed.dom.getAttrib(el, 'name')) || !col) {
+				m.addSeparator();
+				m.add({title : 'advanced.link_desc', icon : 'link', cmd : ed.plugins.advlink ? 'mceAdvLink' : 'mceLink', ui : true});
+				m.add({title : 'advanced.unlink_desc', icon : 'unlink', cmd : 'UnLink'});
+			}
+
+			m.addSeparator();
+			m.add({title : 'advanced.image_desc', icon : 'image', cmd : ed.plugins.advimage ? 'mceAdvImage' : 'mceImage', ui : true});
+
+			m.addSeparator();
+			am = m.addMenu({title : 'contextmenu.align'});
+			am.add({title : 'contextmenu.left', icon : 'justifyleft', cmd : 'JustifyLeft'});
+			am.add({title : 'contextmenu.center', icon : 'justifycenter', cmd : 'JustifyCenter'});
+			am.add({title : 'contextmenu.right', icon : 'justifyright', cmd : 'JustifyRight'});
+			am.add({title : 'contextmenu.full', icon : 'justifyfull', cmd : 'JustifyFull'});
+
+			t.onContextMenu.dispatch(t, m, el, col);
+
+			return m;
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('contextmenu', tinymce.plugins.ContextMenu);
+})();
diff --git a/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/emotions/js/emotions.js b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/emotions/js/emotions.js
new file mode 100644
index 0000000..f73516c
--- /dev/null
+++ b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/emotions/js/emotions.js
@@ -0,0 +1,43 @@
+tinyMCEPopup.requireLangPack();
+
+var EmotionsDialog = {
+	addKeyboardNavigation: function(){
+		var tableElm, cells, settings;
+			
+		cells = tinyMCEPopup.dom.select("a.emoticon_link", "emoticon_table");
+			
+		settings ={
+			root: "emoticon_table",
+			items: cells
+		};
+		cells[0].tabindex=0;
+		tinyMCEPopup.dom.addClass(cells[0], "mceFocus");
+		if (tinymce.isGecko) {
+			cells[0].focus();		
+		} else {
+			setTimeout(function(){
+				cells[0].focus();
+			}, 100);
+		}
+		tinyMCEPopup.editor.windowManager.createInstance('tinymce.ui.KeyboardNavigation', settings, tinyMCEPopup.dom);
+	}, 
+	init : function(ed) {
+		tinyMCEPopup.resizeToInnerSize();
+		this.addKeyboardNavigation();
+	},
+
+	insert : function(file, title) {
+		var ed = tinyMCEPopup.editor, dom = ed.dom;
+
+		tinyMCEPopup.execCommand('mceInsertContent', false, dom.createHTML('img', {
+			src : tinyMCEPopup.getWindowArg('plugin_url') + '/img/' + file,
+			alt : ed.getLang(title),
+			title : ed.getLang(title),
+			border : 0
+		}));
+
+		tinyMCEPopup.close();
+	}
+};
+
+tinyMCEPopup.onInit.add(EmotionsDialog.init, EmotionsDialog);
diff --git a/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin_src.js b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin_src.js
new file mode 100644
index 0000000..8b49c44
--- /dev/null
+++ b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin_src.js
@@ -0,0 +1,405 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	var each = tinymce.each, Node = tinymce.html.Node;
+
+	tinymce.create('tinymce.plugins.FullPagePlugin', {
+		init : function(ed, url) {
+			var t = this;
+
+			t.editor = ed;
+
+			// Register commands
+			ed.addCommand('mceFullPageProperties', function() {
+				ed.windowManager.open({
+					file : url + '/fullpage.htm',
+					width : 430 + parseInt(ed.getLang('fullpage.delta_width', 0)),
+					height : 495 + parseInt(ed.getLang('fullpage.delta_height', 0)),
+					inline : 1
+				}, {
+					plugin_url : url,
+					data : t._htmlToData()
+				});
+			});
+
+			// Register buttons
+			ed.addButton('fullpage', {title : 'fullpage.desc', cmd : 'mceFullPageProperties'});
+
+			ed.onBeforeSetContent.add(t._setContent, t);
+			ed.onGetContent.add(t._getContent, t);
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Fullpage',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullpage',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		},
+
+		// Private plugin internal methods
+
+		_htmlToData : function() {
+			var headerFragment = this._parseHeader(), data = {}, nodes, elm, matches, editor = this.editor;
+
+			function getAttr(elm, name) {
+				var value = elm.attr(name);
+
+				return value || '';
+			};
+
+			// Default some values
+			data.fontface = editor.getParam("fullpage_default_fontface", "");
+			data.fontsize = editor.getParam("fullpage_default_fontsize", "");
+
+			// Parse XML PI
+			elm = headerFragment.firstChild;
+			if (elm.type == 7) {
+				data.xml_pi = true;
+				matches = /encoding="([^"]+)"/.exec(elm.value);
+				if (matches)
+					data.docencoding = matches[1];
+			}
+
+			// Parse doctype
+			elm = headerFragment.getAll('#doctype')[0];
+			if (elm)
+				data.doctype = '<!DOCTYPE' + elm.value + ">"; 
+
+			// Parse title element
+			elm = headerFragment.getAll('title')[0];
+			if (elm && elm.firstChild) {
+				data.metatitle = elm.firstChild.value;
+			}
+
+			// Parse meta elements
+			each(headerFragment.getAll('meta'), function(meta) {
+				var name = meta.attr('name'), httpEquiv = meta.attr('http-equiv'), matches;
+
+				if (name)
+					data['meta' + name.toLowerCase()] = meta.attr('content');
+				else if (httpEquiv == "Content-Type") {
+					matches = /charset\s*=\s*(.*)\s*/gi.exec(meta.attr('content'));
+
+					if (matches)
+						data.docencoding = matches[1];
+				}
+			});
+
+			// Parse html attribs
+			elm = headerFragment.getAll('html')[0];
+			if (elm)
+				data.langcode = getAttr(elm, 'lang') || getAttr(elm, 'xml:lang');
+	
+			// Parse stylesheet
+			elm = headerFragment.getAll('link')[0];
+			if (elm && elm.attr('rel') == 'stylesheet')
+				data.stylesheet = elm.attr('href');
+
+			// Parse body parts
+			elm = headerFragment.getAll('body')[0];
+			if (elm) {
+				data.langdir = getAttr(elm, 'dir');
+				data.style = getAttr(elm, 'style');
+				data.visited_color = getAttr(elm, 'vlink');
+				data.link_color = getAttr(elm, 'link');
+				data.active_color = getAttr(elm, 'alink');
+			}
+
+			return data;
+		},
+
+		_dataToHtml : function(data) {
+			var headerFragment, headElement, html, elm, value, dom = this.editor.dom;
+
+			function setAttr(elm, name, value) {
+				elm.attr(name, value ? value : undefined);
+			};
+
+			function addHeadNode(node) {
+				if (headElement.firstChild)
+					headElement.insert(node, headElement.firstChild);
+				else
+					headElement.append(node);
+			};
+
+			headerFragment = this._parseHeader();
+			headElement = headerFragment.getAll('head')[0];
+			if (!headElement) {
+				elm = headerFragment.getAll('html')[0];
+				headElement = new Node('head', 1);
+
+				if (elm.firstChild)
+					elm.insert(headElement, elm.firstChild, true);
+				else
+					elm.append(headElement);
+			}
+
+			// Add/update/remove XML-PI
+			elm = headerFragment.firstChild;
+			if (data.xml_pi) {
+				value = 'version="1.0"';
+
+				if (data.docencoding)
+					value += ' encoding="' + data.docencoding + '"';
+
+				if (elm.type != 7) {
+					elm = new Node('xml', 7);
+					headerFragment.insert(elm, headerFragment.firstChild, true);
+				}
+
+				elm.value = value;
+			} else if (elm && elm.type == 7)
+				elm.remove();
+
+			// Add/update/remove doctype
+			elm = headerFragment.getAll('#doctype')[0];
+			if (data.doctype) {
+				if (!elm) {
+					elm = new Node('#doctype', 10);
+
+					if (data.xml_pi)
+						headerFragment.insert(elm, headerFragment.firstChild);
+					else
+						addHeadNode(elm);
+				}
+
+				elm.value = data.doctype.substring(9, data.doctype.length - 1);
+			} else if (elm)
+				elm.remove();
+
+			// Add/update/remove title
+			elm = headerFragment.getAll('title')[0];
+			if (data.metatitle) {
+				if (!elm) {
+					elm = new Node('title', 1);
+					elm.append(new Node('#text', 3)).value = data.metatitle;
+					addHeadNode(elm);
+				}
+			}
+
+			// Add meta encoding
+			if (data.docencoding) {
+				elm = null;
+				each(headerFragment.getAll('meta'), function(meta) {
+					if (meta.attr('http-equiv') == 'Content-Type')
+						elm = meta;
+				});
+
+				if (!elm) {
+					elm = new Node('meta', 1);
+					elm.attr('http-equiv', 'Content-Type');
+					elm.shortEnded = true;
+					addHeadNode(elm);
+				}
+
+				elm.attr('content', 'text/html; charset=' + data.docencoding);
+			}
+
+			// Add/update/remove meta
+			each('keywords,description,author,copyright,robots'.split(','), function(name) {
+				var nodes = headerFragment.getAll('meta'), i, meta, value = data['meta' + name];
+
+				for (i = 0; i < nodes.length; i++) {
+					meta = nodes[i];
+
+					if (meta.attr('name') == name) {
+						if (value)
+							meta.attr('content', value);
+						else
+							meta.remove();
+
+						return;
+					}
+				}
+
+				if (value) {
+					elm = new Node('meta', 1);
+					elm.attr('name', name);
+					elm.attr('content', value);
+					elm.shortEnded = true;
+
+					addHeadNode(elm);
+				}
+			});
+
+			// Add/update/delete link
+			elm = headerFragment.getAll('link')[0];
+			if (elm && elm.attr('rel') == 'stylesheet') {
+				if (data.stylesheet)
+					elm.attr('href', data.stylesheet);
+				else
+					elm.remove();
+			} else if (data.stylesheet) {
+				elm = new Node('link', 1);
+				elm.attr({
+					rel : 'stylesheet',
+					text : 'text/css',
+					href : data.stylesheet
+				});
+				elm.shortEnded = true;
+
+				addHeadNode(elm);
+			}
+
+			// Update body attributes
+			elm = headerFragment.getAll('body')[0];
+			if (elm) {
+				setAttr(elm, 'dir', data.langdir);
+				setAttr(elm, 'style', data.style);
+				setAttr(elm, 'vlink', data.visited_color);
+				setAttr(elm, 'link', data.link_color);
+				setAttr(elm, 'alink', data.active_color);
+
+				// Update iframe body as well
+				dom.setAttribs(this.editor.getBody(), {
+					style : data.style,
+					dir : data.dir,
+					vLink : data.visited_color,
+					link : data.link_color,
+					aLink : data.active_color
+				});
+			}
+
+			// Set html attributes
+			elm = headerFragment.getAll('html')[0];
+			if (elm) {
+				setAttr(elm, 'lang', data.langcode);
+				setAttr(elm, 'xml:lang', data.langcode);
+			}
+
+			// Serialize header fragment and crop away body part
+			html = new tinymce.html.Serializer({
+				validate: false,
+				indent: true,
+				apply_source_formatting : true,
+				indent_before: 'head,html,body,meta,title,script,link,style',
+				indent_after: 'head,html,body,meta,title,script,link,style'
+			}).serialize(headerFragment);
+
+			this.head = html.substring(0, html.indexOf('</body>'));
+		},
+
+		_parseHeader : function() {
+			// Parse the contents with a DOM parser
+			return new tinymce.html.DomParser({
+				validate: false,
+				root_name: '#document'
+			}).parse(this.head);
+		},
+
+		_setContent : function(ed, o) {
+			var self = this, startPos, endPos, content = o.content, headerFragment, styles = '', dom = self.editor.dom, elm;
+
+			function low(s) {
+				return s.replace(/<\/?[A-Z]+/g, function(a) {
+					return a.toLowerCase();
+				})
+			};
+
+			// Ignore raw updated if we already have a head, this will fix issues with undo/redo keeping the head/foot separate
+			if (o.format == 'raw' && self.head)
+				return;
+
+			if (o.source_view && ed.getParam('fullpage_hide_in_source_view'))
+				return;
+
+			// Parse out head, body and footer
+			content = content.replace(/<(\/?)BODY/gi, '<$1body');
+			startPos = content.indexOf('<body');
+
+			if (startPos != -1) {
+				startPos = content.indexOf('>', startPos);
+				self.head = low(content.substring(0, startPos + 1));
+
+				endPos = content.indexOf('</body', startPos);
+				if (endPos == -1)
+					endPos = content.length;
+
+				o.content = content.substring(startPos + 1, endPos);
+				self.foot = low(content.substring(endPos));
+			} else {
+				self.head = this._getDefaultHeader();
+				self.foot = '\n</body>\n</html>';
+			}
+
+			// Parse header and update iframe
+			headerFragment = self._parseHeader();
+			each(headerFragment.getAll('style'), function(node) {
+				if (node.firstChild)
+					styles += node.firstChild.value;
+			});
+
+			elm = headerFragment.getAll('body')[0];
+			if (elm) {
+				dom.setAttribs(self.editor.getBody(), {
+					style : elm.attr('style') || '',
+					dir : elm.attr('dir') || '',
+					vLink : elm.attr('vlink') || '',
+					link : elm.attr('link') || '',
+					aLink : elm.attr('alink') || ''
+				});
+			}
+
+			dom.remove('fullpage_styles');
+
+			if (styles) {
+				dom.add(self.editor.getDoc().getElementsByTagName('head')[0], 'style', {id : 'fullpage_styles'}, styles);
+
+				// Needed for IE 6/7
+				elm = dom.get('fullpage_styles');
+				if (elm.styleSheet)
+					elm.styleSheet.cssText = styles;
+			}
+		},
+
+		_getDefaultHeader : function() {
+			var header = '', editor = this.editor, value, styles = '';
+
+			if (editor.getParam('fullpage_default_xml_pi'))
+				header += '<?xml version="1.0" encoding="' + editor.getParam('fullpage_default_encoding', 'ISO-8859-1') + '" ?>\n';
+
+			header += editor.getParam('fullpage_default_doctype', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">');
+			header += '\n<html>\n<head>\n';
+
+			if (value = editor.getParam('fullpage_default_title'))
+				header += '<title>' + value + '</title>\n';
+
+			if (value = editor.getParam('fullpage_default_encoding'))
+				header += '<meta http-equiv="Content-Type" content="text/html; charset=' + value + '" />\n';
+
+			if (value = editor.getParam('fullpage_default_font_family'))
+				styles += 'font-family: ' + value + ';';
+
+			if (value = editor.getParam('fullpage_default_font_size'))
+				styles += 'font-size: ' + value + ';';
+
+			if (value = editor.getParam('fullpage_default_text_color'))
+				styles += 'color: ' + value + ';';
+
+			header += '</head>\n<body' + (styles ? ' style="' + styles + '"' : '') + '>\n';
+
+			return header;
+		},
+
+		_getContent : function(ed, o) {
+			var self = this;
+
+			if (!o.source_view || !ed.getParam('fullpage_hide_in_source_view'))
+				o.content = tinymce.trim(self.head) + '\n' + tinymce.trim(o.content) + '\n' + tinymce.trim(self.foot);
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('fullpage', tinymce.plugins.FullPagePlugin);
+})();
diff --git a/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin_src.js b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin_src.js
new file mode 100644
index 0000000..a1f39a0
--- /dev/null
+++ b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin_src.js
@@ -0,0 +1,234 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	var DOM = tinymce.DOM;
+
+	// State Transfer function
+	var transferState = function(oldEditor, newEditor, bookmark) {
+		var transferColorButtonState = function(swapme) {
+			var c = oldEditor.controlManager.get(swapme);
+			var newC = newEditor.controlManager.get(swapme);
+
+			if (c && newC) {
+				newC.displayColor(c.value);
+			}
+
+		};
+
+		transferColorButtonState('forecolor');
+		transferColorButtonState('backcolor');
+		newEditor.setContent(oldEditor.getContent({format : 'raw'}), {format : 'raw'});
+		newEditor.selection.moveToBookmark(bookmark);
+
+		if (oldEditor.plugins.spellchecker && newEditor.plugins.spellchecker) {
+			newEditor.plugins.spellchecker.setLanguage(oldEditor.plugins.spellchecker.selectedLang);
+		}
+	};
+
+	tinymce.create('tinymce.plugins.FullScreenPlugin', {
+		init : function(ed, url) {
+			var t = this, s = {}, de = DOM.doc.documentElement, vp, fullscreen_overflow, fullscreen_html_overflow, fullscreen_scrollx, fullscreen_scrolly, posCss, bookmark;
+
+			// Register commands
+			ed.addCommand('mceFullScreen', function() {
+				var win, oed;
+
+				if (ed.getParam('fullscreen_is_enabled')) {
+					if (ed.getParam('fullscreen_new_window'))
+						closeFullscreen(); // Call to close in fullscreen.htm
+					else {
+						DOM.win.setTimeout(function() {
+							var fullscreenEditor = ed;
+
+							// find the editor that opened this one, execute restore function there
+							var originalEditor = tinyMCE.get(fullscreenEditor.getParam('fullscreen_editor_id'));
+							originalEditor.plugins.fullscreen.saveState(fullscreenEditor);
+
+							tinyMCE.remove(fullscreenEditor);
+						}, 10);
+					}
+
+					return;
+				}
+
+				if (ed.getParam('fullscreen_new_window')) {
+					t.fullscreenSettings = {
+						bookmark: ed.selection.getBookmark()
+					};
+					win = DOM.win.open(url + "/fullscreen.htm", "mceFullScreenPopup", "fullscreen=yes,menubar=no,toolbar=no,scrollbars=no,resizable=yes,left=0,top=0,width=" + screen.availWidth + ",height=" + screen.availHeight);
+					try {
+						win.resizeTo(screen.availWidth, screen.availHeight);
+					} catch (e) {
+						// Ignore
+					}
+				} else {
+					fullscreen_overflow = DOM.getStyle(DOM.doc.body, 'overflow', 1) || 'auto';
+					fullscreen_html_overflow = DOM.getStyle(de, 'overflow', 1);
+					vp = DOM.getViewPort();
+					fullscreen_scrollx = vp.x;
+					fullscreen_scrolly = vp.y;
+
+					// Fixes an Opera bug where the scrollbars doesn't reappear
+					if (tinymce.isOpera && fullscreen_overflow == 'visible')
+						fullscreen_overflow = 'auto';
+
+					// Fixes an IE bug where horizontal scrollbars would appear
+					if (tinymce.isIE && fullscreen_overflow == 'scroll')
+						fullscreen_overflow = 'auto';
+
+					// Fixes an IE bug where the scrollbars doesn't reappear
+					if (tinymce.isIE && (fullscreen_html_overflow == 'visible' || fullscreen_html_overflow == 'scroll'))
+						fullscreen_html_overflow = 'auto';
+
+					if (fullscreen_overflow == '0px')
+						fullscreen_overflow = '';
+
+					DOM.setStyle(DOM.doc.body, 'overflow', 'hidden');
+					de.style.overflow = 'hidden'; //Fix for IE6/7
+					vp = DOM.getViewPort();
+					DOM.win.scrollTo(0, 0);
+
+					if (tinymce.isIE)
+						vp.h -= 1;
+
+					// Use fixed position if it exists
+					if (tinymce.isIE6 || document.compatMode == 'BackCompat')
+						posCss = 'absolute;top:' + vp.y;
+					else
+						posCss = 'fixed;top:0';
+
+					n = DOM.add(DOM.doc.body, 'div', {
+						id : 'mce_fullscreen_container',
+						style : 'position:' + posCss + ';left:0;width:' + vp.w + 'px;height:' + vp.h + 'px;z-index:200000;'});
+					DOM.add(n, 'div', {id : 'mce_fullscreen'});
+
+					tinymce.each(ed.settings, function(v, n) {
+						s[n] = v;
+					});
+
+					s.id = 'mce_fullscreen';
+					s.width = n.clientWidth;
+					s.height = n.clientHeight - 15;
+					s.fullscreen_is_enabled = true;
+					s.fullscreen_editor_id = ed.id;
+					s.theme_advanced_resizing = false;
+					s.save_onsavecallback = function() {
+						ed.setContent(tinyMCE.get(s.id).getContent());
+						ed.execCommand('mceSave');
+					};
+
+					tinymce.each(ed.getParam('fullscreen_settings'), function(v, k) {
+						s[k] = v;
+					});
+
+					t.fullscreenSettings = {
+						bookmark: ed.selection.getBookmark(),
+						fullscreen_overflow: fullscreen_overflow,
+						fullscreen_html_overflow: fullscreen_html_overflow,
+						fullscreen_scrollx: fullscreen_scrollx,
+						fullscreen_scrolly: fullscreen_scrolly
+					};
+
+					if (s.theme_advanced_toolbar_location === 'external')
+						s.theme_advanced_toolbar_location = 'top';
+
+					tinyMCE.oldSettings = tinyMCE.settings; // Store old settings, the Editor constructor overwrites them
+					t.fullscreenEditor = new tinymce.Editor('mce_fullscreen', s);
+					t.fullscreenEditor.onInit.add(function() {
+						t.loadState(t.fullscreenEditor);
+					});
+
+					t.fullscreenEditor.render();
+
+					t.fullscreenElement = new tinymce.dom.Element('mce_fullscreen_container');
+					t.fullscreenElement.update();
+					//document.body.overflow = 'hidden';
+
+					t.resizeFunc = tinymce.dom.Event.add(DOM.win, 'resize', function() {
+						var vp = tinymce.DOM.getViewPort(), fed = t.fullscreenEditor, outerSize, innerSize;
+
+						// Get outer/inner size to get a delta size that can be used to calc the new iframe size
+						outerSize = fed.dom.getSize(fed.getContainer().getElementsByTagName('table')[0]);
+						innerSize = fed.dom.getSize(fed.getContainer().getElementsByTagName('iframe')[0]);
+
+						fed.theme.resizeTo(vp.w - outerSize.w + innerSize.w, vp.h - outerSize.h + innerSize.h);
+					});
+				}
+			});
+
+			// Register buttons
+			ed.addButton('fullscreen', {title : 'fullscreen.desc', cmd : 'mceFullScreen'});
+
+			ed.onNodeChange.add(function(ed, cm) {
+				cm.setActive('fullscreen', ed.getParam('fullscreen_is_enabled'));
+			});
+
+			// fullscreenEditor is a param here because in window mode we don't create it
+			t.loadState = function(fullscreenEditor) {
+				if (!(fullscreenEditor && t.fullscreenSettings)) {
+					throw "No fullscreen editor to load to";
+				}
+
+				transferState(ed, fullscreenEditor, t.fullscreenSettings.bookmark);
+				fullscreenEditor.focus();
+
+			};
+
+			// fullscreenEditor is a param here because in window mode we don't create it
+			t.saveState = function(fullscreenEditor) {
+				if (!(fullscreenEditor && t.fullscreenSettings)) {
+					throw "No fullscreen editor to restore from";
+				}
+				var settings = t.fullscreenSettings;
+
+				transferState(fullscreenEditor, ed, fullscreenEditor.selection.getBookmark());
+
+				// cleanup only required if window mode isn't used
+				if (!ed.getParam('fullscreen_new_window')) {
+					tinymce.dom.Event.remove(DOM.win, 'resize', t.resizeFunc);
+					delete t.resizeFunc;
+
+					DOM.remove('mce_fullscreen_container');
+
+					DOM.doc.documentElement.style.overflow = settings.fullscreen_html_overflow;
+					DOM.setStyle(DOM.doc.body, 'overflow', settings.fullscreen_overflow);
+					DOM.win.scrollTo(settings.fullscreen_scrollx, settings.fullscreen_scrolly);
+				}
+				tinyMCE.settings = tinyMCE.oldSettings; // Restore old settings
+
+				// clear variables
+				delete tinyMCE.oldSettings;
+				delete t.fullscreenEditor;
+				delete t.fullscreenElement;
+				delete t.fullscreenSettings;
+
+				// allow the fullscreen editor to be removed before restoring focus and selection
+				DOM.win.setTimeout(function() {
+					ed.selection.moveToBookmark(bookmark);
+					ed.focus();
+				}, 10);
+			};
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Fullscreen',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullscreen',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('fullscreen', tinymce.plugins.FullScreenPlugin);
+})();
diff --git a/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/fullscreen/fullscreen.htm b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/fullscreen/fullscreen.htm
new file mode 100644
index 0000000..35dcb0a
--- /dev/null
+++ b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/fullscreen/fullscreen.htm
@@ -0,0 +1,117 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title></title>
+	<meta http-equiv="X-UA-Compatible" content="IE=edge" />
+	<script type="text/javascript" src="../../tiny_mce.js"></script>
+	<script type="text/javascript">
+		function patchCallback(settings, key) {
+			if (settings[key])
+				settings[key] = "window.opener." + settings[key];
+		}
+
+		var settings = {}, paSe = window.opener.tinyMCE.activeEditor.settings, oeID = window.opener.tinyMCE.activeEditor.id;
+
+		// Clone array
+		for (var n in paSe)
+			settings[n] = paSe[n];
+
+		// Override options for fullscreen
+		for (var n in paSe.fullscreen_settings)
+			settings[n] = paSe.fullscreen_settings[n];
+
+		// Patch callbacks, make them point to window.opener
+		patchCallback(settings, 'urlconverter_callback');
+		patchCallback(settings, 'insertlink_callback');
+		patchCallback(settings, 'insertimage_callback');
+		patchCallback(settings, 'setupcontent_callback');
+		patchCallback(settings, 'save_callback');
+		patchCallback(settings, 'onchange_callback');
+		patchCallback(settings, 'init_instance_callback');
+		patchCallback(settings, 'file_browser_callback');
+		patchCallback(settings, 'cleanup_callback');
+		patchCallback(settings, 'execcommand_callback');
+		patchCallback(settings, 'oninit');
+
+		// Set options
+		delete settings.id;
+		settings['mode'] = 'exact';
+		settings['elements'] = 'fullscreenarea';
+		settings['add_unload_trigger'] = false;
+		settings['ask'] = false;
+		settings['document_base_url'] = window.opener.tinyMCE.activeEditor.documentBaseURI.getURI();
+		settings['fullscreen_is_enabled'] = true;
+		settings['fullscreen_editor_id'] = oeID;
+		settings['theme_advanced_resizing'] = false;
+		settings['strict_loading_mode'] = true;
+
+		settings.save_onsavecallback = function() {
+			moveContent();
+			window.opener.tinyMCE.get(oeID).execCommand('mceSave');
+			window.close();
+		};
+
+		function unloadHandler(e) {
+			moveContent();
+		}
+
+		function moveContent() {
+			// find the original editor, execute restore state in it's plugin instance
+			window.opener.tinyMCE.get(oeID).plugins.fullscreen.saveState(tinyMCE.activeEditor);
+
+			// prevent moveContent from being called twice - e.g. if the unloadHandler runs after moveContent()
+			tinymce.dom.Event.remove(window, "beforeunload", unloadHandler);
+		}
+
+		function closeFullscreen() {
+			// moveContent() will be called by the unload handler
+			window.close();
+		}
+
+		function doParentSubmit() {
+			moveContent();
+
+			if (window.opener.tinyMCE.selectedInstance.formElement.form)
+				window.opener.tinyMCE.selectedInstance.formElement.form.submit();
+
+			window.close();
+
+			return false;
+		}
+
+		function render() {
+			var e = document.getElementById('fullscreenarea'), vp, ed, ow, oh, dom = tinymce.DOM;
+
+			vp = dom.getViewPort();
+			settings.width = vp.w;
+			settings.height = vp.h - 15;
+
+			settings.oninit = function() {
+				var ed = tinyMCE.activeEditor;
+				window.opener.tinyMCE.get(oeID).plugins.fullscreen.loadState(ed);
+
+				tinymce.dom.Event.add(window, 'resize', function() {
+					var vp = dom.getViewPort();
+
+					tinyMCE.activeEditor.theme.resizeTo(vp.w, vp.h);
+				});
+			}
+
+			tinyMCE.init(settings);
+		}
+
+		// Add onunload
+		tinymce.dom.Event.add(window, "beforeunload", unloadHandler);
+	</script>
+</head>
+<body style="margin:0;overflow:hidden;width:100%;height:100%" scrolling="no" scroll="no">
+<form onsubmit="doParentSubmit();">
+<textarea id="fullscreenarea" style="width:100%; height:100%"></textarea>
+</form>
+
+<script type="text/javascript">
+	render();
+</script>
+
+</body>
+</html>
diff --git a/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin_src.js b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin_src.js
new file mode 100644
index 0000000..5171845
--- /dev/null
+++ b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin_src.js
@@ -0,0 +1,699 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	var DOM = tinymce.DOM, Element = tinymce.dom.Element, Event = tinymce.dom.Event, each = tinymce.each, is = tinymce.is;
+
+	tinymce.create('tinymce.plugins.InlinePopups', {
+		init : function(ed, url) {
+			// Replace window manager
+			ed.onBeforeRenderUI.add(function() {
+				ed.windowManager = new tinymce.InlineWindowManager(ed);
+				DOM.loadCSS(url + '/skins/' + (ed.settings.inlinepopups_skin || 'clearlooks2') + "/window.css");
+			});
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'InlinePopups',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/inlinepopups',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		}
+	});
+
+	tinymce.create('tinymce.InlineWindowManager:tinymce.WindowManager', {
+		InlineWindowManager : function(ed) {
+			var t = this;
+
+			t.parent(ed);
+			t.zIndex = 300000;
+			t.count = 0;
+			t.windows = {};
+		},
+
+		open : function(f, p) {
+			var t = this, id, opt = '', ed = t.editor, dw = 0, dh = 0, vp, po, mdf, clf, we, w, u, parentWindow;
+
+			f = f || {};
+			p = p || {};
+
+			// Run native windows
+			if (!f.inline)
+				return t.parent(f, p);
+
+			parentWindow = t._frontWindow();
+			if (parentWindow && DOM.get(parentWindow.id + '_ifr')) {
+				parentWindow.focussedElement = DOM.get(parentWindow.id + '_ifr').contentWindow.document.activeElement;
+			}
+
+			// Only store selection if the type is a normal window
+			if (!f.type)
+				t.bookmark = ed.selection.getBookmark(1);
+
+			id = DOM.uniqueId("mce_inlinepopups_"); // Use a prefix so this can't conflict with other ids
+			vp = DOM.getViewPort();
+			f.width = parseInt(f.width || 320);
+			f.height = parseInt(f.height || 240) + (tinymce.isIE ? 8 : 0);
+			f.min_width = parseInt(f.min_width || 150);
+			f.min_height = parseInt(f.min_height || 100);
+			f.max_width = parseInt(f.max_width || 2000);
+			f.max_height = parseInt(f.max_height || 2000);
+			f.left = f.left || Math.round(Math.max(vp.x, vp.x + (vp.w / 2.0) - (f.width / 2.0)));
+			f.top = f.top || Math.round(Math.max(vp.y, vp.y + (vp.h / 2.0) - (f.height / 2.0)));
+			f.movable = f.resizable = true;
+			p.mce_width = f.width;
+			p.mce_height = f.height;
+			p.mce_inline = true;
+			p.mce_window_id = id;
+			p.mce_auto_focus = f.auto_focus;
+
+			// Transpose
+//			po = DOM.getPos(ed.getContainer());
+//			f.left -= po.x;
+//			f.top -= po.y;
+
+			t.features = f;
+			t.params = p;
+			t.onOpen.dispatch(t, f, p);
+
+			if (f.type) {
+				opt += ' mceModal';
+
+				if (f.type)
+					opt += ' mce' + f.type.substring(0, 1).toUpperCase() + f.type.substring(1);
+
+				f.resizable = false;
+			}
+
+			if (f.statusbar)
+				opt += ' mceStatusbar';
+
+			if (f.resizable)
+				opt += ' mceResizable';
+
+			if (f.minimizable)
+				opt += ' mceMinimizable';
+
+			if (f.maximizable)
+				opt += ' mceMaximizable';
+
+			if (f.movable)
+				opt += ' mceMovable';
+
+			// Create DOM objects
+			t._addAll(DOM.doc.body,
+				['div', {id : id, role : 'dialog', 'aria-labelledby': f.type ? id + '_content' : id + '_title', 'class' : (ed.settings.inlinepopups_skin || 'clearlooks2') + (tinymce.isIE && window.getSelection ? ' ie9' : ''), style : 'width:100px;height:100px'},
+					['div', {id : id + '_wrapper', 'class' : 'mceWrapper' + opt},
+						['div', {id : id + '_top', 'class' : 'mceTop'},
+							['div', {'class' : 'mceLeft'}],
+							['div', {'class' : 'mceCenter'}],
+							['div', {'class' : 'mceRight'}],
+							['span', {id : id + '_title'}, f.title || '']
+						],
+
+						['div', {id : id + '_middle', 'class' : 'mceMiddle'},
+							['div', {id : id + '_left', 'class' : 'mceLeft', tabindex : '0'}],
+							['span', {id : id + '_content'}],
+							['div', {id : id + '_right', 'class' : 'mceRight', tabindex : '0'}]
+						],
+
+						['div', {id : id + '_bottom', 'class' : 'mceBottom'},
+							['div', {'class' : 'mceLeft'}],
+							['div', {'class' : 'mceCenter'}],
+							['div', {'class' : 'mceRight'}],
+							['span', {id : id + '_status'}, 'Content']
+						],
+
+						['a', {'class' : 'mceMove', tabindex : '-1', href : 'javascript:;'}],
+						['a', {'class' : 'mceMin', tabindex : '-1', href : 'javascript:;', onmousedown : 'return false;'}],
+						['a', {'class' : 'mceMax', tabindex : '-1', href : 'javascript:;', onmousedown : 'return false;'}],
+						['a', {'class' : 'mceMed', tabindex : '-1', href : 'javascript:;', onmousedown : 'return false;'}],
+						['a', {'class' : 'mceClose', tabindex : '-1', href : 'javascript:;', onmousedown : 'return false;'}],
+						['a', {id : id + '_resize_n', 'class' : 'mceResize mceResizeN', tabindex : '-1', href : 'javascript:;'}],
+						['a', {id : id + '_resize_s', 'class' : 'mceResize mceResizeS', tabindex : '-1', href : 'javascript:;'}],
+						['a', {id : id + '_resize_w', 'class' : 'mceResize mceResizeW', tabindex : '-1', href : 'javascript:;'}],
+						['a', {id : id + '_resize_e', 'class' : 'mceResize mceResizeE', tabindex : '-1', href : 'javascript:;'}],
+						['a', {id : id + '_resize_nw', 'class' : 'mceResize mceResizeNW', tabindex : '-1', href : 'javascript:;'}],
+						['a', {id : id + '_resize_ne', 'class' : 'mceResize mceResizeNE', tabindex : '-1', href : 'javascript:;'}],
+						['a', {id : id + '_resize_sw', 'class' : 'mceResize mceResizeSW', tabindex : '-1', href : 'javascript:;'}],
+						['a', {id : id + '_resize_se', 'class' : 'mceResize mceResizeSE', tabindex : '-1', href : 'javascript:;'}]
+					]
+				]
+			);
+
+			DOM.setStyles(id, {top : -10000, left : -10000});
+
+			// Fix gecko rendering bug, where the editors iframe messed with window contents
+			if (tinymce.isGecko)
+				DOM.setStyle(id, 'overflow', 'auto');
+
+			// Measure borders
+			if (!f.type) {
+				dw += DOM.get(id + '_left').clientWidth;
+				dw += DOM.get(id + '_right').clientWidth;
+				dh += DOM.get(id + '_top').clientHeight;
+				dh += DOM.get(id + '_bottom').clientHeight;
+			}
+
+			// Resize window
+			DOM.setStyles(id, {top : f.top, left : f.left, width : f.width + dw, height : f.height + dh});
+
+			u = f.url || f.file;
+			if (u) {
+				if (tinymce.relaxedDomain)
+					u += (u.indexOf('?') == -1 ? '?' : '&') + 'mce_rdomain=' + tinymce.relaxedDomain;
+
+				u = tinymce._addVer(u);
+			}
+
+			if (!f.type) {
+				DOM.add(id + '_content', 'iframe', {id : id + '_ifr', src : 'javascript:""', frameBorder : 0, style : 'border:0;width:10px;height:10px'});
+				DOM.setStyles(id + '_ifr', {width : f.width, height : f.height});
+				DOM.setAttrib(id + '_ifr', 'src', u);
+			} else {
+				DOM.add(id + '_wrapper', 'a', {id : id + '_ok', 'class' : 'mceButton mceOk', href : 'javascript:;', onmousedown : 'return false;'}, 'Ok');
+
+				if (f.type == 'confirm')
+					DOM.add(id + '_wrapper', 'a', {'class' : 'mceButton mceCancel', href : 'javascript:;', onmousedown : 'return false;'}, 'Cancel');
+
+				DOM.add(id + '_middle', 'div', {'class' : 'mceIcon'});
+				DOM.setHTML(id + '_content', f.content.replace('\n', '<br />'));
+
+				Event.add(id, 'keyup', function(evt) {
+					var VK_ESCAPE = 27;
+					if (evt.keyCode === VK_ESCAPE) {
+						f.button_func(false);
+						return Event.cancel(evt);
+					}
+				});
+
+				Event.add(id, 'keydown', function(evt) {
+					var cancelButton, VK_TAB = 9;
+					if (evt.keyCode === VK_TAB) {
+						cancelButton = DOM.select('a.mceCancel', id + '_wrapper')[0];
+						if (cancelButton && cancelButton !== evt.target) {
+							cancelButton.focus();
+						} else {
+							DOM.get(id + '_ok').focus();
+						}
+						return Event.cancel(evt);
+					}
+				});
+			}
+
+			// Register events
+			mdf = Event.add(id, 'mousedown', function(e) {
+				var n = e.target, w, vp;
+
+				w = t.windows[id];
+				t.focus(id);
+
+				if (n.nodeName == 'A' || n.nodeName == 'a') {
+					if (n.className == 'mceClose') {
+						t.close(null, id);
+						return Event.cancel(e);
+					} else if (n.className == 'mceMax') {
+						w.oldPos = w.element.getXY();
+						w.oldSize = w.element.getSize();
+
+						vp = DOM.getViewPort();
+
+						// Reduce viewport size to avoid scrollbars
+						vp.w -= 2;
+						vp.h -= 2;
+
+						w.element.moveTo(vp.x, vp.y);
+						w.element.resizeTo(vp.w, vp.h);
+						DOM.setStyles(id + '_ifr', {width : vp.w - w.deltaWidth, height : vp.h - w.deltaHeight});
+						DOM.addClass(id + '_wrapper', 'mceMaximized');
+					} else if (n.className == 'mceMed') {
+						// Reset to old size
+						w.element.moveTo(w.oldPos.x, w.oldPos.y);
+						w.element.resizeTo(w.oldSize.w, w.oldSize.h);
+						w.iframeElement.resizeTo(w.oldSize.w - w.deltaWidth, w.oldSize.h - w.deltaHeight);
+
+						DOM.removeClass(id + '_wrapper', 'mceMaximized');
+					} else if (n.className == 'mceMove')
+						return t._startDrag(id, e, n.className);
+					else if (DOM.hasClass(n, 'mceResize'))
+						return t._startDrag(id, e, n.className.substring(13));
+				}
+			});
+
+			clf = Event.add(id, 'click', function(e) {
+				var n = e.target;
+
+				t.focus(id);
+
+				if (n.nodeName == 'A' || n.nodeName == 'a') {
+					switch (n.className) {
+						case 'mceClose':
+							t.close(null, id);
+							return Event.cancel(e);
+
+						case 'mceButton mceOk':
+						case 'mceButton mceCancel':
+							f.button_func(n.className == 'mceButton mceOk');
+							return Event.cancel(e);
+					}
+				}
+			});
+
+			// Make sure the tab order loops within the dialog.
+			Event.add([id + '_left', id + '_right'], 'focus', function(evt) {
+				var iframe = DOM.get(id + '_ifr');
+				if (iframe) {
+					var body = iframe.contentWindow.document.body;
+					var focusable = DOM.select(':input:enabled,*[tabindex=0]', body);
+					if (evt.target.id === (id + '_left')) {
+						focusable[focusable.length - 1].focus();
+					} else {
+						focusable[0].focus();
+					}
+				} else {
+					DOM.get(id + '_ok').focus();
+				}
+			});
+
+			// Add window
+			w = t.windows[id] = {
+				id : id,
+				mousedown_func : mdf,
+				click_func : clf,
+				element : new Element(id, {blocker : 1, container : ed.getContainer()}),
+				iframeElement : new Element(id + '_ifr'),
+				features : f,
+				deltaWidth : dw,
+				deltaHeight : dh
+			};
+
+			w.iframeElement.on('focus', function() {
+				t.focus(id);
+			});
+
+			// Setup blocker
+			if (t.count == 0 && t.editor.getParam('dialog_type', 'modal') == 'modal') {
+				DOM.add(DOM.doc.body, 'div', {
+					id : 'mceModalBlocker',
+					'class' : (t.editor.settings.inlinepopups_skin || 'clearlooks2') + '_modalBlocker',
+					style : {zIndex : t.zIndex - 1}
+				});
+
+				DOM.show('mceModalBlocker'); // Reduces flicker in IE
+				DOM.setAttrib(DOM.doc.body, 'aria-hidden', 'true');
+			} else
+				DOM.setStyle('mceModalBlocker', 'z-index', t.zIndex - 1);
+
+			if (tinymce.isIE6 || /Firefox\/2\./.test(navigator.userAgent) || (tinymce.isIE && !DOM.boxModel))
+				DOM.setStyles('mceModalBlocker', {position : 'absolute', left : vp.x, top : vp.y, width : vp.w - 2, height : vp.h - 2});
+
+			DOM.setAttrib(id, 'aria-hidden', 'false');
+			t.focus(id);
+			t._fixIELayout(id, 1);
+
+			// Focus ok button
+			if (DOM.get(id + '_ok'))
+				DOM.get(id + '_ok').focus();
+			t.count++;
+
+			return w;
+		},
+
+		focus : function(id) {
+			var t = this, w;
+
+			if (w = t.windows[id]) {
+				w.zIndex = this.zIndex++;
+				w.element.setStyle('zIndex', w.zIndex);
+				w.element.update();
+
+				id = id + '_wrapper';
+				DOM.removeClass(t.lastId, 'mceFocus');
+				DOM.addClass(id, 'mceFocus');
+				t.lastId = id;
+
+				if (w.focussedElement) {
+					w.focussedElement.focus();
+				} else if (DOM.get(id + '_ok')) {
+					DOM.get(w.id + '_ok').focus();
+				} else if (DOM.get(w.id + '_ifr')) {
+					DOM.get(w.id + '_ifr').focus();
+				}
+			}
+		},
+
+		_addAll : function(te, ne) {
+			var i, n, t = this, dom = tinymce.DOM;
+
+			if (is(ne, 'string'))
+				te.appendChild(dom.doc.createTextNode(ne));
+			else if (ne.length) {
+				te = te.appendChild(dom.create(ne[0], ne[1]));
+
+				for (i=2; i<ne.length; i++)
+					t._addAll(te, ne[i]);
+			}
+		},
+
+		_startDrag : function(id, se, ac) {
+			var t = this, mu, mm, d = DOM.doc, eb, w = t.windows[id], we = w.element, sp = we.getXY(), p, sz, ph, cp, vp, sx, sy, sex, sey, dx, dy, dw, dh;
+
+			// Get positons and sizes
+//			cp = DOM.getPos(t.editor.getContainer());
+			cp = {x : 0, y : 0};
+			vp = DOM.getViewPort();
+
+			// Reduce viewport size to avoid scrollbars while dragging
+			vp.w -= 2;
+			vp.h -= 2;
+
+			sex = se.screenX;
+			sey = se.screenY;
+			dx = dy = dw = dh = 0;
+
+			// Handle mouse up
+			mu = Event.add(d, 'mouseup', function(e) {
+				Event.remove(d, 'mouseup', mu);
+				Event.remove(d, 'mousemove', mm);
+
+				if (eb)
+					eb.remove();
+
+				we.moveBy(dx, dy);
+				we.resizeBy(dw, dh);
+				sz = we.getSize();
+				DOM.setStyles(id + '_ifr', {width : sz.w - w.deltaWidth, height : sz.h - w.deltaHeight});
+				t._fixIELayout(id, 1);
+
+				return Event.cancel(e);
+			});
+
+			if (ac != 'Move')
+				startMove();
+
+			function startMove() {
+				if (eb)
+					return;
+
+				t._fixIELayout(id, 0);
+
+				// Setup event blocker
+				DOM.add(d.body, 'div', {
+					id : 'mceEventBlocker',
+					'class' : 'mceEventBlocker ' + (t.editor.settings.inlinepopups_skin || 'clearlooks2'),
+					style : {zIndex : t.zIndex + 1}
+				});
+
+				if (tinymce.isIE6 || (tinymce.isIE && !DOM.boxModel))
+					DOM.setStyles('mceEventBlocker', {position : 'absolute', left : vp.x, top : vp.y, width : vp.w - 2, height : vp.h - 2});
+
+				eb = new Element('mceEventBlocker');
+				eb.update();
+
+				// Setup placeholder
+				p = we.getXY();
+				sz = we.getSize();
+				sx = cp.x + p.x - vp.x;
+				sy = cp.y + p.y - vp.y;
+				DOM.add(eb.get(), 'div', {id : 'mcePlaceHolder', 'class' : 'mcePlaceHolder', style : {left : sx, top : sy, width : sz.w, height : sz.h}});
+				ph = new Element('mcePlaceHolder');
+			};
+
+			// Handle mouse move/drag
+			mm = Event.add(d, 'mousemove', function(e) {
+				var x, y, v;
+
+				startMove();
+
+				x = e.screenX - sex;
+				y = e.screenY - sey;
+
+				switch (ac) {
+					case 'ResizeW':
+						dx = x;
+						dw = 0 - x;
+						break;
+
+					case 'ResizeE':
+						dw = x;
+						break;
+
+					case 'ResizeN':
+					case 'ResizeNW':
+					case 'ResizeNE':
+						if (ac == "ResizeNW") {
+							dx = x;
+							dw = 0 - x;
+						} else if (ac == "ResizeNE")
+							dw = x;
+
+						dy = y;
+						dh = 0 - y;
+						break;
+
+					case 'ResizeS':
+					case 'ResizeSW':
+					case 'ResizeSE':
+						if (ac == "ResizeSW") {
+							dx = x;
+							dw = 0 - x;
+						} else if (ac == "ResizeSE")
+							dw = x;
+
+						dh = y;
+						break;
+
+					case 'mceMove':
+						dx = x;
+						dy = y;
+						break;
+				}
+
+				// Boundary check
+				if (dw < (v = w.features.min_width - sz.w)) {
+					if (dx !== 0)
+						dx += dw - v;
+
+					dw = v;
+				}
+
+				if (dh < (v = w.features.min_height - sz.h)) {
+					if (dy !== 0)
+						dy += dh - v;
+
+					dh = v;
+				}
+
+				dw = Math.min(dw, w.features.max_width - sz.w);
+				dh = Math.min(dh, w.features.max_height - sz.h);
+				dx = Math.max(dx, vp.x - (sx + vp.x));
+				dy = Math.max(dy, vp.y - (sy + vp.y));
+				dx = Math.min(dx, (vp.w + vp.x) - (sx + sz.w + vp.x));
+				dy = Math.min(dy, (vp.h + vp.y) - (sy + sz.h + vp.y));
+
+				// Move if needed
+				if (dx + dy !== 0) {
+					if (sx + dx < 0)
+						dx = 0;
+
+					if (sy + dy < 0)
+						dy = 0;
+
+					ph.moveTo(sx + dx, sy + dy);
+				}
+
+				// Resize if needed
+				if (dw + dh !== 0)
+					ph.resizeTo(sz.w + dw, sz.h + dh);
+
+				return Event.cancel(e);
+			});
+
+			return Event.cancel(se);
+		},
+
+		resizeBy : function(dw, dh, id) {
+			var w = this.windows[id];
+
+			if (w) {
+				w.element.resizeBy(dw, dh);
+				w.iframeElement.resizeBy(dw, dh);
+			}
+		},
+
+		close : function(win, id) {
+			var t = this, w, d = DOM.doc, fw, id;
+
+			id = t._findId(id || win);
+
+			// Probably not inline
+			if (!t.windows[id]) {
+				t.parent(win);
+				return;
+			}
+
+			t.count--;
+
+			if (t.count == 0) {
+				DOM.remove('mceModalBlocker');
+				DOM.setAttrib(DOM.doc.body, 'aria-hidden', 'false');
+				t.editor.focus();
+			}
+
+			if (w = t.windows[id]) {
+				t.onClose.dispatch(t);
+				Event.remove(d, 'mousedown', w.mousedownFunc);
+				Event.remove(d, 'click', w.clickFunc);
+				Event.clear(id);
+				Event.clear(id + '_ifr');
+
+				DOM.setAttrib(id + '_ifr', 'src', 'javascript:""'); // Prevent leak
+				w.element.remove();
+				delete t.windows[id];
+
+				fw = t._frontWindow();
+
+				if (fw)
+					t.focus(fw.id);
+			}
+		},
+
+		// Find front most window
+		_frontWindow : function() {
+			var fw, ix = 0;
+			// Find front most window and focus that
+			each (this.windows, function(w) {
+				if (w.zIndex > ix) {
+					fw = w;
+					ix = w.zIndex;
+				}
+			});
+			return fw;
+		},
+
+		setTitle : function(w, ti) {
+			var e;
+
+			w = this._findId(w);
+
+			if (e = DOM.get(w + '_title'))
+				e.innerHTML = DOM.encode(ti);
+		},
+
+		alert : function(txt, cb, s) {
+			var t = this, w;
+
+			w = t.open({
+				title : t,
+				type : 'alert',
+				button_func : function(s) {
+					if (cb)
+						cb.call(s || t, s);
+
+					t.close(null, w.id);
+				},
+				content : DOM.encode(t.editor.getLang(txt, txt)),
+				inline : 1,
+				width : 400,
+				height : 130
+			});
+		},
+
+		confirm : function(txt, cb, s) {
+			var t = this, w;
+
+			w = t.open({
+				title : t,
+				type : 'confirm',
+				button_func : function(s) {
+					if (cb)
+						cb.call(s || t, s);
+
+					t.close(null, w.id);
+				},
+				content : DOM.encode(t.editor.getLang(txt, txt)),
+				inline : 1,
+				width : 400,
+				height : 130
+			});
+		},
+
+		// Internal functions
+
+		_findId : function(w) {
+			var t = this;
+
+			if (typeof(w) == 'string')
+				return w;
+
+			each(t.windows, function(wo) {
+				var ifr = DOM.get(wo.id + '_ifr');
+
+				if (ifr && w == ifr.contentWindow) {
+					w = wo.id;
+					return false;
+				}
+			});
+
+			return w;
+		},
+
+		_fixIELayout : function(id, s) {
+			var w, img;
+
+			if (!tinymce.isIE6)
+				return;
+
+			// Fixes the bug where hover flickers and does odd things in IE6
+			each(['n','s','w','e','nw','ne','sw','se'], function(v) {
+				var e = DOM.get(id + '_resize_' + v);
+
+				DOM.setStyles(e, {
+					width : s ? e.clientWidth : '',
+					height : s ? e.clientHeight : '',
+					cursor : DOM.getStyle(e, 'cursor', 1)
+				});
+
+				DOM.setStyle(id + "_bottom", 'bottom', '-1px');
+
+				e = 0;
+			});
+
+			// Fixes graphics glitch
+			if (w = this.windows[id]) {
+				// Fixes rendering bug after resize
+				w.element.hide();
+				w.element.show();
+
+				// Forced a repaint of the window
+				//DOM.get(id).style.filter = '';
+
+				// IE has a bug where images used in CSS won't get loaded
+				// sometimes when the cache in the browser is disabled
+				// This fix tries to solve it by loading the images using the image object
+				each(DOM.select('div,a', id), function(e, i) {
+					if (e.currentStyle.backgroundImage != 'none') {
+						img = new Image();
+						img.src = e.currentStyle.backgroundImage.replace(/url\(\"(.+)\"\)/, '$1');
+					}
+				});
+
+				DOM.get(id).style.filter = '';
+			}
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('inlinepopups', tinymce.plugins.InlinePopups);
+})();
+
diff --git a/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin_src.js b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin_src.js
new file mode 100644
index 0000000..d31978b
--- /dev/null
+++ b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin_src.js
@@ -0,0 +1,262 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	function findParentLayer(node) {
+		do {
+			if (node.className && node.className.indexOf('mceItemLayer') != -1) {
+				return node;
+			}
+		} while (node = node.parentNode);
+	};
+
+	tinymce.create('tinymce.plugins.Layer', {
+		init : function(ed, url) {
+			var t = this;
+
+			t.editor = ed;
+
+			// Register commands
+			ed.addCommand('mceInsertLayer', t._insertLayer, t);
+
+			ed.addCommand('mceMoveForward', function() {
+				t._move(1);
+			});
+
+			ed.addCommand('mceMoveBackward', function() {
+				t._move(-1);
+			});
+
+			ed.addCommand('mceMakeAbsolute', function() {
+				t._toggleAbsolute();
+			});
+
+			// Register buttons
+			ed.addButton('moveforward', {title : 'layer.forward_desc', cmd : 'mceMoveForward'});
+			ed.addButton('movebackward', {title : 'layer.backward_desc', cmd : 'mceMoveBackward'});
+			ed.addButton('absolute', {title : 'layer.absolute_desc', cmd : 'mceMakeAbsolute'});
+			ed.addButton('insertlayer', {title : 'layer.insertlayer_desc', cmd : 'mceInsertLayer'});
+
+			ed.onInit.add(function() {
+				var dom = ed.dom;
+
+				if (tinymce.isIE)
+					ed.getDoc().execCommand('2D-Position', false, true);
+			});
+
+			// Remove serialized styles when selecting a layer since it might be changed by a drag operation
+			ed.onMouseUp.add(function(ed, e) {
+				var layer = findParentLayer(e.target);
+	
+				if (layer) {
+					ed.dom.setAttrib(layer, 'data-mce-style', '');
+				}
+			});
+
+			// Fixes edit focus issues with layers on Gecko
+			// This will enable designMode while inside a layer and disable it when outside
+			ed.onMouseDown.add(function(ed, e) {
+				var node = e.target, doc = ed.getDoc(), parent;
+
+				if (tinymce.isGecko) {
+					if (findParentLayer(node)) {
+						if (doc.designMode !== 'on') {
+							doc.designMode = 'on';
+
+							// Repaint caret
+							node = doc.body;
+							parent = node.parentNode;
+							parent.removeChild(node);
+							parent.appendChild(node);
+						}
+					} else if (doc.designMode == 'on') {
+						doc.designMode = 'off';
+					}
+				}
+			});
+
+			ed.onNodeChange.add(t._nodeChange, t);
+			ed.onVisualAid.add(t._visualAid, t);
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Layer',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/layer',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		},
+
+		// Private methods
+
+		_nodeChange : function(ed, cm, n) {
+			var le, p;
+
+			le = this._getParentLayer(n);
+			p = ed.dom.getParent(n, 'DIV,P,IMG');
+
+			if (!p) {
+				cm.setDisabled('absolute', 1);
+				cm.setDisabled('moveforward', 1);
+				cm.setDisabled('movebackward', 1);
+			} else {
+				cm.setDisabled('absolute', 0);
+				cm.setDisabled('moveforward', !le);
+				cm.setDisabled('movebackward', !le);
+				cm.setActive('absolute', le && le.style.position.toLowerCase() == "absolute");
+			}
+		},
+
+		// Private methods
+
+		_visualAid : function(ed, e, s) {
+			var dom = ed.dom;
+
+			tinymce.each(dom.select('div,p', e), function(e) {
+				if (/^(absolute|relative|fixed)$/i.test(e.style.position)) {
+					if (s)
+						dom.addClass(e, 'mceItemVisualAid');
+					else
+						dom.removeClass(e, 'mceItemVisualAid');
+
+					dom.addClass(e, 'mceItemLayer');
+				}
+			});
+		},
+
+		_move : function(d) {
+			var ed = this.editor, i, z = [], le = this._getParentLayer(ed.selection.getNode()), ci = -1, fi = -1, nl;
+
+			nl = [];
+			tinymce.walk(ed.getBody(), function(n) {
+				if (n.nodeType == 1 && /^(absolute|relative|static)$/i.test(n.style.position))
+					nl.push(n); 
+			}, 'childNodes');
+
+			// Find z-indexes
+			for (i=0; i<nl.length; i++) {
+				z[i] = nl[i].style.zIndex ? parseInt(nl[i].style.zIndex) : 0;
+
+				if (ci < 0 && nl[i] == le)
+					ci = i;
+			}
+
+			if (d < 0) {
+				// Move back
+
+				// Try find a lower one
+				for (i=0; i<z.length; i++) {
+					if (z[i] < z[ci]) {
+						fi = i;
+						break;
+					}
+				}
+
+				if (fi > -1) {
+					nl[ci].style.zIndex = z[fi];
+					nl[fi].style.zIndex = z[ci];
+				} else {
+					if (z[ci] > 0)
+						nl[ci].style.zIndex = z[ci] - 1;
+				}
+			} else {
+				// Move forward
+
+				// Try find a higher one
+				for (i=0; i<z.length; i++) {
+					if (z[i] > z[ci]) {
+						fi = i;
+						break;
+					}
+				}
+
+				if (fi > -1) {
+					nl[ci].style.zIndex = z[fi];
+					nl[fi].style.zIndex = z[ci];
+				} else
+					nl[ci].style.zIndex = z[ci] + 1;
+			}
+
+			ed.execCommand('mceRepaint');
+		},
+
+		_getParentLayer : function(n) {
+			return this.editor.dom.getParent(n, function(n) {
+				return n.nodeType == 1 && /^(absolute|relative|static)$/i.test(n.style.position);
+			});
+		},
+
+		_insertLayer : function() {
+			var ed = this.editor, dom = ed.dom, p = dom.getPos(dom.getParent(ed.selection.getNode(), '*')), body = ed.getBody();
+
+			ed.dom.add(body, 'div', {
+				style : {
+					position : 'absolute',
+					left : p.x,
+					top : (p.y > 20 ? p.y : 20),
+					width : 100,
+					height : 100
+				},
+				'class' : 'mceItemVisualAid mceItemLayer'
+			}, ed.selection.getContent() || ed.getLang('layer.content'));
+
+			// Workaround for IE where it messes up the JS engine if you insert a layer on IE 6,7
+			if (tinymce.isIE)
+				dom.setHTML(body, body.innerHTML);
+		},
+
+		_toggleAbsolute : function() {
+			var ed = this.editor, le = this._getParentLayer(ed.selection.getNode());
+
+			if (!le)
+				le = ed.dom.getParent(ed.selection.getNode(), 'DIV,P,IMG');
+
+			if (le) {
+				if (le.style.position.toLowerCase() == "absolute") {
+					ed.dom.setStyles(le, {
+						position : '',
+						left : '',
+						top : '',
+						width : '',
+						height : ''
+					});
+
+					ed.dom.removeClass(le, 'mceItemVisualAid');
+					ed.dom.removeClass(le, 'mceItemLayer');
+				} else {
+					if (le.style.left == "")
+						le.style.left = 20 + 'px';
+
+					if (le.style.top == "")
+						le.style.top = 20 + 'px';
+
+					if (le.style.width == "")
+						le.style.width = le.width ? (le.width + 'px') : '100px';
+
+					if (le.style.height == "")
+						le.style.height = le.height ? (le.height + 'px') : '100px';
+
+					le.style.position = "absolute";
+
+					ed.dom.setAttrib(le, 'data-mce-style', '');
+					ed.addVisual(ed.getBody());
+				}
+
+				ed.execCommand('mceRepaint');
+				ed.nodeChanged();
+			}
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('layer', tinymce.plugins.Layer);
+})();
\ No newline at end of file
diff --git a/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin_src.js b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin_src.js
new file mode 100644
index 0000000..349bf80
--- /dev/null
+++ b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin_src.js
@@ -0,0 +1,139 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ *
+ * This plugin will force TinyMCE to produce deprecated legacy output such as font elements, u elements, align
+ * attributes and so forth. There are a few cases where these old items might be needed for example in email applications or with Flash
+ *
+ * However you should NOT use this plugin if you are building some system that produces web contents such as a CMS. All these elements are
+ * not apart of the newer specifications for HTML and XHTML.
+ */
+
+(function(tinymce) {
+	// Override inline_styles setting to force TinyMCE to produce deprecated contents
+	tinymce.onAddEditor.addToTop(function(tinymce, editor) {
+		editor.settings.inline_styles = false;
+	});
+
+	// Create the legacy ouput plugin
+	tinymce.create('tinymce.plugins.LegacyOutput', {
+		init : function(editor) {
+			editor.onInit.add(function() {
+				var alignElements = 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img',
+					fontSizes = tinymce.explode(editor.settings.font_size_style_values),
+					schema = editor.schema;
+
+				// Override some internal formats to produce legacy elements and attributes
+				editor.formatter.register({
+					// Change alignment formats to use the deprecated align attribute
+					alignleft : {selector : alignElements, attributes : {align : 'left'}},
+					aligncenter : {selector : alignElements, attributes : {align : 'center'}},
+					alignright : {selector : alignElements, attributes : {align : 'right'}},
+					alignfull : {selector : alignElements, attributes : {align : 'justify'}},
+
+					// Change the basic formatting elements to use deprecated element types
+					bold : [
+						{inline : 'b', remove : 'all'},
+						{inline : 'strong', remove : 'all'},
+						{inline : 'span', styles : {fontWeight : 'bold'}}
+					],
+					italic : [
+						{inline : 'i', remove : 'all'},
+						{inline : 'em', remove : 'all'},
+						{inline : 'span', styles : {fontStyle : 'italic'}}
+					],
+					underline : [
+						{inline : 'u', remove : 'all'},
+						{inline : 'span', styles : {textDecoration : 'underline'}, exact : true}
+					],
+					strikethrough : [
+						{inline : 'strike', remove : 'all'},
+						{inline : 'span', styles : {textDecoration: 'line-through'}, exact : true}
+					],
+
+					// Change font size and font family to use the deprecated font element
+					fontname : {inline : 'font', attributes : {face : '%value'}},
+					fontsize : {
+						inline : 'font',
+						attributes : {
+							size : function(vars) {
+								return tinymce.inArray(fontSizes, vars.value) + 1;
+							}
+						}
+					},
+
+					// Setup font elements for colors as well
+					forecolor : {inline : 'font', attributes : {color : '%value'}},
+					hilitecolor : {inline : 'font', styles : {backgroundColor : '%value'}}
+				});
+
+				// Check that deprecated elements are allowed if not add them
+				tinymce.each('b,i,u,strike'.split(','), function(name) {
+					schema.addValidElements(name + '[*]');
+				});
+
+				// Add font element if it's missing
+				if (!schema.getElementRule("font"))
+					schema.addValidElements("font[face|size|color|style]");
+
+				// Add the missing and depreacted align attribute for the serialization engine
+				tinymce.each(alignElements.split(','), function(name) {
+					var rule = schema.getElementRule(name), found;
+
+					if (rule) {
+						if (!rule.attributes.align) {
+							rule.attributes.align = {};
+							rule.attributesOrder.push('align');
+						}
+					}
+				});
+
+				// Listen for the onNodeChange event so that we can do special logic for the font size and font name drop boxes
+				editor.onNodeChange.add(function(editor, control_manager) {
+					var control, fontElm, fontName, fontSize;
+
+					// Find font element get it's name and size
+					fontElm = editor.dom.getParent(editor.selection.getNode(), 'font');
+					if (fontElm) {
+						fontName = fontElm.face;
+						fontSize = fontElm.size;
+					}
+
+					// Select/unselect the font name in droplist
+					if (control = control_manager.get('fontselect')) {
+						control.select(function(value) {
+							return value == fontName;
+						});
+					}
+
+					// Select/unselect the font size in droplist
+					if (control = control_manager.get('fontsizeselect')) {
+						control.select(function(value) {
+							var index = tinymce.inArray(fontSizes, value.fontSize);
+
+							return index + 1 == fontSize;
+						});
+					}
+				});
+			});
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'LegacyOutput',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/legacyoutput',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('legacyoutput', tinymce.plugins.LegacyOutput);
+})(tinymce);
diff --git a/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/lists/editor_plugin_src.js b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/lists/editor_plugin_src.js
new file mode 100644
index 0000000..1000ef7
--- /dev/null
+++ b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/lists/editor_plugin_src.js
@@ -0,0 +1,955 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2011, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	var each = tinymce.each, Event = tinymce.dom.Event, bookmark;
+
+	// Skips text nodes that only contain whitespace since they aren't semantically important.
+	function skipWhitespaceNodes(e, next) {
+		while (e && (e.nodeType === 8 || (e.nodeType === 3 && /^[ \t\n\r]*$/.test(e.nodeValue)))) {
+			e = next(e);
+		}
+		return e;
+	}
+
+	function skipWhitespaceNodesBackwards(e) {
+		return skipWhitespaceNodes(e, function(e) {
+			return e.previousSibling;
+		});
+	}
+
+	function skipWhitespaceNodesForwards(e) {
+		return skipWhitespaceNodes(e, function(e) {
+			return e.nextSibling;
+		});
+	}
+
+	function hasParentInList(ed, e, list) {
+		return ed.dom.getParent(e, function(p) {
+			return tinymce.inArray(list, p) !== -1;
+		});
+	}
+
+	function isList(e) {
+		return e && (e.tagName === 'OL' || e.tagName === 'UL');
+	}
+
+	function splitNestedLists(element, dom) {
+		var tmp, nested, wrapItem;
+		tmp = skipWhitespaceNodesBackwards(element.lastChild);
+		while (isList(tmp)) {
+			nested = tmp;
+			tmp = skipWhitespaceNodesBackwards(nested.previousSibling);
+		}
+		if (nested) {
+			wrapItem = dom.create('li', { style: 'list-style-type: none;'});
+			dom.split(element, nested);
+			dom.insertAfter(wrapItem, nested);
+			wrapItem.appendChild(nested);
+			wrapItem.appendChild(nested);
+			element = wrapItem.previousSibling;
+		}
+		return element;
+	}
+
+	function attemptMergeWithAdjacent(e, allowDifferentListStyles, mergeParagraphs) {
+		e = attemptMergeWithPrevious(e, allowDifferentListStyles, mergeParagraphs);
+		return attemptMergeWithNext(e, allowDifferentListStyles, mergeParagraphs);
+	}
+
+	function attemptMergeWithPrevious(e, allowDifferentListStyles, mergeParagraphs) {
+		var prev = skipWhitespaceNodesBackwards(e.previousSibling);
+		if (prev) {
+			return attemptMerge(prev, e, allowDifferentListStyles ? prev : false, mergeParagraphs);
+		} else {
+			return e;
+		}
+	}
+
+	function attemptMergeWithNext(e, allowDifferentListStyles, mergeParagraphs) {
+		var next = skipWhitespaceNodesForwards(e.nextSibling);
+		if (next) {
+			return attemptMerge(e, next, allowDifferentListStyles ? next : false, mergeParagraphs);
+		} else {
+			return e;
+		}
+	}
+
+	function attemptMerge(e1, e2, differentStylesMasterElement, mergeParagraphs) {
+		if (canMerge(e1, e2, !!differentStylesMasterElement, mergeParagraphs)) {
+			return merge(e1, e2, differentStylesMasterElement);
+		} else if (e1 && e1.tagName === 'LI' && isList(e2)) {
+			// Fix invalidly nested lists.
+			e1.appendChild(e2);
+		}
+		return e2;
+	}
+
+	function canMerge(e1, e2, allowDifferentListStyles, mergeParagraphs) {
+		if (!e1 || !e2) {
+			return false;
+		} else if (e1.tagName === 'LI' && e2.tagName === 'LI') {
+			return e2.style.listStyleType === 'none' || containsOnlyAList(e2);
+		} else if (isList(e1)) {
+			return (e1.tagName === e2.tagName && (allowDifferentListStyles || e1.style.listStyleType === e2.style.listStyleType)) || isListForIndent(e2);
+		} else return mergeParagraphs && e1.tagName === 'P' && e2.tagName === 'P';
+	}
+
+	function isListForIndent(e) {
+		var firstLI = skipWhitespaceNodesForwards(e.firstChild), lastLI = skipWhitespaceNodesBackwards(e.lastChild);
+		return firstLI && lastLI && isList(e) && firstLI === lastLI && (isList(firstLI) || firstLI.style.listStyleType === 'none' || containsOnlyAList(firstLI));
+	}
+
+	function containsOnlyAList(e) {
+		var firstChild = skipWhitespaceNodesForwards(e.firstChild), lastChild = skipWhitespaceNodesBackwards(e.lastChild);
+		return firstChild && lastChild && firstChild === lastChild && isList(firstChild);
+	}
+
+	function merge(e1, e2, masterElement) {
+		var lastOriginal = skipWhitespaceNodesBackwards(e1.lastChild), firstNew = skipWhitespaceNodesForwards(e2.firstChild);
+		if (e1.tagName === 'P') {
+			e1.appendChild(e1.ownerDocument.createElement('br'));
+		}
+		while (e2.firstChild) {
+			e1.appendChild(e2.firstChild);
+		}
+		if (masterElement) {
+			e1.style.listStyleType = masterElement.style.listStyleType;
+		}
+		e2.parentNode.removeChild(e2);
+		attemptMerge(lastOriginal, firstNew, false);
+		return e1;
+	}
+
+	function findItemToOperateOn(e, dom) {
+		var item;
+		if (!dom.is(e, 'li,ol,ul')) {
+			item = dom.getParent(e, 'li');
+			if (item) {
+				e = item;
+			}
+		}
+		return e;
+	}
+
+	tinymce.create('tinymce.plugins.Lists', {
+		init: function(ed) {
+			var LIST_TABBING = 'TABBING';
+			var LIST_EMPTY_ITEM = 'EMPTY';
+			var LIST_ESCAPE = 'ESCAPE';
+			var LIST_PARAGRAPH = 'PARAGRAPH';
+			var LIST_UNKNOWN = 'UNKNOWN';
+			var state = LIST_UNKNOWN;
+
+			function isTabInList(e) {
+				// Don't indent on Ctrl+Tab or Alt+Tab
+				return e.keyCode === tinymce.VK.TAB && !(e.altKey || e.ctrlKey) &&
+					(ed.queryCommandState('InsertUnorderedList') || ed.queryCommandState('InsertOrderedList'));
+			}
+
+			function isOnLastListItem() {
+				var li = getLi();
+				var grandParent = li.parentNode.parentNode;
+				var isLastItem = li.parentNode.lastChild === li;
+				return isLastItem && !isNestedList(grandParent) && isEmptyListItem(li);
+			}
+
+			function isNestedList(grandParent) {
+				if (isList(grandParent)) {
+					return grandParent.parentNode && grandParent.parentNode.tagName === 'LI';
+				} else {
+					return  grandParent.tagName === 'LI';
+				}
+			}
+
+			function isInEmptyListItem() {
+				return ed.selection.isCollapsed() && isEmptyListItem(getLi());
+			}
+
+			function getLi() {
+				var n = ed.selection.getStart();
+				// Get start will return BR if the LI only contains a BR or an empty element as we use these to fix caret position
+				return ((n.tagName == 'BR' || n.tagName == '') && n.parentNode.tagName == 'LI') ? n.parentNode : n;
+			}
+
+			function isEmptyListItem(li) {
+				var numChildren = li.childNodes.length;
+				if (li.tagName === 'LI') {
+					return numChildren == 0 ? true : numChildren == 1 && (li.firstChild.tagName == '' || li.firstChild.tagName == 'BR' || isEmptyIE9Li(li));
+				}
+				return false;
+			}
+
+			function isEmptyIE9Li(li) {
+				// only consider this to be last item if there is no list item content or that content is nbsp or space since IE9 creates these
+				var lis = tinymce.grep(li.parentNode.childNodes, function(n) {return n.tagName == 'LI'});
+				var isLastLi = li == lis[lis.length - 1];
+				var child = li.firstChild;
+				return tinymce.isIE9 && isLastLi && (child.nodeValue == String.fromCharCode(160) || child.nodeValue == String.fromCharCode(32));
+			}
+
+			function isEnter(e) {
+				return e.keyCode === tinymce.VK.ENTER;
+			}
+
+			function isEnterWithoutShift(e) {
+				return isEnter(e) && !e.shiftKey;
+			}
+
+			function getListKeyState(e) {
+				if (isTabInList(e)) {
+					return LIST_TABBING;
+				} else if (isEnterWithoutShift(e) && isOnLastListItem()) {
+					// Returns LIST_UNKNOWN since breaking out of lists is handled by the EnterKey.js logic now
+					//return LIST_ESCAPE;
+					return LIST_UNKNOWN;
+				} else if (isEnterWithoutShift(e) && isInEmptyListItem()) {
+					return LIST_EMPTY_ITEM;
+				} else {
+					return LIST_UNKNOWN;
+				}
+			}
+
+			function cancelDefaultEvents(ed, e) {
+				// list escape is done manually using outdent as it does not create paragraphs correctly in td's
+				if (state == LIST_TABBING || state == LIST_EMPTY_ITEM || tinymce.isGecko && state == LIST_ESCAPE) {
+					Event.cancel(e);
+				}
+			}
+
+			function isCursorAtEndOfContainer() {
+				var range = ed.selection.getRng(true);
+				var startContainer = range.startContainer;
+				if (startContainer.nodeType == 3) {
+					var value = startContainer.nodeValue;
+					if (tinymce.isIE9 && value.length > 1 && value.charCodeAt(value.length-1) == 32) {
+						// IE9 places a space on the end of the text in some cases so ignore last char
+						return (range.endOffset == value.length-1);
+					} else {
+						return (range.endOffset == value.length);
+					}
+				} else if (startContainer.nodeType == 1) {
+					return range.endOffset == startContainer.childNodes.length;
+				}
+				return false;
+			}
+
+			/*
+			 	If we are at the end of a list item surrounded with an element, pressing enter should create a
+			 	new list item instead without splitting the element e.g. don't want to create new P or H1 tag
+			  */
+			function isEndOfListItem() {
+				var node = ed.selection.getNode();
+				var validElements = 'h1,h2,h3,h4,h5,h6,p,div';
+				var isLastParagraphOfLi = ed.dom.is(node, validElements) && node.parentNode.tagName === 'LI' && node.parentNode.lastChild === node;
+				return ed.selection.isCollapsed() && isLastParagraphOfLi && isCursorAtEndOfContainer();
+			}
+
+			// Creates a new list item after the current selection's list item parent
+			function createNewLi(ed, e) {
+				if (isEnterWithoutShift(e) && isEndOfListItem()) {
+					var node = ed.selection.getNode();
+					var li = ed.dom.create("li");
+					var parentLi = ed.dom.getParent(node, 'li');
+					ed.dom.insertAfter(li, parentLi);
+
+					// Move caret to new list element.
+					if (tinymce.isIE6 || tinymce.isIE7 || tinyMCE.isIE8) {
+						// Removed this line since it would create an odd <&nbsp;> tag and placing the caret inside an empty LI is handled and should be handled by the selection logic
+						//li.appendChild(ed.dom.create("&nbsp;")); // IE needs an element within the bullet point
+						ed.selection.setCursorLocation(li, 1);
+					} else {
+						ed.selection.setCursorLocation(li, 0);
+					}
+					e.preventDefault();
+				}
+			}
+
+			function imageJoiningListItem(ed, e) {
+				var prevSibling;
+
+				if (!tinymce.isGecko)
+					return;
+
+				var n = ed.selection.getStart();
+				if (e.keyCode != tinymce.VK.BACKSPACE || n.tagName !== 'IMG')
+					return;
+
+				function lastLI(node) {
+					var child = node.firstChild;
+					var li = null;
+					do {
+						if (!child)
+							break;
+
+						if (child.tagName === 'LI')
+							li = child;
+					} while (child = child.nextSibling);
+
+					return li;
+				}
+
+				function addChildren(parentNode, destination) {
+					while (parentNode.childNodes.length > 0)
+						destination.appendChild(parentNode.childNodes[0]);
+				}
+
+				// Check if there is a previous sibling
+				prevSibling = n.parentNode.previousSibling;
+				if (!prevSibling)
+					return;
+
+				var ul;
+				if (prevSibling.tagName === 'UL' || prevSibling.tagName === 'OL')
+					ul = prevSibling;
+				else if (prevSibling.previousSibling && (prevSibling.previousSibling.tagName === 'UL' || prevSibling.previousSibling.tagName === 'OL'))
+					ul = prevSibling.previousSibling;
+				else
+					return;
+
+				var li = lastLI(ul);
+
+				// move the caret to the end of the list item
+				var rng = ed.dom.createRng();
+				rng.setStart(li, 1);
+				rng.setEnd(li, 1);
+				ed.selection.setRng(rng);
+				ed.selection.collapse(true);
+
+				// save a bookmark at the end of the list item
+				var bookmark = ed.selection.getBookmark();
+
+				// copy the image an its text to the list item
+				var clone = n.parentNode.cloneNode(true);
+				if (clone.tagName === 'P' || clone.tagName === 'DIV')
+					addChildren(clone, li);
+				else
+					li.appendChild(clone);
+
+				// remove the old copy of the image
+				n.parentNode.parentNode.removeChild(n.parentNode);
+
+				// move the caret where we saved the bookmark
+				ed.selection.moveToBookmark(bookmark);
+			}
+
+			// fix the cursor position to ensure it is correct in IE
+			function setCursorPositionToOriginalLi(li) {
+				var list = ed.dom.getParent(li, 'ol,ul');
+				if (list != null) {
+					var lastLi = list.lastChild;
+					// Removed this line since IE9 would report an DOM character error and placing the caret inside an empty LI is handled and should be handled by the selection logic
+					//lastLi.appendChild(ed.getDoc().createElement(''));
+					ed.selection.setCursorLocation(lastLi, 0);
+				}
+			}
+
+			this.ed = ed;
+			ed.addCommand('Indent', this.indent, this);
+			ed.addCommand('Outdent', this.outdent, this);
+			ed.addCommand('InsertUnorderedList', function() {
+				this.applyList('UL', 'OL');
+			}, this);
+			ed.addCommand('InsertOrderedList', function() {
+				this.applyList('OL', 'UL');
+			}, this);
+
+			ed.onInit.add(function() {
+				ed.editorCommands.addCommands({
+					'outdent': function() {
+						var sel = ed.selection, dom = ed.dom;
+
+						function hasStyleIndent(n) {
+							n = dom.getParent(n, dom.isBlock);
+							return n && (parseInt(ed.dom.getStyle(n, 'margin-left') || 0, 10) + parseInt(ed.dom.getStyle(n, 'padding-left') || 0, 10)) > 0;
+						}
+
+						return hasStyleIndent(sel.getStart()) || hasStyleIndent(sel.getEnd()) || ed.queryCommandState('InsertOrderedList') || ed.queryCommandState('InsertUnorderedList');
+					}
+				}, 'state');
+			});
+
+			ed.onKeyUp.add(function(ed, e) {
+				if (state == LIST_TABBING) {
+					ed.execCommand(e.shiftKey ? 'Outdent' : 'Indent', true, null);
+					state = LIST_UNKNOWN;
+					return Event.cancel(e);
+				} else if (state == LIST_EMPTY_ITEM) {
+					var li = getLi();
+					var shouldOutdent =  ed.settings.list_outdent_on_enter === true || e.shiftKey;
+					ed.execCommand(shouldOutdent ? 'Outdent' : 'Indent', true, null);
+					if (tinymce.isIE) {
+						setCursorPositionToOriginalLi(li);
+					}
+
+					return Event.cancel(e);
+				} else if (state == LIST_ESCAPE) {
+					if (tinymce.isIE6 || tinymce.isIE7 || tinymce.isIE8) {
+						// append a zero sized nbsp so that caret is positioned correctly in IE after escaping and applying formatting.
+						// if there is no text then applying formatting for e.g a H1 to the P tag immediately following list after
+						// escaping from it will cause the caret to be positioned on the last li instead of staying the in P tag.
+						var n = ed.getDoc().createTextNode('\uFEFF');
+						ed.selection.getNode().appendChild(n);
+					} else if (tinymce.isIE9 || tinymce.isGecko) {
+						// IE9 does not escape the list so we use outdent to do this and cancel the default behaviour
+						// Gecko does not create a paragraph outdenting inside a TD so default behaviour is cancelled and we outdent ourselves
+						ed.execCommand('Outdent');
+						return Event.cancel(e);
+					}
+				}
+			});
+
+			function fixListItem(parent, reference) {
+				// a zero-sized non-breaking space is placed in the empty list item so that the nested list is
+				// displayed on the below line instead of next to it
+				var n = ed.getDoc().createTextNode('\uFEFF');
+				parent.insertBefore(n, reference);
+				ed.selection.setCursorLocation(n, 0);
+				// repaint to remove rendering artifact. only visible when creating new list
+				ed.execCommand('mceRepaint');
+			}
+
+			function fixIndentedListItemForGecko(ed, e) {
+				if (isEnter(e)) {
+					var li = getLi();
+					if (li) {
+						var parent = li.parentNode;
+						var grandParent = parent && parent.parentNode;
+						if (grandParent && grandParent.nodeName == 'LI' && grandParent.firstChild == parent && li == parent.firstChild) {
+							fixListItem(grandParent, parent);
+						}
+					}
+				}
+			}
+
+			function fixIndentedListItemForIE8(ed, e) {
+				if (isEnter(e)) {
+					var li = getLi();
+					if (ed.dom.select('ul li', li).length === 1) {
+						var list = li.firstChild;
+						fixListItem(li, list);
+					}
+				}
+			}
+
+			function fixDeletingFirstCharOfList(ed, e) {
+				function listElements(li) {
+					var elements = [];
+					var walker = new tinymce.dom.TreeWalker(li.firstChild, li);
+					for (var node = walker.current(); node; node = walker.next()) {
+						if (ed.dom.is(node, 'ol,ul,li')) {
+							elements.push(node);
+						}
+					}
+					return elements;
+				}
+
+				if (e.keyCode == tinymce.VK.BACKSPACE) {
+					var li = getLi();
+					if (li) {
+						var list = ed.dom.getParent(li, 'ol,ul'),
+							rng  = ed.selection.getRng();
+						if (list && list.firstChild === li && rng.startOffset == 0) {
+							var elements = listElements(li);
+							elements.unshift(li);
+							ed.execCommand("Outdent", false, elements);
+							ed.undoManager.add();
+							return Event.cancel(e);
+						}
+					}
+				}
+			}
+
+			function fixDeletingEmptyLiInWebkit(ed, e) {
+				var li = getLi();
+				if (e.keyCode === tinymce.VK.BACKSPACE && ed.dom.is(li, 'li') && li.parentNode.firstChild!==li) {
+					if (ed.dom.select('ul,ol', li).length === 1) {
+						var prevLi = li.previousSibling;
+						ed.dom.remove(ed.dom.select('br', li));
+						ed.dom.remove(li, true);
+						var textNodes = tinymce.grep(prevLi.childNodes, function(n){ return n.nodeType === 3 });
+						if (textNodes.length === 1) {
+							var textNode = textNodes[0];
+							ed.selection.setCursorLocation(textNode, textNode.length);
+						}
+						ed.undoManager.add();
+						return Event.cancel(e);
+					}
+				}
+			}
+
+			ed.onKeyDown.add(function(_, e) { state = getListKeyState(e); });
+			ed.onKeyDown.add(cancelDefaultEvents);
+			ed.onKeyDown.add(imageJoiningListItem);
+			ed.onKeyDown.add(createNewLi);
+
+			if (tinymce.isGecko) {
+				ed.onKeyUp.add(fixIndentedListItemForGecko);
+			}
+			if (tinymce.isIE8) {
+				ed.onKeyUp.add(fixIndentedListItemForIE8);
+			}
+			if (tinymce.isGecko || tinymce.isWebKit) {
+				ed.onKeyDown.add(fixDeletingFirstCharOfList);
+			}
+			if (tinymce.isWebKit) {
+				ed.onKeyDown.add(fixDeletingEmptyLiInWebkit);
+			}
+		},
+
+		applyList: function(targetListType, oppositeListType) {
+			var t = this, ed = t.ed, dom = ed.dom, applied = [], hasSameType = false, hasOppositeType = false, hasNonList = false, actions,
+					selectedBlocks = ed.selection.getSelectedBlocks();
+
+			function cleanupBr(e) {
+				if (e && e.tagName === 'BR') {
+					dom.remove(e);
+				}
+			}
+
+			function makeList(element) {
+				var list = dom.create(targetListType), li;
+
+				function adjustIndentForNewList(element) {
+					// If there's a margin-left, outdent one level to account for the extra list margin.
+					if (element.style.marginLeft || element.style.paddingLeft) {
+						t.adjustPaddingFunction(false)(element);
+					}
+				}
+
+				if (element.tagName === 'LI') {
+					// No change required.
+				} else if (element.tagName === 'P' || element.tagName === 'DIV' || element.tagName === 'BODY') {
+					processBrs(element, function(startSection, br) {
+						doWrapList(startSection, br, element.tagName === 'BODY' ? null : startSection.parentNode);
+						li = startSection.parentNode;
+						adjustIndentForNewList(li);
+						cleanupBr(br);
+					});
+					if (li) {
+						if (li.tagName === 'LI' && (element.tagName === 'P' || selectedBlocks.length > 1)) {
+							dom.split(li.parentNode.parentNode, li.parentNode);
+						}
+						attemptMergeWithAdjacent(li.parentNode, true);
+					}
+					return;
+				} else {
+					// Put the list around the element.
+					li = dom.create('li');
+					dom.insertAfter(li, element);
+					li.appendChild(element);
+					adjustIndentForNewList(element);
+					element = li;
+				}
+				dom.insertAfter(list, element);
+				list.appendChild(element);
+				attemptMergeWithAdjacent(list, true);
+				applied.push(element);
+			}
+
+			function doWrapList(start, end, template) {
+				var li, n = start, tmp;
+				while (!dom.isBlock(start.parentNode) && start.parentNode !== dom.getRoot()) {
+					start = dom.split(start.parentNode, start.previousSibling);
+					start = start.nextSibling;
+					n = start;
+				}
+				if (template) {
+					li = template.cloneNode(true);
+					start.parentNode.insertBefore(li, start);
+					while (li.firstChild) dom.remove(li.firstChild);
+					li = dom.rename(li, 'li');
+				} else {
+					li = dom.create('li');
+					start.parentNode.insertBefore(li, start);
+				}
+				while (n && n != end) {
+					tmp = n.nextSibling;
+					li.appendChild(n);
+					n = tmp;
+				}
+				if (li.childNodes.length === 0) {
+					li.innerHTML = '<br _mce_bogus="1" />';
+				}
+				makeList(li);
+			}
+
+			function processBrs(element, callback) {
+				var startSection, previousBR, END_TO_START = 3, START_TO_END = 1,
+						breakElements = 'br,ul,ol,p,div,h1,h2,h3,h4,h5,h6,table,blockquote,address,pre,form,center,dl';
+
+				function isAnyPartSelected(start, end) {
+					var r = dom.createRng(), sel;
+					bookmark.keep = true;
+					ed.selection.moveToBookmark(bookmark);
+					bookmark.keep = false;
+					sel = ed.selection.getRng(true);
+					if (!end) {
+						end = start.parentNode.lastChild;
+					}
+					r.setStartBefore(start);
+					r.setEndAfter(end);
+					return !(r.compareBoundaryPoints(END_TO_START, sel) > 0 || r.compareBoundaryPoints(START_TO_END, sel) <= 0);
+				}
+
+				function nextLeaf(br) {
+					if (br.nextSibling)
+						return br.nextSibling;
+					if (!dom.isBlock(br.parentNode) && br.parentNode !== dom.getRoot())
+						return nextLeaf(br.parentNode);
+				}
+
+				// Split on BRs within the range and process those.
+				startSection = element.firstChild;
+				// First mark the BRs that have any part of the previous section selected.
+				var trailingContentSelected = false;
+				each(dom.select(breakElements, element), function(br) {
+					if (br.hasAttribute && br.hasAttribute('_mce_bogus')) {
+						return true; // Skip the bogus Brs that are put in to appease Firefox and Safari.
+					}
+					if (isAnyPartSelected(startSection, br)) {
+						dom.addClass(br, '_mce_tagged_br');
+						startSection = nextLeaf(br);
+					}
+				});
+				trailingContentSelected = (startSection && isAnyPartSelected(startSection, undefined));
+				startSection = element.firstChild;
+				each(dom.select(breakElements, element), function(br) {
+					// Got a section from start to br.
+					var tmp = nextLeaf(br);
+					if (br.hasAttribute && br.hasAttribute('_mce_bogus')) {
+						return true; // Skip the bogus Brs that are put in to appease Firefox and Safari.
+					}
+					if (dom.hasClass(br, '_mce_tagged_br')) {
+						callback(startSection, br, previousBR);
+						previousBR = null;
+					} else {
+						previousBR = br;
+					}
+					startSection = tmp;
+				});
+				if (trailingContentSelected) {
+					callback(startSection, undefined, previousBR);
+				}
+			}
+
+			function wrapList(element) {
+				processBrs(element, function(startSection, br, previousBR) {
+					// Need to indent this part
+					doWrapList(startSection, br);
+					cleanupBr(br);
+					cleanupBr(previousBR);
+				});
+			}
+
+			function changeList(element) {
+				if (tinymce.inArray(applied, element) !== -1) {
+					return;
+				}
+				if (element.parentNode.tagName === oppositeListType) {
+					dom.split(element.parentNode, element);
+					makeList(element);
+					attemptMergeWithNext(element.parentNode, false);
+				}
+				applied.push(element);
+			}
+
+			function convertListItemToParagraph(element) {
+				var child, nextChild, mergedElement, splitLast;
+				if (tinymce.inArray(applied, element) !== -1) {
+					return;
+				}
+				element = splitNestedLists(element, dom);
+				while (dom.is(element.parentNode, 'ol,ul,li')) {
+					dom.split(element.parentNode, element);
+				}
+				// Push the original element we have from the selection, not the renamed one.
+				applied.push(element);
+				element = dom.rename(element, 'p');
+				mergedElement = attemptMergeWithAdjacent(element, false, ed.settings.force_br_newlines);
+				if (mergedElement === element) {
+					// Now split out any block elements that can't be contained within a P.
+					// Manually iterate to ensure we handle modifications correctly (doesn't work with tinymce.each)
+					child = element.firstChild;
+					while (child) {
+						if (dom.isBlock(child)) {
+							child = dom.split(child.parentNode, child);
+							splitLast = true;
+							nextChild = child.nextSibling && child.nextSibling.firstChild;
+						} else {
+							nextChild = child.nextSibling;
+							if (splitLast && child.tagName === 'BR') {
+								dom.remove(child);
+							}
+							splitLast = false;
+						}
+						child = nextChild;
+					}
+				}
+			}
+
+			each(selectedBlocks, function(e) {
+				e = findItemToOperateOn(e, dom);
+				if (e.tagName === oppositeListType || (e.tagName === 'LI' && e.parentNode.tagName === oppositeListType)) {
+					hasOppositeType = true;
+				} else if (e.tagName === targetListType || (e.tagName === 'LI' && e.parentNode.tagName === targetListType)) {
+					hasSameType = true;
+				} else {
+					hasNonList = true;
+				}
+			});
+
+			if (hasNonList &&!hasSameType || hasOppositeType || selectedBlocks.length === 0) {
+				actions = {
+					'LI': changeList,
+					'H1': makeList,
+					'H2': makeList,
+					'H3': makeList,
+					'H4': makeList,
+					'H5': makeList,
+					'H6': makeList,
+					'P': makeList,
+					'BODY': makeList,
+					'DIV': selectedBlocks.length > 1 ? makeList : wrapList,
+					defaultAction: wrapList,
+					elements: this.selectedBlocks()
+				};
+			} else {
+				actions = {
+					defaultAction: convertListItemToParagraph,
+					elements: this.selectedBlocks(),
+					processEvenIfEmpty: true
+				};
+			}
+			this.process(actions);
+		},
+
+		indent: function() {
+			var ed = this.ed, dom = ed.dom, indented = [];
+
+			function createWrapItem(element) {
+				var wrapItem = dom.create('li', { style: 'list-style-type: none;'});
+				dom.insertAfter(wrapItem, element);
+				return wrapItem;
+			}
+
+			function createWrapList(element) {
+				var wrapItem = createWrapItem(element),
+						list = dom.getParent(element, 'ol,ul'),
+						listType = list.tagName,
+						listStyle = dom.getStyle(list, 'list-style-type'),
+						attrs = {},
+						wrapList;
+				if (listStyle !== '') {
+					attrs.style = 'list-style-type: ' + listStyle + ';';
+				}
+				wrapList = dom.create(listType, attrs);
+				wrapItem.appendChild(wrapList);
+				return wrapList;
+			}
+
+			function indentLI(element) {
+				if (!hasParentInList(ed, element, indented)) {
+					element = splitNestedLists(element, dom);
+					var wrapList = createWrapList(element);
+					wrapList.appendChild(element);
+					attemptMergeWithAdjacent(wrapList.parentNode, false);
+					attemptMergeWithAdjacent(wrapList, false);
+					indented.push(element);
+				}
+			}
+
+			this.process({
+				'LI': indentLI,
+				defaultAction: this.adjustPaddingFunction(true),
+				elements: this.selectedBlocks()
+			});
+
+		},
+
+		outdent: function(ui, elements) {
+			var t = this, ed = t.ed, dom = ed.dom, outdented = [];
+
+			function outdentLI(element) {
+				var listElement, targetParent, align;
+				if (!hasParentInList(ed, element, outdented)) {
+					if (dom.getStyle(element, 'margin-left') !== '' || dom.getStyle(element, 'padding-left') !== '') {
+						return t.adjustPaddingFunction(false)(element);
+					}
+					align = dom.getStyle(element, 'text-align', true);
+					if (align === 'center' || align === 'right') {
+						dom.setStyle(element, 'text-align', 'left');
+						return;
+					}
+					element = splitNestedLists(element, dom);
+					listElement = element.parentNode;
+					targetParent = element.parentNode.parentNode;
+					if (targetParent.tagName === 'P') {
+						dom.split(targetParent, element.parentNode);
+					} else {
+						dom.split(listElement, element);
+						if (targetParent.tagName === 'LI') {
+							// Nested list, need to split the LI and go back out to the OL/UL element.
+							dom.split(targetParent, element);
+						} else if (!dom.is(targetParent, 'ol,ul')) {
+							dom.rename(element, 'p');
+						}
+					}
+					outdented.push(element);
+				}
+			}
+
+			var listElements = elements && tinymce.is(elements, 'array') ? elements : this.selectedBlocks();
+			this.process({
+				'LI': outdentLI,
+				defaultAction: this.adjustPaddingFunction(false),
+				elements: listElements
+			});
+
+			each(outdented, attemptMergeWithAdjacent);
+		},
+
+		process: function(actions) {
+			var t = this, sel = t.ed.selection, dom = t.ed.dom, selectedBlocks, r;
+
+			function isEmptyElement(element) {
+				var excludeBrsAndBookmarks = tinymce.grep(element.childNodes, function(n) {
+					return !(n.nodeName === 'BR' || n.nodeName === 'SPAN' && dom.getAttrib(n, 'data-mce-type') == 'bookmark'
+							|| n.nodeType == 3 && (n.nodeValue == String.fromCharCode(160) || n.nodeValue == ''));
+				});
+				return excludeBrsAndBookmarks.length === 0;
+			}
+
+			function processElement(element) {
+				dom.removeClass(element, '_mce_act_on');
+				if (!element || element.nodeType !== 1 || ! actions.processEvenIfEmpty && selectedBlocks.length > 1 && isEmptyElement(element)) {
+					return;
+				}
+				element = findItemToOperateOn(element, dom);
+				var action = actions[element.tagName];
+				if (!action) {
+					action = actions.defaultAction;
+				}
+				action(element);
+			}
+
+			function recurse(element) {
+				t.splitSafeEach(element.childNodes, processElement, true);
+			}
+
+			function brAtEdgeOfSelection(container, offset) {
+				return offset >= 0 && container.hasChildNodes() && offset < container.childNodes.length &&
+						container.childNodes[offset].tagName === 'BR';
+			}
+
+			function isInTable() {
+				var n = sel.getNode();
+				var p = dom.getParent(n, 'td');
+				return p !== null;
+			}
+
+			selectedBlocks = actions.elements;
+
+			r = sel.getRng(true);
+			if (!r.collapsed) {
+				if (brAtEdgeOfSelection(r.endContainer, r.endOffset - 1)) {
+					r.setEnd(r.endContainer, r.endOffset - 1);
+					sel.setRng(r);
+				}
+				if (brAtEdgeOfSelection(r.startContainer, r.startOffset)) {
+					r.setStart(r.startContainer, r.startOffset + 1);
+					sel.setRng(r);
+				}
+			}
+
+
+			if (tinymce.isIE8) {
+				// append a zero sized nbsp so that caret is restored correctly using bookmark
+				var s = t.ed.selection.getNode();
+				if (s.tagName === 'LI' && !(s.parentNode.lastChild === s)) {
+					var i = t.ed.getDoc().createTextNode('\uFEFF');
+					s.appendChild(i);
+				}
+			}
+
+			bookmark = sel.getBookmark();
+			actions.OL = actions.UL = recurse;
+			t.splitSafeEach(selectedBlocks, processElement);
+			sel.moveToBookmark(bookmark);
+			bookmark = null;
+
+			// we avoid doing repaint in a table as this will move the caret out of the table in Firefox 3.6
+			if (!isInTable()) {
+				// Avoids table or image handles being left behind in Firefox.
+				t.ed.execCommand('mceRepaint');
+			}
+		},
+
+		splitSafeEach: function(elements, f, forceClassBase) {
+			if (forceClassBase ||
+				(tinymce.isGecko &&
+					(/Firefox\/[12]\.[0-9]/.test(navigator.userAgent) ||
+					 /Firefox\/3\.[0-4]/.test(navigator.userAgent)))) {
+				this.classBasedEach(elements, f);
+			} else {
+				each(elements, f);
+			}
+		},
+
+		classBasedEach: function(elements, f) {
+			var dom = this.ed.dom, nodes, element;
+			// Mark nodes
+			each(elements, function(element) {
+				dom.addClass(element, '_mce_act_on');
+			});
+			nodes = dom.select('._mce_act_on');
+			while (nodes.length > 0) {
+				element = nodes.shift();
+				dom.removeClass(element, '_mce_act_on');
+				f(element);
+				nodes = dom.select('._mce_act_on');
+			}
+		},
+
+		adjustPaddingFunction: function(isIndent) {
+			var indentAmount, indentUnits, ed = this.ed;
+			indentAmount = ed.settings.indentation;
+			indentUnits = /[a-z%]+/i.exec(indentAmount);
+			indentAmount = parseInt(indentAmount, 10);
+			return function(element) {
+				var currentIndent, newIndentAmount;
+				currentIndent = parseInt(ed.dom.getStyle(element, 'margin-left') || 0, 10) + parseInt(ed.dom.getStyle(element, 'padding-left') || 0, 10);
+				if (isIndent) {
+					newIndentAmount = currentIndent + indentAmount;
+				} else {
+					newIndentAmount = currentIndent - indentAmount;
+				}
+				ed.dom.setStyle(element, 'padding-left', '');
+				ed.dom.setStyle(element, 'margin-left', newIndentAmount > 0 ? newIndentAmount + indentUnits : '');
+			};
+		},
+
+		selectedBlocks: function() {
+			var ed = this.ed, selectedBlocks = ed.selection.getSelectedBlocks();
+			return selectedBlocks.length == 0 ? [ ed.dom.getRoot() ] : selectedBlocks;
+		},
+
+		getInfo: function() {
+			return {
+				longname : 'Lists',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/lists',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		}
+	});
+	tinymce.PluginManager.add("lists", tinymce.plugins.Lists);
+}());
diff --git a/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin_src.js b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin_src.js
new file mode 100644
index 0000000..2ca33ac
--- /dev/null
+++ b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin_src.js
@@ -0,0 +1,898 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	var rootAttributes = tinymce.explode('id,name,width,height,style,align,class,hspace,vspace,bgcolor,type'), excludedAttrs = tinymce.makeMap(rootAttributes.join(',')), Node = tinymce.html.Node,
+		mediaTypes, scriptRegExp, JSON = tinymce.util.JSON, mimeTypes;
+
+	// Media types supported by this plugin
+	mediaTypes = [
+		// Type, clsid:s, mime types, codebase
+		["Flash", "d27cdb6e-ae6d-11cf-96b8-444553540000", "application/x-shockwave-flash", "http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0"],
+		["ShockWave", "166b1bca-3f9c-11cf-8075-444553540000", "application/x-director", "http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0"],
+		["WindowsMedia", "6bf52a52-394a-11d3-b153-00c04f79faa6,22d6f312-b0f6-11d0-94ab-0080c74c7e95,05589fa1-c356-11ce-bf01-00aa0055595a", "application/x-mplayer2", "http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701"],
+		["QuickTime", "02bf25d5-8c17-4b23-bc80-d3488abddc6b", "video/quicktime", "http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0"],
+		["RealMedia", "cfcdaa03-8be4-11cf-b84b-0020afbbccfa", "audio/x-pn-realaudio-plugin", "http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0"],
+		["Java", "8ad9c840-044e-11d1-b3e9-00805f499d93", "application/x-java-applet", "http://java.sun.com/products/plugin/autodl/jinstall-1_5_0-windows-i586.cab#Version=1,5,0,0"],
+		["Silverlight", "dfeaf541-f3e1-4c24-acac-99c30715084a", "application/x-silverlight-2"],
+		["Iframe"],
+		["Video"],
+		["EmbeddedAudio"],
+		["Audio"]
+	];
+
+	function normalizeSize(size) {
+		return typeof(size) == "string" ? size.replace(/[^0-9%]/g, '') : size;
+	}
+
+	function toArray(obj) {
+		var undef, out, i;
+
+		if (obj && !obj.splice) {
+			out = [];
+
+			for (i = 0; true; i++) {
+				if (obj[i])
+					out[i] = obj[i];
+				else
+					break;
+			}
+
+			return out;
+		}
+
+		return obj;
+	};
+
+	tinymce.create('tinymce.plugins.MediaPlugin', {
+		init : function(ed, url) {
+			var self = this, lookup = {}, i, y, item, name;
+
+			function isMediaImg(node) {
+				return node && node.nodeName === 'IMG' && ed.dom.hasClass(node, 'mceItemMedia');
+			};
+
+			self.editor = ed;
+			self.url = url;
+
+			// Parse media types into a lookup table
+			scriptRegExp = '';
+			for (i = 0; i < mediaTypes.length; i++) {
+				name = mediaTypes[i][0];
+
+				item = {
+					name : name,
+					clsids : tinymce.explode(mediaTypes[i][1] || ''),
+					mimes : tinymce.explode(mediaTypes[i][2] || ''),
+					codebase : mediaTypes[i][3]
+				};
+
+				for (y = 0; y < item.clsids.length; y++)
+					lookup['clsid:' + item.clsids[y]] = item;
+
+				for (y = 0; y < item.mimes.length; y++)
+					lookup[item.mimes[y]] = item;
+
+				lookup['mceItem' + name] = item;
+				lookup[name.toLowerCase()] = item;
+
+				scriptRegExp += (scriptRegExp ? '|' : '') + name;
+			}
+
+			// Handle the media_types setting
+			tinymce.each(ed.getParam("media_types",
+				"video=mp4,m4v,ogv,webm;" +
+				"silverlight=xap;" +
+				"flash=swf,flv;" +
+				"shockwave=dcr;" +
+				"quicktime=mov,qt,mpg,mpeg;" +
+				"shockwave=dcr;" +
+				"windowsmedia=avi,wmv,wm,asf,asx,wmx,wvx;" +
+				"realmedia=rm,ra,ram;" +
+				"java=jar;" +
+				"audio=mp3,ogg"
+			).split(';'), function(item) {
+				var i, extensions, type;
+
+				item = item.split(/=/);
+				extensions = tinymce.explode(item[1].toLowerCase());
+				for (i = 0; i < extensions.length; i++) {
+					type = lookup[item[0].toLowerCase()];
+
+					if (type)
+						lookup[extensions[i]] = type;
+				}
+			});
+
+			scriptRegExp = new RegExp('write(' + scriptRegExp + ')\\(([^)]+)\\)');
+			self.lookup = lookup;
+
+			ed.onPreInit.add(function() {
+				// Allow video elements
+				ed.schema.addValidElements('object[id|style|width|height|classid|codebase|*],param[name|value],embed[id|style|width|height|type|src|*],video[*],audio[*],source[*]');
+
+				// Convert video elements to image placeholder
+				ed.parser.addNodeFilter('object,embed,video,audio,script,iframe', function(nodes) {
+					var i = nodes.length;
+
+					while (i--)
+						self.objectToImg(nodes[i]);
+				});
+
+				// Convert image placeholders to video elements
+				ed.serializer.addNodeFilter('img', function(nodes, name, args) {
+					var i = nodes.length, node;
+
+					while (i--) {
+						node = nodes[i];
+						if ((node.attr('class') || '').indexOf('mceItemMedia') !== -1)
+							self.imgToObject(node, args);
+					}
+				});
+			});
+
+			ed.onInit.add(function() {
+				// Display "media" instead of "img" in element path
+				if (ed.theme && ed.theme.onResolveName) {
+					ed.theme.onResolveName.add(function(theme, path_object) {
+						if (path_object.name === 'img' && ed.dom.hasClass(path_object.node, 'mceItemMedia'))
+							path_object.name = 'media';
+					});
+				}
+
+				// Add contect menu if it's loaded
+				if (ed && ed.plugins.contextmenu) {
+					ed.plugins.contextmenu.onContextMenu.add(function(plugin, menu, element) {
+						if (element.nodeName === 'IMG' && element.className.indexOf('mceItemMedia') !== -1)
+							menu.add({title : 'media.edit', icon : 'media', cmd : 'mceMedia'});
+					});
+				}
+			});
+
+			// Register commands
+			ed.addCommand('mceMedia', function() {
+				var data, img;
+
+				img = ed.selection.getNode();
+				if (isMediaImg(img)) {
+					data = ed.dom.getAttrib(img, 'data-mce-json');
+					if (data) {
+						data = JSON.parse(data);
+
+						// Add some extra properties to the data object
+						tinymce.each(rootAttributes, function(name) {
+							var value = ed.dom.getAttrib(img, name);
+
+							if (value)
+								data[name] = value;
+						});
+
+						data.type = self.getType(img.className).name.toLowerCase();
+					}
+				}
+
+				if (!data) {
+					data = {
+						type : 'flash',
+						video: {sources:[]},
+						params: {}
+					};
+				}
+
+				ed.windowManager.open({
+					file : url + '/media.htm',
+					width : 430 + parseInt(ed.getLang('media.delta_width', 0)),
+					height : 500 + parseInt(ed.getLang('media.delta_height', 0)),
+					inline : 1
+				}, {
+					plugin_url : url,
+					data : data
+				});
+			});
+
+			// Register buttons
+			ed.addButton('media', {title : 'media.desc', cmd : 'mceMedia'});
+
+			// Update media selection status
+			ed.onNodeChange.add(function(ed, cm, node) {
+				cm.setActive('media', isMediaImg(node));
+			});
+		},
+
+		convertUrl : function(url, force_absolute) {
+			var self = this, editor = self.editor, settings = editor.settings,
+				urlConverter = settings.url_converter,
+				urlConverterScope = settings.url_converter_scope || self;
+
+			if (!url)
+				return url;
+
+			if (force_absolute)
+				return editor.documentBaseURI.toAbsolute(url);
+
+			return urlConverter.call(urlConverterScope, url, 'src', 'object');
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Media',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/media',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		},
+
+		/**
+		 * Converts the JSON data object to an img node.
+		 */
+		dataToImg : function(data, force_absolute) {
+			var self = this, editor = self.editor, baseUri = editor.documentBaseURI, sources, attrs, img, i;
+
+			data.params.src = self.convertUrl(data.params.src, force_absolute);
+
+			attrs = data.video.attrs;
+			if (attrs)
+				attrs.src = self.convertUrl(attrs.src, force_absolute);
+
+			if (attrs)
+				attrs.poster = self.convertUrl(attrs.poster, force_absolute);
+
+			sources = toArray(data.video.sources);
+			if (sources) {
+				for (i = 0; i < sources.length; i++)
+					sources[i].src = self.convertUrl(sources[i].src, force_absolute);
+			}
+
+			img = self.editor.dom.create('img', {
+				id : data.id,
+				style : data.style,
+				align : data.align,
+				hspace : data.hspace,
+				vspace : data.vspace,
+				src : self.editor.theme.url + '/img/trans.gif',
+				'class' : 'mceItemMedia mceItem' + self.getType(data.type).name,
+				'data-mce-json' : JSON.serialize(data, "'")
+			});
+
+			img.width = data.width = normalizeSize(data.width || (data.type == 'audio' ? "300" : "320"));
+			img.height = data.height = normalizeSize(data.height || (data.type == 'audio' ? "32" : "240"));
+
+			return img;
+		},
+
+		/**
+		 * Converts the JSON data object to a HTML string.
+		 */
+		dataToHtml : function(data, force_absolute) {
+			return this.editor.serializer.serialize(this.dataToImg(data, force_absolute), {forced_root_block : '', force_absolute : force_absolute});
+		},
+
+		/**
+		 * Converts the JSON data object to a HTML string.
+		 */
+		htmlToData : function(html) {
+			var fragment, img, data;
+
+			data = {
+				type : 'flash',
+				video: {sources:[]},
+				params: {}
+			};
+
+			fragment = this.editor.parser.parse(html);
+			img = fragment.getAll('img')[0];
+
+			if (img) {
+				data = JSON.parse(img.attr('data-mce-json'));
+				data.type = this.getType(img.attr('class')).name.toLowerCase();
+
+				// Add some extra properties to the data object
+				tinymce.each(rootAttributes, function(name) {
+					var value = img.attr(name);
+
+					if (value)
+						data[name] = value;
+				});
+			}
+
+			return data;
+		},
+
+		/**
+		 * Get type item by extension, class, clsid or mime type.
+		 *
+		 * @method getType
+		 * @param {String} value Value to get type item by.
+		 * @return {Object} Type item object or undefined.
+		 */
+		getType : function(value) {
+			var i, values, typeItem;
+
+			// Find type by checking the classes
+			values = tinymce.explode(value, ' ');
+			for (i = 0; i < values.length; i++) {
+				typeItem = this.lookup[values[i]];
+
+				if (typeItem)
+					return typeItem;
+			}
+		},
+
+		/**
+		 * Converts a tinymce.html.Node image element to video/object/embed.
+		 */
+		imgToObject : function(node, args) {
+			var self = this, editor = self.editor, video, object, embed, iframe, name, value, data,
+				source, sources, params, param, typeItem, i, item, mp4Source, replacement,
+				posterSrc, style, audio;
+
+			// Adds the flash player
+			function addPlayer(video_src, poster_src) {
+				var baseUri, flashVars, flashVarsOutput, params, flashPlayer;
+
+				flashPlayer = editor.getParam('flash_video_player_url', self.convertUrl(self.url + '/moxieplayer.swf'));
+				if (flashPlayer) {
+					baseUri = editor.documentBaseURI;
+					data.params.src = flashPlayer;
+
+					// Convert the movie url to absolute urls
+					if (editor.getParam('flash_video_player_absvideourl', true)) {
+						video_src = baseUri.toAbsolute(video_src || '', true);
+						poster_src = baseUri.toAbsolute(poster_src || '', true);
+					}
+
+					// Generate flash vars
+					flashVarsOutput = '';
+					flashVars = editor.getParam('flash_video_player_flashvars', {url : '$url', poster : '$poster'});
+					tinymce.each(flashVars, function(value, name) {
+						// Replace $url and $poster variables in flashvars value
+						value = value.replace(/\$url/, video_src || '');
+						value = value.replace(/\$poster/, poster_src || '');
+
+						if (value.length > 0)
+							flashVarsOutput += (flashVarsOutput ? '&' : '') + name + '=' + escape(value);
+					});
+
+					if (flashVarsOutput.length)
+						data.params.flashvars = flashVarsOutput;
+
+					params = editor.getParam('flash_video_player_params', {
+						allowfullscreen: true,
+						allowscriptaccess: true
+					});
+
+					tinymce.each(params, function(value, name) {
+						data.params[name] = "" + value;
+					});
+				}
+			};
+
+			data = node.attr('data-mce-json');
+			if (!data)
+				return;
+
+			data = JSON.parse(data);
+			typeItem = this.getType(node.attr('class'));
+
+			style = node.attr('data-mce-style');
+			if (!style) {
+				style = node.attr('style');
+
+				if (style)
+					style = editor.dom.serializeStyle(editor.dom.parseStyle(style, 'img'));
+			}
+
+			// Use node width/height to override the data width/height when the placeholder is resized
+			data.width = node.attr('width') || data.width;
+			data.height = node.attr('height') || data.height;
+
+			// Handle iframe
+			if (typeItem.name === 'Iframe') {
+				replacement = new Node('iframe', 1);
+
+				tinymce.each(rootAttributes, function(name) {
+					var value = node.attr(name);
+
+					if (name == 'class' && value)
+						value = value.replace(/mceItem.+ ?/g, '');
+
+					if (value && value.length > 0)
+						replacement.attr(name, value);
+				});
+
+				for (name in data.params)
+					replacement.attr(name, data.params[name]);
+
+				replacement.attr({
+					style: style,
+					src: data.params.src
+				});
+
+				node.replace(replacement);
+
+				return;
+			}
+
+			// Handle scripts
+			if (this.editor.settings.media_use_script) {
+				replacement = new Node('script', 1).attr('type', 'text/javascript');
+
+				value = new Node('#text', 3);
+				value.value = 'write' + typeItem.name + '(' + JSON.serialize(tinymce.extend(data.params, {
+					width: node.attr('width'),
+					height: node.attr('height')
+				})) + ');';
+
+				replacement.append(value);
+				node.replace(replacement);
+
+				return;
+			}
+
+			// Add HTML5 video element
+			if (typeItem.name === 'Video' && data.video.sources[0]) {
+				// Create new object element
+				video = new Node('video', 1).attr(tinymce.extend({
+					id : node.attr('id'),
+					width: normalizeSize(node.attr('width')),
+					height: normalizeSize(node.attr('height')),
+					style : style
+				}, data.video.attrs));
+
+				// Get poster source and use that for flash fallback
+				if (data.video.attrs)
+					posterSrc = data.video.attrs.poster;
+
+				sources = data.video.sources = toArray(data.video.sources);
+				for (i = 0; i < sources.length; i++) {
+					if (/\.mp4$/.test(sources[i].src))
+						mp4Source = sources[i].src;
+				}
+
+				if (!sources[0].type) {
+					video.attr('src', sources[0].src);
+					sources.splice(0, 1);
+				}
+
+				for (i = 0; i < sources.length; i++) {
+					source = new Node('source', 1).attr(sources[i]);
+					source.shortEnded = true;
+					video.append(source);
+				}
+
+				// Create flash fallback for video if we have a mp4 source
+				if (mp4Source) {
+					addPlayer(mp4Source, posterSrc);
+					typeItem = self.getType('flash');
+				} else
+					data.params.src = '';
+			}
+
+			// Add HTML5 audio element
+			if (typeItem.name === 'Audio' && data.video.sources[0]) {
+				// Create new object element
+				audio = new Node('audio', 1).attr(tinymce.extend({
+					id : node.attr('id'),
+					width: normalizeSize(node.attr('width')),
+					height: normalizeSize(node.attr('height')),
+					style : style
+				}, data.video.attrs));
+
+				// Get poster source and use that for flash fallback
+				if (data.video.attrs)
+					posterSrc = data.video.attrs.poster;
+
+				sources = data.video.sources = toArray(data.video.sources);
+				if (!sources[0].type) {
+					audio.attr('src', sources[0].src);
+					sources.splice(0, 1);
+				}
+
+				for (i = 0; i < sources.length; i++) {
+					source = new Node('source', 1).attr(sources[i]);
+					source.shortEnded = true;
+					audio.append(source);
+				}
+
+				data.params.src = '';
+			}
+
+			if (typeItem.name === 'EmbeddedAudio') {
+				embed = new Node('embed', 1);
+				embed.shortEnded = true;
+				embed.attr({
+					id: node.attr('id'),
+					width: normalizeSize(node.attr('width')),
+					height: normalizeSize(node.attr('height')),
+					style : style,
+					type: node.attr('type')
+				});
+
+				for (name in data.params)
+					embed.attr(name, data.params[name]);
+
+				tinymce.each(rootAttributes, function(name) {
+					if (data[name] && name != 'type')
+						embed.attr(name, data[name]);
+				});
+
+				data.params.src = '';
+			}
+
+			// Do we have a params src then we can generate object
+			if (data.params.src) {
+				// Is flv movie add player for it
+				if (/\.flv$/i.test(data.params.src))
+					addPlayer(data.params.src, '');
+
+				if (args && args.force_absolute)
+					data.params.src = editor.documentBaseURI.toAbsolute(data.params.src);
+
+				// Create new object element
+				object = new Node('object', 1).attr({
+					id : node.attr('id'),
+					width: normalizeSize(node.attr('width')),
+					height: normalizeSize(node.attr('height')),
+					style : style
+				});
+
+				tinymce.each(rootAttributes, function(name) {
+					var value = data[name];
+
+					if (name == 'class' && value)
+						value = value.replace(/mceItem.+ ?/g, '');
+
+					if (value && name != 'type')
+						object.attr(name, value);
+				});
+
+				// Add params
+				for (name in data.params) {
+					param = new Node('param', 1);
+					param.shortEnded = true;
+					value = data.params[name];
+
+					// Windows media needs to use url instead of src for the media URL
+					if (name === 'src' && typeItem.name === 'WindowsMedia')
+						name = 'url';
+
+					param.attr({name: name, value: value});
+					object.append(param);
+				}
+
+				// Setup add type and classid if strict is disabled
+				if (this.editor.getParam('media_strict', true)) {
+					object.attr({
+						data: data.params.src,
+						type: typeItem.mimes[0]
+					});
+				} else {
+					object.attr({
+						classid: "clsid:" + typeItem.clsids[0],
+						codebase: typeItem.codebase
+					});
+
+					embed = new Node('embed', 1);
+					embed.shortEnded = true;
+					embed.attr({
+						id: node.attr('id'),
+						width: normalizeSize(node.attr('width')),
+						height: normalizeSize(node.attr('height')),
+						style : style,
+						type: typeItem.mimes[0]
+					});
+
+					for (name in data.params)
+						embed.attr(name, data.params[name]);
+
+					tinymce.each(rootAttributes, function(name) {
+						if (data[name] && name != 'type')
+							embed.attr(name, data[name]);
+					});
+
+					object.append(embed);
+				}
+
+				// Insert raw HTML
+				if (data.object_html) {
+					value = new Node('#text', 3);
+					value.raw = true;
+					value.value = data.object_html;
+					object.append(value);
+				}
+
+				// Append object to video element if it exists
+				if (video)
+					video.append(object);
+			}
+
+			if (video) {
+				// Insert raw HTML
+				if (data.video_html) {
+					value = new Node('#text', 3);
+					value.raw = true;
+					value.value = data.video_html;
+					video.append(value);
+				}
+			}
+
+			if (audio) {
+				// Insert raw HTML
+				if (data.video_html) {
+					value = new Node('#text', 3);
+					value.raw = true;
+					value.value = data.video_html;
+					audio.append(value);
+				}
+			}
+
+			var n = video || audio || object || embed;
+			if (n)
+				node.replace(n);
+			else
+				node.remove();
+		},
+
+		/**
+		 * Converts a tinymce.html.Node video/object/embed to an img element.
+		 *
+		 * The video/object/embed will be converted into an image placeholder with a JSON data attribute like this:
+		 * <img class="mceItemMedia mceItemFlash" width="100" height="100" data-mce-json="{..}" />
+		 *
+		 * The JSON structure will be like this:
+		 * {'params':{'flashvars':'something','quality':'high','src':'someurl'}, 'video':{'sources':[{src: 'someurl', type: 'video/mp4'}]}}
+		 */
+		objectToImg : function(node) {
+			var object, embed, video, iframe, img, name, id, width, height, style, i, html,
+				param, params, source, sources, data, type, lookup = this.lookup,
+				matches, attrs, urlConverter = this.editor.settings.url_converter,
+				urlConverterScope = this.editor.settings.url_converter_scope,
+				hspace, vspace, align, bgcolor;
+
+			function getInnerHTML(node) {
+				return new tinymce.html.Serializer({
+					inner: true,
+					validate: false
+				}).serialize(node);
+			};
+
+			function lookupAttribute(o, attr) {
+				return lookup[(o.attr(attr) || '').toLowerCase()];
+			}
+
+			function lookupExtension(src) {
+				var ext = src.replace(/^.*\.([^.]+)$/, '$1');
+				return lookup[ext.toLowerCase() || ''];
+			}
+
+			// If node isn't in document
+			if (!node.parent)
+				return;
+
+			// Handle media scripts
+			if (node.name === 'script') {
+				if (node.firstChild)
+					matches = scriptRegExp.exec(node.firstChild.value);
+
+				if (!matches)
+					return;
+
+				type = matches[1];
+				data = {video : {}, params : JSON.parse(matches[2])};
+				width = data.params.width;
+				height = data.params.height;
+			}
+
+			// Setup data objects
+			data = data || {
+				video : {},
+				params : {}
+			};
+
+			// Setup new image object
+			img = new Node('img', 1);
+			img.attr({
+				src : this.editor.theme.url + '/img/trans.gif'
+			});
+
+			// Video element
+			name = node.name;
+			if (name === 'video' || name == 'audio') {
+				video = node;
+				object = node.getAll('object')[0];
+				embed = node.getAll('embed')[0];
+				width = video.attr('width');
+				height = video.attr('height');
+				id = video.attr('id');
+				data.video = {attrs : {}, sources : []};
+
+				// Get all video attributes
+				attrs = data.video.attrs;
+				for (name in video.attributes.map)
+					attrs[name] = video.attributes.map[name];
+
+				source = node.attr('src');
+				if (source)
+					data.video.sources.push({src : urlConverter.call(urlConverterScope, source, 'src', node.name)});
+
+				// Get all sources
+				sources = video.getAll("source");
+				for (i = 0; i < sources.length; i++) {
+					source = sources[i].remove();
+
+					data.video.sources.push({
+						src: urlConverter.call(urlConverterScope, source.attr('src'), 'src', 'source'),
+						type: source.attr('type'),
+						media: source.attr('media')
+					});
+				}
+
+				// Convert the poster URL
+				if (attrs.poster)
+					attrs.poster = urlConverter.call(urlConverterScope, attrs.poster, 'poster', node.name);
+			}
+
+			// Object element
+			if (node.name === 'object') {
+				object = node;
+				embed = node.getAll('embed')[0];
+			}
+
+			// Embed element
+			if (node.name === 'embed')
+				embed = node;
+
+			// Iframe element
+			if (node.name === 'iframe') {
+				iframe = node;
+				type = 'Iframe';
+			}
+
+			if (object) {
+				// Get width/height
+				width = width || object.attr('width');
+				height = height || object.attr('height');
+				style = style || object.attr('style');
+				id = id || object.attr('id');
+				hspace = hspace || object.attr('hspace');
+				vspace = vspace || object.attr('vspace');
+				align = align || object.attr('align');
+				bgcolor = bgcolor || object.attr('bgcolor');
+				data.name = object.attr('name');
+
+				// Get all object params
+				params = object.getAll("param");
+				for (i = 0; i < params.length; i++) {
+					param = params[i];
+					name = param.remove().attr('name');
+
+					if (!excludedAttrs[name])
+						data.params[name] = param.attr('value');
+				}
+
+				data.params.src = data.params.src || object.attr('data');
+			}
+
+			if (embed) {
+				// Get width/height
+				width = width || embed.attr('width');
+				height = height || embed.attr('height');
+				style = style || embed.attr('style');
+				id = id || embed.attr('id');
+				hspace = hspace || embed.attr('hspace');
+				vspace = vspace || embed.attr('vspace');
+				align = align || embed.attr('align');
+				bgcolor = bgcolor || embed.attr('bgcolor');
+
+				// Get all embed attributes
+				for (name in embed.attributes.map) {
+					if (!excludedAttrs[name] && !data.params[name])
+						data.params[name] = embed.attributes.map[name];
+				}
+			}
+
+			if (iframe) {
+				// Get width/height
+				width = normalizeSize(iframe.attr('width'));
+				height = normalizeSize(iframe.attr('height'));
+				style = style || iframe.attr('style');
+				id = iframe.attr('id');
+				hspace = iframe.attr('hspace');
+				vspace = iframe.attr('vspace');
+				align = iframe.attr('align');
+				bgcolor = iframe.attr('bgcolor');
+
+				tinymce.each(rootAttributes, function(name) {
+					img.attr(name, iframe.attr(name));
+				});
+
+				// Get all iframe attributes
+				for (name in iframe.attributes.map) {
+					if (!excludedAttrs[name] && !data.params[name])
+						data.params[name] = iframe.attributes.map[name];
+				}
+			}
+
+			// Use src not movie
+			if (data.params.movie) {
+				data.params.src = data.params.src || data.params.movie;
+				delete data.params.movie;
+			}
+
+			// Convert the URL to relative/absolute depending on configuration
+			if (data.params.src)
+				data.params.src = urlConverter.call(urlConverterScope, data.params.src, 'src', 'object');
+
+			if (video) {
+				if (node.name === 'video')
+					type = lookup.video.name;
+				else if (node.name === 'audio')
+					type = lookup.audio.name;
+			}
+
+			if (object && !type)
+				type = (lookupAttribute(object, 'clsid') || lookupAttribute(object, 'classid') || lookupAttribute(object, 'type') || {}).name;
+
+			if (embed && !type)
+				type = (lookupAttribute(embed, 'type') || lookupExtension(data.params.src) || {}).name;
+
+			// for embedded audio we preserve the original specified type
+			if (embed && type == 'EmbeddedAudio') {
+				data.params.type = embed.attr('type');
+			}
+
+			// Replace the video/object/embed element with a placeholder image containing the data
+			node.replace(img);
+
+			// Remove embed
+			if (embed)
+				embed.remove();
+
+			// Serialize the inner HTML of the object element
+			if (object) {
+				html = getInnerHTML(object.remove());
+
+				if (html)
+					data.object_html = html;
+			}
+
+			// Serialize the inner HTML of the video element
+			if (video) {
+				html = getInnerHTML(video.remove());
+
+				if (html)
+					data.video_html = html;
+			}
+
+			data.hspace = hspace;
+			data.vspace = vspace;
+			data.align = align;
+			data.bgcolor = bgcolor;
+
+			// Set width/height of placeholder
+			img.attr({
+				id : id,
+				'class' : 'mceItemMedia mceItem' + (type || 'Flash'),
+				style : style,
+				width : width || (node.name == 'audio' ? "300" : "320"),
+				height : height || (node.name == 'audio' ? "32" : "240"),
+				hspace : hspace,
+				vspace : vspace,
+				align : align,
+				bgcolor : bgcolor,
+				"data-mce-json" : JSON.serialize(data, "'")
+			});
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('media', tinymce.plugins.MediaPlugin);
+})();
diff --git a/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/media/js/embed.js b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/media/js/embed.js
new file mode 100644
index 0000000..6fe25de
--- /dev/null
+++ b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/media/js/embed.js
@@ -0,0 +1,73 @@
+/**
+ * This script contains embed functions for common plugins. This scripts are complety free to use for any purpose.
+ */
+
+function writeFlash(p) {
+	writeEmbed(
+		'D27CDB6E-AE6D-11cf-96B8-444553540000',
+		'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0',
+		'application/x-shockwave-flash',
+		p
+	);
+}
+
+function writeShockWave(p) {
+	writeEmbed(
+	'166B1BCA-3F9C-11CF-8075-444553540000',
+	'http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0',
+	'application/x-director',
+		p
+	);
+}
+
+function writeQuickTime(p) {
+	writeEmbed(
+		'02BF25D5-8C17-4B23-BC80-D3488ABDDC6B',
+		'http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0',
+		'video/quicktime',
+		p
+	);
+}
+
+function writeRealMedia(p) {
+	writeEmbed(
+		'CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA',
+		'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0',
+		'audio/x-pn-realaudio-plugin',
+		p
+	);
+}
+
+function writeWindowsMedia(p) {
+	p.url = p.src;
+	writeEmbed(
+		'6BF52A52-394A-11D3-B153-00C04F79FAA6',
+		'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701',
+		'application/x-mplayer2',
+		p
+	);
+}
+
+function writeEmbed(cls, cb, mt, p) {
+	var h = '', n;
+
+	h += '<object classid="clsid:' + cls + '" codebase="' + cb + '"';
+	h += typeof(p.id) != "undefined" ? 'id="' + p.id + '"' : '';
+	h += typeof(p.name) != "undefined" ? 'name="' + p.name + '"' : '';
+	h += typeof(p.width) != "undefined" ? 'width="' + p.width + '"' : '';
+	h += typeof(p.height) != "undefined" ? 'height="' + p.height + '"' : '';
+	h += typeof(p.align) != "undefined" ? 'align="' + p.align + '"' : '';
+	h += '>';
+
+	for (n in p)
+		h += '<param name="' + n + '" value="' + p[n] + '">';
+
+	h += '<embed type="' + mt + '"';
+
+	for (n in p)
+		h += n + '="' + p[n] + '" ';
+
+	h += '></embed></object>';
+
+	document.write(h);
+}
diff --git a/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/media/js/media.js b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/media/js/media.js
new file mode 100644
index 0000000..b21abb5
--- /dev/null
+++ b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/media/js/media.js
@@ -0,0 +1,513 @@
+(function() {
+	var url;
+
+	if (url = tinyMCEPopup.getParam("media_external_list_url"))
+		document.write('<script language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');
+
+	function get(id) {
+		return document.getElementById(id);
+	}
+
+	function clone(obj) {
+		var i, len, copy, attr;
+
+		if (null == obj || "object" != typeof obj)
+			return obj;
+
+		// Handle Array
+		if ('length' in obj) {
+			copy = [];
+
+			for (i = 0, len = obj.length; i < len; ++i) {
+				copy[i] = clone(obj[i]);
+			}
+
+			return copy;
+		}
+
+		// Handle Object
+		copy = {};
+		for (attr in obj) {
+			if (obj.hasOwnProperty(attr))
+				copy[attr] = clone(obj[attr]);
+		}
+
+		return copy;
+	}
+
+	function getVal(id) {
+		var elm = get(id);
+
+		if (elm.nodeName == "SELECT")
+			return elm.options[elm.selectedIndex].value;
+
+		if (elm.type == "checkbox")
+			return elm.checked;
+
+		return elm.value;
+	}
+
+	function setVal(id, value, name) {
+		if (typeof(value) != 'undefined' && value != null) {
+			var elm = get(id);
+
+			if (elm.nodeName == "SELECT")
+				selectByValue(document.forms[0], id, value);
+			else if (elm.type == "checkbox") {
+				if (typeof(value) == 'string') {
+					value = value.toLowerCase();
+					value = (!name && value === 'true') || (name && value === name.toLowerCase());
+				}
+				elm.checked = !!value;
+			} else
+				elm.value = value;
+		}
+	}
+
+	window.Media = {
+		init : function() {
+			var html, editor, self = this;
+
+			self.editor = editor = tinyMCEPopup.editor;
+
+			// Setup file browsers and color pickers
+			get('filebrowsercontainer').innerHTML = getBrowserHTML('filebrowser','src','media','media');
+			get('qtsrcfilebrowsercontainer').innerHTML = getBrowserHTML('qtsrcfilebrowser','quicktime_qtsrc','media','media');
+			get('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor');
+			get('video_altsource1_filebrowser').innerHTML = getBrowserHTML('video_filebrowser_altsource1','video_altsource1','media','media');
+			get('video_altsource2_filebrowser').innerHTML = getBrowserHTML('video_filebrowser_altsource2','video_altsource2','media','media');
+			get('audio_altsource1_filebrowser').innerHTML = getBrowserHTML('audio_filebrowser_altsource1','audio_altsource1','media','media');
+			get('audio_altsource2_filebrowser').innerHTML = getBrowserHTML('audio_filebrowser_altsource2','audio_altsource2','media','media');
+			get('video_poster_filebrowser').innerHTML = getBrowserHTML('filebrowser_poster','video_poster','image','media');
+
+			html = self.getMediaListHTML('medialist', 'src', 'media', 'media');
+			if (html == "")
+				get("linklistrow").style.display = 'none';
+			else
+				get("linklistcontainer").innerHTML = html;
+
+			if (isVisible('filebrowser'))
+				get('src').style.width = '230px';
+
+			if (isVisible('video_filebrowser_altsource1'))
+				get('video_altsource1').style.width = '220px';
+
+			if (isVisible('video_filebrowser_altsource2'))
+				get('video_altsource2').style.width = '220px';
+
+			if (isVisible('audio_filebrowser_altsource1'))
+				get('audio_altsource1').style.width = '220px';
+
+			if (isVisible('audio_filebrowser_altsource2'))
+				get('audio_altsource2').style.width = '220px';
+
+			if (isVisible('filebrowser_poster'))
+				get('video_poster').style.width = '220px';
+
+			editor.dom.setOuterHTML(get('media_type'), self.getMediaTypeHTML(editor));
+
+			self.setDefaultDialogSettings(editor);
+			self.data = clone(tinyMCEPopup.getWindowArg('data'));
+			self.dataToForm();
+			self.preview();
+
+			updateColor('bgcolor_pick', 'bgcolor');
+		},
+
+		insert : function() {
+			var editor = tinyMCEPopup.editor;
+
+			this.formToData();
+			editor.execCommand('mceRepaint');
+			tinyMCEPopup.restoreSelection();
+			editor.selection.setNode(editor.plugins.media.dataToImg(this.data));
+			tinyMCEPopup.close();
+		},
+
+		preview : function() {
+			get('prev').innerHTML = this.editor.plugins.media.dataToHtml(this.data, true);
+		},
+
+		moveStates : function(to_form, field) {
+			var data = this.data, editor = this.editor,
+				mediaPlugin = editor.plugins.media, ext, src, typeInfo, defaultStates, src;
+
+			defaultStates = {
+				// QuickTime
+				quicktime_autoplay : true,
+				quicktime_controller : true,
+
+				// Flash
+				flash_play : true,
+				flash_loop : true,
+				flash_menu : true,
+
+				// WindowsMedia
+				windowsmedia_autostart : true,
+				windowsmedia_enablecontextmenu : true,
+				windowsmedia_invokeurls : true,
+
+				// RealMedia
+				realmedia_autogotourl : true,
+				realmedia_imagestatus : true
+			};
+
+			function parseQueryParams(str) {
+				var out = {};
+
+				if (str) {
+					tinymce.each(str.split('&'), function(item) {
+						var parts = item.split('=');
+
+						out[unescape(parts[0])] = unescape(parts[1]);
+					});
+				}
+
+				return out;
+			};
+
+			function setOptions(type, names) {
+				var i, name, formItemName, value, list;
+
+				if (type == data.type || type == 'global') {
+					names = tinymce.explode(names);
+					for (i = 0; i < names.length; i++) {
+						name = names[i];
+						formItemName = type == 'global' ? name : type + '_' + name;
+
+						if (type == 'global')
+						list = data;
+					else if (type == 'video' || type == 'audio') {
+							list = data.video.attrs;
+
+							if (!list && !to_form)
+							data.video.attrs = list = {};
+						} else
+						list = data.params;
+
+						if (list) {
+							if (to_form) {
+								setVal(formItemName, list[name], type == 'video' || type == 'audio' ? name : '');
+							} else {
+								delete list[name];
+
+								value = getVal(formItemName);
+								if ((type == 'video' || type == 'audio') && value === true)
+									value = name;
+
+								if (defaultStates[formItemName]) {
+									if (value !== defaultStates[formItemName]) {
+										value = "" + value;
+										list[name] = value;
+									}
+								} else if (value) {
+									value = "" + value;
+									list[name] = value;
+								}
+							}
+						}
+					}
+				}
+			}
+
+			if (!to_form) {
+				data.type = get('media_type').options[get('media_type').selectedIndex].value;
+				data.width = getVal('width');
+				data.height = getVal('height');
+
+				// Switch type based on extension
+				src = getVal('src');
+				if (field == 'src') {
+					ext = src.replace(/^.*\.([^.]+)$/, '$1');
+					if (typeInfo = mediaPlugin.getType(ext))
+						data.type = typeInfo.name.toLowerCase();
+
+					setVal('media_type', data.type);
+				}
+
+				if (data.type == "video" || data.type == "audio") {
+					if (!data.video.sources)
+						data.video.sources = [];
+
+					data.video.sources[0] = {src: getVal('src')};
+				}
+			}
+
+			// Hide all fieldsets and show the one active
+			get('video_options').style.display = 'none';
+			get('audio_options').style.display = 'none';
+			get('flash_options').style.display = 'none';
+			get('quicktime_options').style.display = 'none';
+			get('shockwave_options').style.display = 'none';
+			get('windowsmedia_options').style.display = 'none';
+			get('realmedia_options').style.display = 'none';
+			get('embeddedaudio_options').style.display = 'none';
+
+			if (get(data.type + '_options'))
+				get(data.type + '_options').style.display = 'block';
+
+			setVal('media_type', data.type);
+
+			setOptions('flash', 'play,loop,menu,swliveconnect,quality,scale,salign,wmode,base,flashvars');
+			setOptions('quicktime', 'loop,autoplay,cache,controller,correction,enablejavascript,kioskmode,autohref,playeveryframe,targetcache,scale,starttime,endtime,target,qtsrcchokespeed,volume,qtsrc');
+			setOptions('shockwave', 'sound,progress,autostart,swliveconnect,swvolume,swstretchstyle,swstretchhalign,swstretchvalign');
+			setOptions('windowsmedia', 'autostart,enabled,enablecontextmenu,fullscreen,invokeurls,mute,stretchtofit,windowlessvideo,balance,baseurl,captioningid,currentmarker,currentposition,defaultframe,playcount,rate,uimode,volume');
+			setOptions('realmedia', 'autostart,loop,autogotourl,center,imagestatus,maintainaspect,nojava,prefetch,shuffle,console,controls,numloop,scriptcallbacks');
+			setOptions('video', 'poster,autoplay,loop,muted,preload,controls');
+			setOptions('audio', 'autoplay,loop,preload,controls');
+			setOptions('embeddedaudio', 'autoplay,loop,controls');
+			setOptions('global', 'id,name,vspace,hspace,bgcolor,align,width,height');
+
+			if (to_form) {
+				if (data.type == 'video') {
+					if (data.video.sources[0])
+						setVal('src', data.video.sources[0].src);
+
+					src = data.video.sources[1];
+					if (src)
+						setVal('video_altsource1', src.src);
+
+					src = data.video.sources[2];
+					if (src)
+						setVal('video_altsource2', src.src);
+                } else if (data.type == 'audio') {
+                    if (data.video.sources[0])
+                        setVal('src', data.video.sources[0].src);
+                    
+                    src = data.video.sources[1];
+                    if (src)
+                        setVal('audio_altsource1', src.src);
+                    
+                    src = data.video.sources[2];
+                    if (src)
+                        setVal('audio_altsource2', src.src);
+				} else {
+					// Check flash vars
+					if (data.type == 'flash') {
+						tinymce.each(editor.getParam('flash_video_player_flashvars', {url : '$url', poster : '$poster'}), function(value, name) {
+							if (value == '$url')
+								data.params.src = parseQueryParams(data.params.flashvars)[name] || data.params.src || '';
+						});
+					}
+
+					setVal('src', data.params.src);
+				}
+			} else {
+				src = getVal("src");
+
+				// YouTube Embed
+				if (src.match(/youtube\.com\/embed\/\w+/)) {
+					data.width = 425;
+					data.height = 350;
+					data.params.frameborder = '0';
+					data.type = 'iframe';
+					setVal('src', src);
+					setVal('media_type', data.type);
+				} else {
+					// YouTube *NEW*
+					if (src.match(/youtu\.be\/[a-z1-9.-_]+/)) {
+						data.width = 425;
+						data.height = 350;
+						data.params.frameborder = '0';
+						data.type = 'iframe';
+						src = 'http://www.youtube.com/embed/' + src.match(/youtu.be\/([a-z1-9.-_]+)/)[1];
+						setVal('src', src);
+						setVal('media_type', data.type);
+					}
+
+					// YouTube
+					if (src.match(/youtube\.com(.+)v=([^&]+)/)) {
+						data.width = 425;
+						data.height = 350;
+						data.params.frameborder = '0';
+						data.type = 'iframe';
+						src = 'http://www.youtube.com/embed/' + src.match(/v=([^&]+)/)[1];
+						setVal('src', src);
+						setVal('media_type', data.type);
+					}
+				}
+
+				// Google video
+				if (src.match(/video\.google\.com(.+)docid=([^&]+)/)) {
+					data.width = 425;
+					data.height = 326;
+					data.type = 'flash';
+					src = 'http://video.google.com/googleplayer.swf?docId=' + src.match(/docid=([^&]+)/)[1] + '&hl=en';
+					setVal('src', src);
+					setVal('media_type', data.type);
+				}
+				
+				// Vimeo
+				if (src.match(/vimeo\.com\/([0-9]+)/)) {
+					data.width = 425;
+					data.height = 350;
+					data.params.frameborder = '0';
+					data.type = 'iframe';
+					src = 'http://player.vimeo.com/video/' + src.match(/vimeo.com\/([0-9]+)/)[1];
+					setVal('src', src);
+					setVal('media_type', data.type);
+				}
+            
+				// stream.cz
+				if (src.match(/stream\.cz\/((?!object).)*\/([0-9]+)/)) {
+					data.width = 425;
+					data.height = 350;
+					data.params.frameborder = '0';
+					data.type = 'iframe';
+					src = 'http://www.stream.cz/object/' + src.match(/stream.cz\/[^/]+\/([0-9]+)/)[1];
+					setVal('src', src);
+					setVal('media_type', data.type);
+				}
+				
+				// Google maps
+				if (src.match(/maps\.google\.([a-z]{2,3})\/maps\/(.+)msid=(.+)/)) {
+					data.width = 425;
+					data.height = 350;
+					data.params.frameborder = '0';
+					data.type = 'iframe';
+					src = 'http://maps.google.com/maps/ms?msid=' + src.match(/msid=(.+)/)[1] + "&output=embed";
+					setVal('src', src);
+					setVal('media_type', data.type);
+				}
+
+				if (data.type == 'video') {
+					if (!data.video.sources)
+						data.video.sources = [];
+
+					data.video.sources[0] = {src : src};
+
+					src = getVal("video_altsource1");
+					if (src)
+						data.video.sources[1] = {src : src};
+
+					src = getVal("video_altsource2");
+					if (src)
+						data.video.sources[2] = {src : src};
+                } else if (data.type == 'audio') {
+                    if (!data.video.sources)
+                        data.video.sources = [];
+                    
+                    data.video.sources[0] = {src : src};
+                    
+                    src = getVal("audio_altsource1");
+                    if (src)
+                        data.video.sources[1] = {src : src};
+                    
+                    src = getVal("audio_altsource2");
+                    if (src)
+                        data.video.sources[2] = {src : src};
+				} else
+					data.params.src = src;
+
+				// Set default size
+                setVal('width', data.width || (data.type == 'audio' ? 300 : 320));
+                setVal('height', data.height || (data.type == 'audio' ? 32 : 240));
+			}
+		},
+
+		dataToForm : function() {
+			this.moveStates(true);
+		},
+
+		formToData : function(field) {
+			if (field == "width" || field == "height")
+				this.changeSize(field);
+
+			if (field == 'source') {
+				this.moveStates(false, field);
+				setVal('source', this.editor.plugins.media.dataToHtml(this.data));
+				this.panel = 'source';
+			} else {
+				if (this.panel == 'source') {
+					this.data = clone(this.editor.plugins.media.htmlToData(getVal('source')));
+					this.dataToForm();
+					this.panel = '';
+				}
+
+				this.moveStates(false, field);
+				this.preview();
+			}
+		},
+
+		beforeResize : function() {
+            this.width = parseInt(getVal('width') || (this.data.type == 'audio' ? "300" : "320"), 10);
+            this.height = parseInt(getVal('height') || (this.data.type == 'audio' ? "32" : "240"), 10);
+		},
+
+		changeSize : function(type) {
+			var width, height, scale, size;
+
+			if (get('constrain').checked) {
+                width = parseInt(getVal('width') || (this.data.type == 'audio' ? "300" : "320"), 10);
+                height = parseInt(getVal('height') || (this.data.type == 'audio' ? "32" : "240"), 10);
+
+				if (type == 'width') {
+					this.height = Math.round((width / this.width) * height);
+					setVal('height', this.height);
+				} else {
+					this.width = Math.round((height / this.height) * width);
+					setVal('width', this.width);
+				}
+			}
+		},
+
+		getMediaListHTML : function() {
+			if (typeof(tinyMCEMediaList) != "undefined" && tinyMCEMediaList.length > 0) {
+				var html = "";
+
+				html += '<select id="linklist" name="linklist" style="width: 250px" onchange="this.form.src.value=this.options[this.selectedIndex].value;Media.formToData(\'src\');">';
+				html += '<option value="">---</option>';
+
+				for (var i=0; i<tinyMCEMediaList.length; i++)
+					html += '<option value="' + tinyMCEMediaList[i][1] + '">' + tinyMCEMediaList[i][0] + '</option>';
+
+				html += '</select>';
+
+				return html;
+			}
+
+			return "";
+		},
+
+		getMediaTypeHTML : function(editor) {
+			function option(media_type, element) {
+				if (!editor.schema.getElementRule(element || media_type)) {
+					return '';
+				}
+
+				return '<option value="'+media_type+'">'+tinyMCEPopup.editor.translate("media_dlg."+media_type)+'</option>'
+			}
+
+			var html = "";
+
+			html += '<select id="media_type" name="media_type" onchange="Media.formToData(\'type\');">';
+			html += option("video");
+			html += option("audio");
+			html += option("flash", "object");
+			html += option("quicktime", "object");
+			html += option("shockwave", "object");
+			html += option("windowsmedia", "object");
+			html += option("realmedia", "object");
+			html += option("iframe");
+
+			if (editor.getParam('media_embedded_audio', false)) {
+				html += option('embeddedaudio', "object");
+			}
+
+			html += '</select>';
+			return html;
+		},
+
+		setDefaultDialogSettings : function(editor) {
+			var defaultDialogSettings = editor.getParam("media_dialog_defaults", {});
+			tinymce.each(defaultDialogSettings, function(v, k) {
+				setVal(k, v);
+			});
+		}
+	};
+
+	tinyMCEPopup.requireLangPack();
+	tinyMCEPopup.onInit.add(function() {
+		Media.init();
+	});
+})();
diff --git a/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin_src.js b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin_src.js
new file mode 100644
index 0000000..35c0cea
--- /dev/null
+++ b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin_src.js
@@ -0,0 +1,537 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	var TreeWalker = tinymce.dom.TreeWalker;
+	var externalName = 'contenteditable', internalName = 'data-mce-' + externalName;
+	var VK = tinymce.VK;
+
+	function handleContentEditableSelection(ed) {
+		var dom = ed.dom, selection = ed.selection, invisibleChar, caretContainerId = 'mce_noneditablecaret', invisibleChar = '\uFEFF';
+
+		// Returns the content editable state of a node "true/false" or null
+		function getContentEditable(node) {
+			var contentEditable;
+
+			// Ignore non elements
+			if (node.nodeType === 1) {
+				// Check for fake content editable
+				contentEditable = node.getAttribute(internalName);
+				if (contentEditable && contentEditable !== "inherit") {
+					return contentEditable;
+				}
+
+				// Check for real content editable
+				contentEditable = node.contentEditable;
+				if (contentEditable !== "inherit") {
+					return contentEditable;
+				}
+			}
+
+			return null;
+		};
+
+		// Returns the noneditable parent or null if there is a editable before it or if it wasn't found
+		function getNonEditableParent(node) {
+			var state;
+
+			while (node) {
+				state = getContentEditable(node);
+				if (state) {
+					return state  === "false" ? node : null;
+				}
+
+				node = node.parentNode;
+			}
+		};
+
+		// Get caret container parent for the specified node
+		function getParentCaretContainer(node) {
+			while (node) {
+				if (node.id === caretContainerId) {
+					return node;
+				}
+
+				node = node.parentNode;
+			}
+		};
+
+		// Finds the first text node in the specified node
+		function findFirstTextNode(node) {
+			var walker;
+
+			if (node) {
+				walker = new TreeWalker(node, node);
+
+				for (node = walker.current(); node; node = walker.next()) {
+					if (node.nodeType === 3) {
+						return node;
+					}
+				}
+			}
+		};
+
+		// Insert caret container before/after target or expand selection to include block
+		function insertCaretContainerOrExpandToBlock(target, before) {
+			var caretContainer, rng;
+
+			// Select block
+			if (getContentEditable(target) === "false") {
+				if (dom.isBlock(target)) {
+					selection.select(target);
+					return;
+				}
+			}
+
+			rng = dom.createRng();
+
+			if (getContentEditable(target) === "true") {
+				if (!target.firstChild) {
+					target.appendChild(ed.getDoc().createTextNode('\u00a0'));
+				}
+
+				target = target.firstChild;
+				before = true;
+			}
+
+			//caretContainer = dom.create('span', {id: caretContainerId, 'data-mce-bogus': true, style:'border: 1px solid red'}, invisibleChar);
+			caretContainer = dom.create('span', {id: caretContainerId, 'data-mce-bogus': true}, invisibleChar);
+
+			if (before) {
+				target.parentNode.insertBefore(caretContainer, target);
+			} else {
+				dom.insertAfter(caretContainer, target);
+			}
+
+			rng.setStart(caretContainer.firstChild, 1);
+			rng.collapse(true);
+			selection.setRng(rng);
+
+			return caretContainer;
+		};
+
+		// Removes any caret container except the one we might be in
+		function removeCaretContainer(caretContainer) {
+			var child, currentCaretContainer, lastContainer;
+
+			if (caretContainer) {
+					rng = selection.getRng(true);
+					rng.setStartBefore(caretContainer);
+					rng.setEndBefore(caretContainer);
+
+					child = findFirstTextNode(caretContainer);
+					if (child && child.nodeValue.charAt(0) == invisibleChar) {
+						child = child.deleteData(0, 1);
+					}
+
+					dom.remove(caretContainer, true);
+
+					selection.setRng(rng);
+			} else {
+				currentCaretContainer = getParentCaretContainer(selection.getStart());
+				while ((caretContainer = dom.get(caretContainerId)) && caretContainer !== lastContainer) {
+					if (currentCaretContainer !== caretContainer) {
+						child = findFirstTextNode(caretContainer);
+						if (child && child.nodeValue.charAt(0) == invisibleChar) {
+							child = child.deleteData(0, 1);
+						}
+
+						dom.remove(caretContainer, true);
+					}
+
+					lastContainer = caretContainer;
+				}
+			}
+		};
+
+		// Modifies the selection to include contentEditable false elements or insert caret containers
+		function moveSelection() {
+			var nonEditableStart, nonEditableEnd, isCollapsed, rng, element;
+
+			// Checks if there is any contents to the left/right side of caret returns the noneditable element or any editable element if it finds one inside
+			function hasSideContent(element, left) {
+				var container, offset, walker, node, len;
+
+				container = rng.startContainer;
+				offset = rng.startOffset;
+
+				// If endpoint is in middle of text node then expand to beginning/end of element
+				if (container.nodeType == 3) {
+					len = container.nodeValue.length;
+					if ((offset > 0 && offset < len) || (left ? offset == len : offset == 0)) {
+						return;
+					}
+				} else {
+					// Can we resolve the node by index
+					if (offset < container.childNodes.length) {
+						// Browser represents caret position as the offset at the start of an element. When moving right
+						// this is the element we are moving into so we consider our container to be child node at offset-1
+						var pos = !left && offset > 0 ? offset-1 : offset;
+						container = container.childNodes[pos];
+						if (container.hasChildNodes()) {
+							container = container.firstChild;
+						}
+					} else {
+						// If not then the caret is at the last position in it's container and the caret container should be inserted after the noneditable element
+						return !left ? element : null;
+					}
+				}
+
+				// Walk left/right to look for contents
+				walker = new TreeWalker(container, element);
+				while (node = walker[left ? 'prev' : 'next']()) {
+					if (node.nodeType === 3 && node.nodeValue.length > 0) {
+						return;
+					} else if (getContentEditable(node) === "true") {
+						// Found contentEditable=true element return this one to we can move the caret inside it
+						return node;
+					}
+				}
+
+				return element;
+			};
+
+			// Remove any existing caret containers
+			removeCaretContainer();
+
+			// Get noneditable start/end elements
+			isCollapsed = selection.isCollapsed();
+			nonEditableStart = getNonEditableParent(selection.getStart());
+			nonEditableEnd = getNonEditableParent(selection.getEnd());
+
+			// Is any fo the range endpoints noneditable
+			if (nonEditableStart || nonEditableEnd) {
+				rng = selection.getRng(true);
+
+				// If it's a caret selection then look left/right to see if we need to move the caret out side or expand
+				if (isCollapsed) {
+					nonEditableStart = nonEditableStart || nonEditableEnd;
+					var start = selection.getStart();
+					if (element = hasSideContent(nonEditableStart, true)) {
+						// We have no contents to the left of the caret then insert a caret container before the noneditable element
+						insertCaretContainerOrExpandToBlock(element, true);
+					} else if (element = hasSideContent(nonEditableStart, false)) {
+						// We have no contents to the right of the caret then insert a caret container after the noneditable element
+						insertCaretContainerOrExpandToBlock(element, false);
+					} else {
+						// We are in the middle of a noneditable so expand to select it
+						selection.select(nonEditableStart);
+					}
+				} else {
+					rng = selection.getRng(true);
+
+					// Expand selection to include start non editable element
+					if (nonEditableStart) {
+						rng.setStartBefore(nonEditableStart);
+					}
+
+					// Expand selection to include end non editable element
+					if (nonEditableEnd) {
+						rng.setEndAfter(nonEditableEnd);
+					}
+
+					selection.setRng(rng);
+				}
+			}
+		};
+
+		function handleKey(ed, e) {
+			var keyCode = e.keyCode, nonEditableParent, caretContainer, startElement, endElement;
+
+			function getNonEmptyTextNodeSibling(node, prev) {
+				while (node = node[prev ? 'previousSibling' : 'nextSibling']) {
+					if (node.nodeType !== 3 || node.nodeValue.length > 0) {
+						return node;
+					}
+				}
+			};
+
+			function positionCaretOnElement(element, start) {
+				selection.select(element);
+				selection.collapse(start);
+			}
+
+			function canDelete(backspace) {
+				var rng, container, offset, nonEditableParent;
+
+				function removeNodeIfNotParent(node) {
+					var parent = container;
+
+					while (parent) {
+						if (parent === node) {
+							return;
+						}
+
+						parent = parent.parentNode;
+					}
+
+					dom.remove(node);
+					moveSelection();
+				}
+
+				function isNextPrevTreeNodeNonEditable() {
+					var node, walker, nonEmptyElements = ed.schema.getNonEmptyElements();
+
+					walker = new tinymce.dom.TreeWalker(container, ed.getBody());
+					while (node = (backspace ? walker.prev() : walker.next())) {
+						// Found IMG/INPUT etc
+						if (nonEmptyElements[node.nodeName.toLowerCase()]) {
+							break;
+						}
+
+						// Found text node with contents
+						if (node.nodeType === 3 && tinymce.trim(node.nodeValue).length > 0) {
+							break;
+						}
+
+						// Found non editable node
+						if (getContentEditable(node) === "false") {
+							removeNodeIfNotParent(node);
+							return true;
+						}
+					}
+
+					// Check if the content node is within a non editable parent
+					if (getNonEditableParent(node)) {
+						return true;
+					}
+
+					return false;
+				}
+
+				if (selection.isCollapsed()) {
+					rng = selection.getRng(true);
+					container = rng.startContainer;
+					offset = rng.startOffset;
+					container = getParentCaretContainer(container) || container;
+
+					// Is in noneditable parent
+					if (nonEditableParent = getNonEditableParent(container)) {
+						removeNodeIfNotParent(nonEditableParent);
+						return false;
+					}
+
+					// Check if the caret is in the middle of a text node
+					if (container.nodeType == 3 && (backspace ? offset > 0 : offset < container.nodeValue.length)) {
+						return true;
+					}
+
+					// Resolve container index
+					if (container.nodeType == 1) {
+						container = container.childNodes[offset] || container;
+					}
+
+					// Check if previous or next tree node is non editable then block the event
+					if (isNextPrevTreeNodeNonEditable()) {
+						return false;
+					}
+				}
+
+				return true;
+			}
+
+			startElement = selection.getStart()
+			endElement = selection.getEnd();
+
+			// Disable all key presses in contentEditable=false except delete or backspace
+			nonEditableParent = getNonEditableParent(startElement) || getNonEditableParent(endElement);
+			if (nonEditableParent && (keyCode < 112 || keyCode > 124) && keyCode != VK.DELETE && keyCode != VK.BACKSPACE) {
+				// Is Ctrl+c, Ctrl+v or Ctrl+x then use default browser behavior
+				if ((tinymce.isMac ? e.metaKey : e.ctrlKey) && (keyCode == 67 || keyCode == 88 || keyCode == 86)) {
+					return;
+				}
+
+				e.preventDefault();
+
+				// Arrow left/right select the element and collapse left/right
+				if (keyCode == VK.LEFT || keyCode == VK.RIGHT) {
+					var left = keyCode == VK.LEFT;
+					// If a block element find previous or next element to position the caret
+					if (ed.dom.isBlock(nonEditableParent)) {
+						var targetElement = left ? nonEditableParent.previousSibling : nonEditableParent.nextSibling;
+						var walker = new TreeWalker(targetElement, targetElement);
+						var caretElement = left ? walker.prev() : walker.next();
+						positionCaretOnElement(caretElement, !left);
+					} else {
+						positionCaretOnElement(nonEditableParent, left);
+					}
+				}
+			} else {
+				// Is arrow left/right, backspace or delete
+				if (keyCode == VK.LEFT || keyCode == VK.RIGHT || keyCode == VK.BACKSPACE || keyCode == VK.DELETE) {
+					caretContainer = getParentCaretContainer(startElement);
+					if (caretContainer) {
+						// Arrow left or backspace
+						if (keyCode == VK.LEFT || keyCode == VK.BACKSPACE) {
+							nonEditableParent = getNonEmptyTextNodeSibling(caretContainer, true);
+
+							if (nonEditableParent && getContentEditable(nonEditableParent) === "false") {
+								e.preventDefault();
+
+								if (keyCode == VK.LEFT) {
+									positionCaretOnElement(nonEditableParent, true);
+								} else {
+									dom.remove(nonEditableParent);
+									return;
+								}
+							} else {
+								removeCaretContainer(caretContainer);
+							}
+						}
+
+						// Arrow right or delete
+						if (keyCode == VK.RIGHT || keyCode == VK.DELETE) {
+							nonEditableParent = getNonEmptyTextNodeSibling(caretContainer);
+
+							if (nonEditableParent && getContentEditable(nonEditableParent) === "false") {
+								e.preventDefault();
+
+								if (keyCode == VK.RIGHT) {
+									positionCaretOnElement(nonEditableParent, false);
+								} else {
+									dom.remove(nonEditableParent);
+									return;
+								}
+							} else {
+								removeCaretContainer(caretContainer);
+							}
+						}
+					}
+
+					if ((keyCode == VK.BACKSPACE || keyCode == VK.DELETE) && !canDelete(keyCode == VK.BACKSPACE)) {
+						e.preventDefault();
+						return false;
+					}
+				}
+			}
+		};
+
+		ed.onMouseDown.addToTop(function(ed, e) {
+			var node = ed.selection.getNode();
+
+			if (getContentEditable(node) === "false" && node == e.target) {
+				// Expand selection on mouse down we can't block the default event since it's used for drag/drop
+				moveSelection();
+			}
+		});
+
+		ed.onMouseUp.addToTop(moveSelection);
+		ed.onKeyDown.addToTop(handleKey);
+		ed.onKeyUp.addToTop(moveSelection);
+	};
+
+	tinymce.create('tinymce.plugins.NonEditablePlugin', {
+		init : function(ed, url) {
+			var editClass, nonEditClass, nonEditableRegExps;
+
+			// Converts configured regexps to noneditable span items
+			function convertRegExpsToNonEditable(ed, args) {
+				var i = nonEditableRegExps.length, content = args.content, cls = tinymce.trim(nonEditClass);
+
+				// Don't replace the variables when raw is used for example on undo/redo
+				if (args.format == "raw") {
+					return;
+				}
+
+				while (i--) {
+					content = content.replace(nonEditableRegExps[i], function(match) {
+						var args = arguments, index = args[args.length - 2];
+
+						// Is value inside an attribute then don't replace
+						if (index > 0 && content.charAt(index - 1) == '"') {
+							return match;
+						}
+
+						return '<span class="' + cls + '" data-mce-content="' + ed.dom.encode(args[0]) + '">' + ed.dom.encode(typeof(args[1]) === "string" ? args[1] : args[0]) + '</span>';
+					});
+				}
+
+				args.content = content;
+			};
+			
+			editClass = " " + tinymce.trim(ed.getParam("noneditable_editable_class", "mceEditable")) + " ";
+			nonEditClass = " " + tinymce.trim(ed.getParam("noneditable_noneditable_class", "mceNonEditable")) + " ";
+
+			// Setup noneditable regexps array
+			nonEditableRegExps = ed.getParam("noneditable_regexp");
+			if (nonEditableRegExps && !nonEditableRegExps.length) {
+				nonEditableRegExps = [nonEditableRegExps];
+			}
+
+			ed.onPreInit.add(function() {
+				handleContentEditableSelection(ed);
+
+				if (nonEditableRegExps) {
+					ed.selection.onBeforeSetContent.add(convertRegExpsToNonEditable);
+					ed.onBeforeSetContent.add(convertRegExpsToNonEditable);
+				}
+
+				// Apply contentEditable true/false on elements with the noneditable/editable classes
+				ed.parser.addAttributeFilter('class', function(nodes) {
+					var i = nodes.length, className, node;
+
+					while (i--) {
+						node = nodes[i];
+						className = " " + node.attr("class") + " ";
+
+						if (className.indexOf(editClass) !== -1) {
+							node.attr(internalName, "true");
+						} else if (className.indexOf(nonEditClass) !== -1) {
+							node.attr(internalName, "false");
+						}
+					}
+				});
+
+				// Remove internal name
+				ed.serializer.addAttributeFilter(internalName, function(nodes, name) {
+					var i = nodes.length, node;
+
+					while (i--) {
+						node = nodes[i];
+
+						if (nonEditableRegExps && node.attr('data-mce-content')) {
+							node.name = "#text";
+							node.type = 3;
+							node.raw = true;
+							node.value = node.attr('data-mce-content');
+						} else {
+							node.attr(externalName, null);
+							node.attr(internalName, null);
+						}
+					}
+				});
+
+				// Convert external name into internal name
+				ed.parser.addAttributeFilter(externalName, function(nodes, name) {
+					var i = nodes.length, node;
+
+					while (i--) {
+						node = nodes[i];
+						node.attr(internalName, node.attr(externalName));
+						node.attr(externalName, null);
+					}
+				});
+			});
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Non editable elements',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/noneditable',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('noneditable', tinymce.plugins.NonEditablePlugin);
+})();
\ No newline at end of file
diff --git a/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js
new file mode 100644
index 0000000..23ac039
--- /dev/null
+++ b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js
@@ -0,0 +1,887 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	var each = tinymce.each,
+		defs = {
+			paste_auto_cleanup_on_paste : true,
+			paste_enable_default_filters : true,
+			paste_block_drop : false,
+			paste_retain_style_properties : "none",
+			paste_strip_class_attributes : "mso",
+			paste_remove_spans : false,
+			paste_remove_styles : false,
+			paste_remove_styles_if_webkit : true,
+			paste_convert_middot_lists : true,
+			paste_convert_headers_to_strong : false,
+			paste_dialog_width : "450",
+			paste_dialog_height : "400",
+			paste_max_consecutive_linebreaks: 2,
+			paste_text_use_dialog : false,
+			paste_text_sticky : false,
+			paste_text_sticky_default : false,
+			paste_text_notifyalways : false,
+			paste_text_linebreaktype : "combined",
+			paste_text_replacements : [
+				[/\u2026/g, "..."],
+				[/[\x93\x94\u201c\u201d]/g, '"'],
+				[/[\x60\x91\x92\u2018\u2019]/g, "'"]
+			]
+		};
+
+	function getParam(ed, name) {
+		return ed.getParam(name, defs[name]);
+	}
+
+	tinymce.create('tinymce.plugins.PastePlugin', {
+		init : function(ed, url) {
+			var t = this;
+
+			t.editor = ed;
+			t.url = url;
+
+			// Setup plugin events
+			t.onPreProcess = new tinymce.util.Dispatcher(t);
+			t.onPostProcess = new tinymce.util.Dispatcher(t);
+
+			// Register default handlers
+			t.onPreProcess.add(t._preProcess);
+			t.onPostProcess.add(t._postProcess);
+
+			// Register optional preprocess handler
+			t.onPreProcess.add(function(pl, o) {
+				ed.execCallback('paste_preprocess', pl, o);
+			});
+
+			// Register optional postprocess
+			t.onPostProcess.add(function(pl, o) {
+				ed.execCallback('paste_postprocess', pl, o);
+			});
+
+			ed.onKeyDown.addToTop(function(ed, e) {
+				// Block ctrl+v from adding an undo level since the default logic in tinymce.Editor will add that
+				if (((tinymce.isMac ? e.metaKey : e.ctrlKey) && e.keyCode == 86) || (e.shiftKey && e.keyCode == 45))
+					return false; // Stop other listeners
+			});
+
+			// Initialize plain text flag
+			ed.pasteAsPlainText = getParam(ed, 'paste_text_sticky_default');
+
+			// This function executes the process handlers and inserts the contents
+			// force_rich overrides plain text mode set by user, important for pasting with execCommand
+			function process(o, force_rich) {
+				var dom = ed.dom, rng;
+
+				// Execute pre process handlers
+				t.onPreProcess.dispatch(t, o);
+
+				// Create DOM structure
+				o.node = dom.create('div', 0, o.content);
+
+				// If pasting inside the same element and the contents is only one block
+				// remove the block and keep the text since Firefox will copy parts of pre and h1-h6 as a pre element
+				if (tinymce.isGecko) {
+					rng = ed.selection.getRng(true);
+					if (rng.startContainer == rng.endContainer && rng.startContainer.nodeType == 3) {
+						// Is only one block node and it doesn't contain word stuff
+						if (o.node.childNodes.length === 1 && /^(p|h[1-6]|pre)$/i.test(o.node.firstChild.nodeName) && o.content.indexOf('__MCE_ITEM__') === -1)
+							dom.remove(o.node.firstChild, true);
+					}
+				}
+
+				// Execute post process handlers
+				t.onPostProcess.dispatch(t, o);
+
+				// Serialize content
+				o.content = ed.serializer.serialize(o.node, {getInner : 1, forced_root_block : ''});
+
+				// Plain text option active?
+				if ((!force_rich) && (ed.pasteAsPlainText)) {
+					t._insertPlainText(o.content);
+
+					if (!getParam(ed, "paste_text_sticky")) {
+						ed.pasteAsPlainText = false;
+						ed.controlManager.setActive("pastetext", false);
+					}
+				} else {
+					t._insert(o.content);
+				}
+			}
+
+			// Add command for external usage
+			ed.addCommand('mceInsertClipboardContent', function(u, o) {
+				process(o, true);
+			});
+
+			if (!getParam(ed, "paste_text_use_dialog")) {
+				ed.addCommand('mcePasteText', function(u, v) {
+					var cookie = tinymce.util.Cookie;
+
+					ed.pasteAsPlainText = !ed.pasteAsPlainText;
+					ed.controlManager.setActive('pastetext', ed.pasteAsPlainText);
+
+					if ((ed.pasteAsPlainText) && (!cookie.get("tinymcePasteText"))) {
+						if (getParam(ed, "paste_text_sticky")) {
+							ed.windowManager.alert(ed.translate('paste.plaintext_mode_sticky'));
+						} else {
+							ed.windowManager.alert(ed.translate('paste.plaintext_mode'));
+						}
+
+						if (!getParam(ed, "paste_text_notifyalways")) {
+							cookie.set("tinymcePasteText", "1", new Date(new Date().getFullYear() + 1, 12, 31))
+						}
+					}
+				});
+			}
+
+			ed.addButton('pastetext', {title: 'paste.paste_text_desc', cmd: 'mcePasteText'});
+			ed.addButton('selectall', {title: 'paste.selectall_desc', cmd: 'selectall'});
+
+			// This function grabs the contents from the clipboard by adding a
+			// hidden div and placing the caret inside it and after the browser paste
+			// is done it grabs that contents and processes that
+			function grabContent(e) {
+				var n, or, rng, oldRng, sel = ed.selection, dom = ed.dom, body = ed.getBody(), posY, textContent;
+
+				// Check if browser supports direct plaintext access
+				if (e.clipboardData || dom.doc.dataTransfer) {
+					textContent = (e.clipboardData || dom.doc.dataTransfer).getData('Text');
+
+					if (ed.pasteAsPlainText) {
+						e.preventDefault();
+						process({content : dom.encode(textContent).replace(/\r?\n/g, '<br />')});
+						return;
+					}
+				}
+
+				if (dom.get('_mcePaste'))
+					return;
+
+				// Create container to paste into
+				n = dom.add(body, 'div', {id : '_mcePaste', 'class' : 'mcePaste', 'data-mce-bogus' : '1'}, '\uFEFF\uFEFF');
+
+				// If contentEditable mode we need to find out the position of the closest element
+				if (body != ed.getDoc().body)
+					posY = dom.getPos(ed.selection.getStart(), body).y;
+				else
+					posY = body.scrollTop + dom.getViewPort(ed.getWin()).y;
+
+				// Styles needs to be applied after the element is added to the document since WebKit will otherwise remove all styles
+				// If also needs to be in view on IE or the paste would fail
+				dom.setStyles(n, {
+					position : 'absolute',
+					left : tinymce.isGecko ? -40 : 0, // Need to move it out of site on Gecko since it will othewise display a ghost resize rect for the div
+					top : posY - 25,
+					width : 1,
+					height : 1,
+					overflow : 'hidden'
+				});
+
+				if (tinymce.isIE) {
+					// Store away the old range
+					oldRng = sel.getRng();
+
+					// Select the container
+					rng = dom.doc.body.createTextRange();
+					rng.moveToElementText(n);
+					rng.execCommand('Paste');
+
+					// Remove container
+					dom.remove(n);
+
+					// Check if the contents was changed, if it wasn't then clipboard extraction failed probably due
+					// to IE security settings so we pass the junk though better than nothing right
+					if (n.innerHTML === '\uFEFF\uFEFF') {
+						ed.execCommand('mcePasteWord');
+						e.preventDefault();
+						return;
+					}
+
+					// Restore the old range and clear the contents before pasting
+					sel.setRng(oldRng);
+					sel.setContent('');
+
+					// For some odd reason we need to detach the the mceInsertContent call from the paste event
+					// It's like IE has a reference to the parent element that you paste in and the selection gets messed up
+					// when it tries to restore the selection
+					setTimeout(function() {
+						// Process contents
+						process({content : n.innerHTML});
+					}, 0);
+
+					// Block the real paste event
+					return tinymce.dom.Event.cancel(e);
+				} else {
+					function block(e) {
+						e.preventDefault();
+					};
+
+					// Block mousedown and click to prevent selection change
+					dom.bind(ed.getDoc(), 'mousedown', block);
+					dom.bind(ed.getDoc(), 'keydown', block);
+
+					or = ed.selection.getRng();
+
+					// Move select contents inside DIV
+					n = n.firstChild;
+					rng = ed.getDoc().createRange();
+					rng.setStart(n, 0);
+					rng.setEnd(n, 2);
+					sel.setRng(rng);
+
+					// Wait a while and grab the pasted contents
+					window.setTimeout(function() {
+						var h = '', nl;
+
+						// Paste divs duplicated in paste divs seems to happen when you paste plain text so lets first look for that broken behavior in WebKit
+						if (!dom.select('div.mcePaste > div.mcePaste').length) {
+							nl = dom.select('div.mcePaste');
+
+							// WebKit will split the div into multiple ones so this will loop through then all and join them to get the whole HTML string
+							each(nl, function(n) {
+								var child = n.firstChild;
+
+								// WebKit inserts a DIV container with lots of odd styles
+								if (child && child.nodeName == 'DIV' && child.style.marginTop && child.style.backgroundColor) {
+									dom.remove(child, 1);
+								}
+
+								// Remove apply style spans
+								each(dom.select('span.Apple-style-span', n), function(n) {
+									dom.remove(n, 1);
+								});
+
+								// Remove bogus br elements
+								each(dom.select('br[data-mce-bogus]', n), function(n) {
+									dom.remove(n);
+								});
+
+								// WebKit will make a copy of the DIV for each line of plain text pasted and insert them into the DIV
+								if (n.parentNode.className != 'mcePaste')
+									h += n.innerHTML;
+							});
+						} else {
+							// Found WebKit weirdness so force the content into paragraphs this seems to happen when you paste plain text from Nodepad etc
+							// So this logic will replace double enter with paragraphs and single enter with br so it kind of looks the same
+							h = '<p>' + dom.encode(textContent).replace(/\r?\n\r?\n/g, '</p><p>').replace(/\r?\n/g, '<br />') + '</p>';
+						}
+
+						// Remove the nodes
+						each(dom.select('div.mcePaste'), function(n) {
+							dom.remove(n);
+						});
+
+						// Restore the old selection
+						if (or)
+							sel.setRng(or);
+
+						process({content : h});
+
+						// Unblock events ones we got the contents
+						dom.unbind(ed.getDoc(), 'mousedown', block);
+						dom.unbind(ed.getDoc(), 'keydown', block);
+					}, 0);
+				}
+			}
+
+			// Check if we should use the new auto process method
+			if (getParam(ed, "paste_auto_cleanup_on_paste")) {
+				// Is it's Opera or older FF use key handler
+				if (tinymce.isOpera || /Firefox\/2/.test(navigator.userAgent)) {
+					ed.onKeyDown.addToTop(function(ed, e) {
+						if (((tinymce.isMac ? e.metaKey : e.ctrlKey) && e.keyCode == 86) || (e.shiftKey && e.keyCode == 45))
+							grabContent(e);
+					});
+				} else {
+					// Grab contents on paste event on Gecko and WebKit
+					ed.onPaste.addToTop(function(ed, e) {
+						return grabContent(e);
+					});
+				}
+			}
+
+			ed.onInit.add(function() {
+				ed.controlManager.setActive("pastetext", ed.pasteAsPlainText);
+
+				// Block all drag/drop events
+				if (getParam(ed, "paste_block_drop")) {
+					ed.dom.bind(ed.getBody(), ['dragend', 'dragover', 'draggesture', 'dragdrop', 'drop', 'drag'], function(e) {
+						e.preventDefault();
+						e.stopPropagation();
+
+						return false;
+					});
+				}
+			});
+
+			// Add legacy support
+			t._legacySupport();
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Paste text/word',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/paste',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		},
+
+		_preProcess : function(pl, o) {
+			var ed = this.editor,
+				h = o.content,
+				grep = tinymce.grep,
+				explode = tinymce.explode,
+				trim = tinymce.trim,
+				len, stripClass;
+
+			//console.log('Before preprocess:' + o.content);
+
+			function process(items) {
+				each(items, function(v) {
+					// Remove or replace
+					if (v.constructor == RegExp)
+						h = h.replace(v, '');
+					else
+						h = h.replace(v[0], v[1]);
+				});
+			}
+
+			if (ed.settings.paste_enable_default_filters == false) {
+				return;
+			}
+
+			// IE9 adds BRs before/after block elements when contents is pasted from word or for example another browser
+			if (tinymce.isIE && document.documentMode >= 9 && /<(h[1-6r]|p|div|address|pre|form|table|tbody|thead|tfoot|th|tr|td|li|ol|ul|caption|blockquote|center|dl|dt|dd|dir|fieldset)/.test(o.content)) {
+				// IE9 adds BRs before/after block elements when contents is pasted from word or for example another browser
+				process([[/(?:<br>&nbsp;[\s\r\n]+|<br>)*(<\/?(h[1-6r]|p|div|address|pre|form|table|tbody|thead|tfoot|th|tr|td|li|ol|ul|caption|blockquote|center|dl|dt|dd|dir|fieldset)[^>]*>)(?:<br>&nbsp;[\s\r\n]+|<br>)*/g, '$1']]);
+
+				// IE9 also adds an extra BR element for each soft-linefeed and it also adds a BR for each word wrap break
+				process([
+					[/<br><br>/g, '<BR><BR>'], // Replace multiple BR elements with uppercase BR to keep them intact
+					[/<br>/g, ' '], // Replace single br elements with space since they are word wrap BR:s
+					[/<BR><BR>/g, '<br>'] // Replace back the double brs but into a single BR
+				]);
+			}
+
+			// Detect Word content and process it more aggressive
+			if (/class="?Mso|style="[^"]*\bmso-|w:WordDocument/i.test(h) || o.wordContent) {
+				o.wordContent = true;			// Mark the pasted contents as word specific content
+				//console.log('Word contents detected.');
+
+				// Process away some basic content
+				process([
+					/^\s*(&nbsp;)+/gi,				// &nbsp; entities at the start of contents
+					/(&nbsp;|<br[^>]*>)+\s*$/gi		// &nbsp; entities at the end of contents
+				]);
+
+				if (getParam(ed, "paste_convert_headers_to_strong")) {
+					h = h.replace(/<p [^>]*class="?MsoHeading"?[^>]*>(.*?)<\/p>/gi, "<p><strong>$1</strong></p>");
+				}
+
+				if (getParam(ed, "paste_convert_middot_lists")) {
+					process([
+						[/<!--\[if !supportLists\]-->/gi, '$&__MCE_ITEM__'],					// Convert supportLists to a list item marker
+						[/(<span[^>]+(?:mso-list:|:\s*symbol)[^>]+>)/gi, '$1__MCE_ITEM__'],		// Convert mso-list and symbol spans to item markers
+						[/(<p[^>]+(?:MsoListParagraph)[^>]+>)/gi, '$1__MCE_ITEM__']				// Convert mso-list and symbol paragraphs to item markers (FF)
+					]);
+				}
+
+				process([
+					// Word comments like conditional comments etc
+					/<!--[\s\S]+?-->/gi,
+
+					// Remove comments, scripts (e.g., msoShowComment), XML tag, VML content, MS Office namespaced tags, and a few other tags
+					/<(!|script[^>]*>.*?<\/script(?=[>\s])|\/?(\?xml(:\w+)?|img|meta|link|style|\w:\w+)(?=[\s\/>]))[^>]*>/gi,
+
+					// Convert <s> into <strike> for line-though
+					[/<(\/?)s>/gi, "<$1strike>"],
+
+					// Replace nsbp entites to char since it's easier to handle
+					[/&nbsp;/gi, "\u00a0"]
+				]);
+
+				// Remove bad attributes, with or without quotes, ensuring that attribute text is really inside a tag.
+				// If JavaScript had a RegExp look-behind, we could have integrated this with the last process() array and got rid of the loop. But alas, it does not, so we cannot.
+				do {
+					len = h.length;
+					// Don't remove the type attribute for lists so that non-default list types display correctly.
+					h = h.replace(/(<?!(ol|ul)[^>]*\s)(?:id|name|language|type|on\w+|\w+:\w+)=(?:"[^"]*"|\w+)\s?/gi, "$1");
+					h = h.replace(/(<(ol|ul)[^>]*\s)(?:id|name|language|on\w+|\w+:\w+)=(?:"[^"]*"|\w+)\s?/gi, "$1");
+				} while (len != h.length);
+
+				// Remove all spans if no styles is to be retained
+				if (getParam(ed, "paste_retain_style_properties").replace(/^none$/i, "").length == 0) {
+					h = h.replace(/<\/?span[^>]*>/gi, "");
+				} else {
+					// We're keeping styles, so at least clean them up.
+					// CSS Reference: http://msdn.microsoft.com/en-us/library/aa155477.aspx
+
+					process([
+						// Convert <span style="mso-spacerun:yes">___</span> to string of alternating breaking/non-breaking spaces of same length
+						[/<span\s+style\s*=\s*"\s*mso-spacerun\s*:\s*yes\s*;?\s*"\s*>([\s\u00a0]*)<\/span>/gi,
+							function(str, spaces) {
+								return (spaces.length > 0)? spaces.replace(/./, " ").slice(Math.floor(spaces.length/2)).split("").join("\u00a0") : "";
+							}
+						],
+
+						// Examine all styles: delete junk, transform some, and keep the rest
+						[/(<[a-z][^>]*)\sstyle="([^"]*)"/gi,
+							function(str, tag, style) {
+								var n = [],
+									i = 0,
+									s = explode(trim(style).replace(/&quot;/gi, "'"), ";");
+
+								// Examine each style definition within the tag's style attribute
+								each(s, function(v) {
+									var name, value,
+										parts = explode(v, ":");
+
+									function ensureUnits(v) {
+										return v + ((v !== "0") && (/\d$/.test(v)))? "px" : "";
+									}
+
+									if (parts.length == 2) {
+										name = parts[0].toLowerCase();
+										value = parts[1].toLowerCase();
+
+										// Translate certain MS Office styles into their CSS equivalents
+										switch (name) {
+											case "mso-padding-alt":
+											case "mso-padding-top-alt":
+											case "mso-padding-right-alt":
+											case "mso-padding-bottom-alt":
+											case "mso-padding-left-alt":
+											case "mso-margin-alt":
+											case "mso-margin-top-alt":
+											case "mso-margin-right-alt":
+											case "mso-margin-bottom-alt":
+											case "mso-margin-left-alt":
+											case "mso-table-layout-alt":
+											case "mso-height":
+											case "mso-width":
+											case "mso-vertical-align-alt":
+												n[i++] = name.replace(/^mso-|-alt$/g, "") + ":" + ensureUnits(value);
+												return;
+
+											case "horiz-align":
+												n[i++] = "text-align:" + value;
+												return;
+
+											case "vert-align":
+												n[i++] = "vertical-align:" + value;
+												return;
+
+											case "font-color":
+											case "mso-foreground":
+												n[i++] = "color:" + value;
+												return;
+
+											case "mso-background":
+											case "mso-highlight":
+												n[i++] = "background:" + value;
+												return;
+
+											case "mso-default-height":
+												n[i++] = "min-height:" + ensureUnits(value);
+												return;
+
+											case "mso-default-width":
+												n[i++] = "min-width:" + ensureUnits(value);
+												return;
+
+											case "mso-padding-between-alt":
+												n[i++] = "border-collapse:separate;border-spacing:" + ensureUnits(value);
+												return;
+
+											case "text-line-through":
+												if ((value == "single") || (value == "double")) {
+													n[i++] = "text-decoration:line-through";
+												}
+												return;
+
+											case "mso-zero-height":
+												if (value == "yes") {
+													n[i++] = "display:none";
+												}
+												return;
+										}
+
+										// Eliminate all MS Office style definitions that have no CSS equivalent by examining the first characters in the name
+										if (/^(mso|column|font-emph|lang|layout|line-break|list-image|nav|panose|punct|row|ruby|sep|size|src|tab-|table-border|text-(?!align|decor|indent|trans)|top-bar|version|vnd|word-break)/.test(name)) {
+											return;
+										}
+
+										// If it reached this point, it must be a valid CSS style
+										n[i++] = name + ":" + parts[1];		// Lower-case name, but keep value case
+									}
+								});
+
+								// If style attribute contained any valid styles the re-write it; otherwise delete style attribute.
+								if (i > 0) {
+									return tag + ' style="' + n.join(';') + '"';
+								} else {
+									return tag;
+								}
+							}
+						]
+					]);
+				}
+			}
+
+			// Replace headers with <strong>
+			if (getParam(ed, "paste_convert_headers_to_strong")) {
+				process([
+					[/<h[1-6][^>]*>/gi, "<p><strong>"],
+					[/<\/h[1-6][^>]*>/gi, "</strong></p>"]
+				]);
+			}
+
+			process([
+				// Copy paste from Java like Open Office will produce this junk on FF
+				[/Version:[\d.]+\nStartHTML:\d+\nEndHTML:\d+\nStartFragment:\d+\nEndFragment:\d+/gi, '']
+			]);
+
+			// Class attribute options are: leave all as-is ("none"), remove all ("all"), or remove only those starting with mso ("mso").
+			// Note:-  paste_strip_class_attributes: "none", verify_css_classes: true is also a good variation.
+			stripClass = getParam(ed, "paste_strip_class_attributes");
+
+			if (stripClass !== "none") {
+				function removeClasses(match, g1) {
+						if (stripClass === "all")
+							return '';
+
+						var cls = grep(explode(g1.replace(/^(["'])(.*)\1$/, "$2"), " "),
+							function(v) {
+								return (/^(?!mso)/i.test(v));
+							}
+						);
+
+						return cls.length ? ' class="' + cls.join(" ") + '"' : '';
+				};
+
+				h = h.replace(/ class="([^"]+)"/gi, removeClasses);
+				h = h.replace(/ class=([\-\w]+)/gi, removeClasses);
+			}
+
+			// Remove spans option
+			if (getParam(ed, "paste_remove_spans")) {
+				h = h.replace(/<\/?span[^>]*>/gi, "");
+			}
+
+			//console.log('After preprocess:' + h);
+
+			o.content = h;
+		},
+
+		/**
+		 * Various post process items.
+		 */
+		_postProcess : function(pl, o) {
+			var t = this, ed = t.editor, dom = ed.dom, styleProps;
+
+			if (ed.settings.paste_enable_default_filters == false) {
+				return;
+			}
+
+			if (o.wordContent) {
+				// Remove named anchors or TOC links
+				each(dom.select('a', o.node), function(a) {
+					if (!a.href || a.href.indexOf('#_Toc') != -1)
+						dom.remove(a, 1);
+				});
+
+				if (getParam(ed, "paste_convert_middot_lists")) {
+					t._convertLists(pl, o);
+				}
+
+				// Process styles
+				styleProps = getParam(ed, "paste_retain_style_properties"); // retained properties
+
+				// Process only if a string was specified and not equal to "all" or "*"
+				if ((tinymce.is(styleProps, "string")) && (styleProps !== "all") && (styleProps !== "*")) {
+					styleProps = tinymce.explode(styleProps.replace(/^none$/i, ""));
+
+					// Retains some style properties
+					each(dom.select('*', o.node), function(el) {
+						var newStyle = {}, npc = 0, i, sp, sv;
+
+						// Store a subset of the existing styles
+						if (styleProps) {
+							for (i = 0; i < styleProps.length; i++) {
+								sp = styleProps[i];
+								sv = dom.getStyle(el, sp);
+
+								if (sv) {
+									newStyle[sp] = sv;
+									npc++;
+								}
+							}
+						}
+
+						// Remove all of the existing styles
+						dom.setAttrib(el, 'style', '');
+
+						if (styleProps && npc > 0)
+							dom.setStyles(el, newStyle); // Add back the stored subset of styles
+						else // Remove empty span tags that do not have class attributes
+							if (el.nodeName == 'SPAN' && !el.className)
+								dom.remove(el, true);
+					});
+				}
+			}
+
+			// Remove all style information or only specifically on WebKit to avoid the style bug on that browser
+			if (getParam(ed, "paste_remove_styles") || (getParam(ed, "paste_remove_styles_if_webkit") && tinymce.isWebKit)) {
+				each(dom.select('*[style]', o.node), function(el) {
+					el.removeAttribute('style');
+					el.removeAttribute('data-mce-style');
+				});
+			} else {
+				if (tinymce.isWebKit) {
+					// We need to compress the styles on WebKit since if you paste <img border="0" /> it will become <img border="0" style="... lots of junk ..." />
+					// Removing the mce_style that contains the real value will force the Serializer engine to compress the styles
+					each(dom.select('*', o.node), function(el) {
+						el.removeAttribute('data-mce-style');
+					});
+				}
+			}
+		},
+
+		/**
+		 * Converts the most common bullet and number formats in Office into a real semantic UL/LI list.
+		 */
+		_convertLists : function(pl, o) {
+			var dom = pl.editor.dom, listElm, li, lastMargin = -1, margin, levels = [], lastType, html;
+
+			// Convert middot lists into real semantic lists
+			each(dom.select('p', o.node), function(p) {
+				var sib, val = '', type, html, idx, parents;
+
+				// Get text node value at beginning of paragraph
+				for (sib = p.firstChild; sib && sib.nodeType == 3; sib = sib.nextSibling)
+					val += sib.nodeValue;
+
+				val = p.innerHTML.replace(/<\/?\w+[^>]*>/gi, '').replace(/&nbsp;/g, '\u00a0');
+
+				// Detect unordered lists look for bullets
+				if (/^(__MCE_ITEM__)+[\u2022\u00b7\u00a7\u00d8o\u25CF]\s*\u00a0*/.test(val))
+					type = 'ul';
+
+				// Detect ordered lists 1., a. or ixv.
+				if (/^__MCE_ITEM__\s*\w+\.\s*\u00a0+/.test(val))
+					type = 'ol';
+
+				// Check if node value matches the list pattern: o&nbsp;&nbsp;
+				if (type) {
+					margin = parseFloat(p.style.marginLeft || 0);
+
+					if (margin > lastMargin)
+						levels.push(margin);
+
+					if (!listElm || type != lastType) {
+						listElm = dom.create(type);
+						dom.insertAfter(listElm, p);
+					} else {
+						// Nested list element
+						if (margin > lastMargin) {
+							listElm = li.appendChild(dom.create(type));
+						} else if (margin < lastMargin) {
+							// Find parent level based on margin value
+							idx = tinymce.inArray(levels, margin);
+							parents = dom.getParents(listElm.parentNode, type);
+							listElm = parents[parents.length - 1 - idx] || listElm;
+						}
+					}
+
+					// Remove middot or number spans if they exists
+					each(dom.select('span', p), function(span) {
+						var html = span.innerHTML.replace(/<\/?\w+[^>]*>/gi, '');
+
+						// Remove span with the middot or the number
+						if (type == 'ul' && /^__MCE_ITEM__[\u2022\u00b7\u00a7\u00d8o\u25CF]/.test(html))
+							dom.remove(span);
+						else if (/^__MCE_ITEM__[\s\S]*\w+\.(&nbsp;|\u00a0)*\s*/.test(html))
+							dom.remove(span);
+					});
+
+					html = p.innerHTML;
+
+					// Remove middot/list items
+					if (type == 'ul')
+						html = p.innerHTML.replace(/__MCE_ITEM__/g, '').replace(/^[\u2022\u00b7\u00a7\u00d8o\u25CF]\s*(&nbsp;|\u00a0)+\s*/, '');
+					else
+						html = p.innerHTML.replace(/__MCE_ITEM__/g, '').replace(/^\s*[\w|'<'|'>']+\.(&nbsp;|\u00a0)+\s*/, '');;
+
+					// Create li and add paragraph data into the new li
+					li = listElm.appendChild(dom.create('li', 0, html));
+					dom.remove(p);
+
+					lastMargin = margin;
+					lastType = type;
+				} else
+					listElm = lastMargin = 0; // End list element
+			});
+
+			// Remove any left over makers
+			html = o.node.innerHTML;
+			if (html.indexOf('__MCE_ITEM__') != -1)
+				o.node.innerHTML = html.replace(/__MCE_ITEM__/g, '');
+		},
+
+		/**
+		 * Inserts the specified contents at the caret position.
+		 */
+		_insert : function(h, skip_undo) {
+			var ed = this.editor, r = ed.selection.getRng();
+
+			// First delete the contents seems to work better on WebKit when the selection spans multiple list items or multiple table cells.
+			if (!ed.selection.isCollapsed() && r.startContainer != r.endContainer)
+				ed.getDoc().execCommand('Delete', false, null);
+
+			ed.execCommand('mceInsertContent', false, h, {skip_undo : skip_undo});
+		},
+
+		/**
+		 * Instead of the old plain text method which tried to re-create a paste operation, the
+		 * new approach adds a plain text mode toggle switch that changes the behavior of paste.
+		 * This function is passed the same input that the regular paste plugin produces.
+		 * It performs additional scrubbing and produces (and inserts) the plain text.
+		 * This approach leverages all of the great existing functionality in the paste
+		 * plugin, and requires minimal changes to add the new functionality.
+		 * Speednet - June 2009
+		 */
+		_insertPlainText : function(content) {
+			var ed = this.editor,
+				linebr = getParam(ed, "paste_text_linebreaktype"),
+				rl = getParam(ed, "paste_text_replacements"),
+				is = tinymce.is;
+
+			function process(items) {
+				each(items, function(v) {
+					if (v.constructor == RegExp)
+						content = content.replace(v, "");
+					else
+						content = content.replace(v[0], v[1]);
+				});
+			};
+
+			if ((typeof(content) === "string") && (content.length > 0)) {
+				// If HTML content with line-breaking tags, then remove all cr/lf chars because only tags will break a line
+				if (/<(?:p|br|h[1-6]|ul|ol|dl|table|t[rdh]|div|blockquote|fieldset|pre|address|center)[^>]*>/i.test(content)) {
+					process([
+						/[\n\r]+/g
+					]);
+				} else {
+					// Otherwise just get rid of carriage returns (only need linefeeds)
+					process([
+						/\r+/g
+					]);
+				}
+
+				process([
+					[/<\/(?:p|h[1-6]|ul|ol|dl|table|div|blockquote|fieldset|pre|address|center)>/gi, "\n\n"],		// Block tags get a blank line after them
+					[/<br[^>]*>|<\/tr>/gi, "\n"],				// Single linebreak for <br /> tags and table rows
+					[/<\/t[dh]>\s*<t[dh][^>]*>/gi, "\t"],		// Table cells get tabs betweem them
+					/<[a-z!\/?][^>]*>/gi,						// Delete all remaining tags
+					[/&nbsp;/gi, " "],							// Convert non-break spaces to regular spaces (remember, *plain text*)
+					[/(?:(?!\n)\s)*(\n+)(?:(?!\n)\s)*/gi, "$1"] // Cool little RegExp deletes whitespace around linebreak chars.
+				]);
+
+				var maxLinebreaks = Number(getParam(ed, "paste_max_consecutive_linebreaks"));
+				if (maxLinebreaks > -1) {
+					var maxLinebreaksRegex = new RegExp("\n{" + (maxLinebreaks + 1) + ",}", "g");
+					var linebreakReplacement = "";
+
+					while (linebreakReplacement.length < maxLinebreaks) {
+						linebreakReplacement += "\n";
+					}
+
+					process([
+						[maxLinebreaksRegex, linebreakReplacement] // Limit max consecutive linebreaks
+					]);
+				}
+
+				content = ed.dom.decode(tinymce.html.Entities.encodeRaw(content));
+
+				// Perform default or custom replacements
+				if (is(rl, "array")) {
+					process(rl);
+				} else if (is(rl, "string")) {
+					process(new RegExp(rl, "gi"));
+				}
+
+				// Treat paragraphs as specified in the config
+				if (linebr == "none") {
+					// Convert all line breaks to space
+					process([
+						[/\n+/g, " "]
+					]);
+				} else if (linebr == "br") {
+					// Convert all line breaks to <br />
+					process([
+						[/\n/g, "<br />"]
+					]);
+				} else if (linebr == "p") {
+					// Convert all line breaks to <p>...</p>
+					process([
+						[/\n+/g, "</p><p>"],
+						[/^(.*<\/p>)(<p>)$/, '<p>$1']
+					]);
+				} else {
+					// defaults to "combined"
+					// Convert single line breaks to <br /> and double line breaks to <p>...</p>
+					process([
+						[/\n\n/g, "</p><p>"],
+						[/^(.*<\/p>)(<p>)$/, '<p>$1'],
+						[/\n/g, "<br />"]
+					]);
+				}
+
+				ed.execCommand('mceInsertContent', false, content);
+			}
+		},
+
+		/**
+		 * This method will open the old style paste dialogs. Some users might want the old behavior but still use the new cleanup engine.
+		 */
+		_legacySupport : function() {
+			var t = this, ed = t.editor;
+
+			// Register command(s) for backwards compatibility
+			ed.addCommand("mcePasteWord", function() {
+				ed.windowManager.open({
+					file: t.url + "/pasteword.htm",
+					width: parseInt(getParam(ed, "paste_dialog_width")),
+					height: parseInt(getParam(ed, "paste_dialog_height")),
+					inline: 1
+				});
+			});
+
+			if (getParam(ed, "paste_text_use_dialog")) {
+				ed.addCommand("mcePasteText", function() {
+					ed.windowManager.open({
+						file : t.url + "/pastetext.htm",
+						width: parseInt(getParam(ed, "paste_dialog_width")),
+						height: parseInt(getParam(ed, "paste_dialog_height")),
+						inline : 1
+					});
+				});
+			}
+
+			// Register button for backwards compatibility
+			ed.addButton("pasteword", {title : "paste.paste_word_desc", cmd : "mcePasteWord"});
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add("paste", tinymce.plugins.PastePlugin);
+})();
diff --git a/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/preview/jscripts/embed.js b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/preview/jscripts/embed.js
new file mode 100644
index 0000000..6fe25de
--- /dev/null
+++ b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/preview/jscripts/embed.js
@@ -0,0 +1,73 @@
+/**
+ * This script contains embed functions for common plugins. This scripts are complety free to use for any purpose.
+ */
+
+function writeFlash(p) {
+	writeEmbed(
+		'D27CDB6E-AE6D-11cf-96B8-444553540000',
+		'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0',
+		'application/x-shockwave-flash',
+		p
+	);
+}
+
+function writeShockWave(p) {
+	writeEmbed(
+	'166B1BCA-3F9C-11CF-8075-444553540000',
+	'http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0',
+	'application/x-director',
+		p
+	);
+}
+
+function writeQuickTime(p) {
+	writeEmbed(
+		'02BF25D5-8C17-4B23-BC80-D3488ABDDC6B',
+		'http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0',
+		'video/quicktime',
+		p
+	);
+}
+
+function writeRealMedia(p) {
+	writeEmbed(
+		'CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA',
+		'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0',
+		'audio/x-pn-realaudio-plugin',
+		p
+	);
+}
+
+function writeWindowsMedia(p) {
+	p.url = p.src;
+	writeEmbed(
+		'6BF52A52-394A-11D3-B153-00C04F79FAA6',
+		'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701',
+		'application/x-mplayer2',
+		p
+	);
+}
+
+function writeEmbed(cls, cb, mt, p) {
+	var h = '', n;
+
+	h += '<object classid="clsid:' + cls + '" codebase="' + cb + '"';
+	h += typeof(p.id) != "undefined" ? 'id="' + p.id + '"' : '';
+	h += typeof(p.name) != "undefined" ? 'name="' + p.name + '"' : '';
+	h += typeof(p.width) != "undefined" ? 'width="' + p.width + '"' : '';
+	h += typeof(p.height) != "undefined" ? 'height="' + p.height + '"' : '';
+	h += typeof(p.align) != "undefined" ? 'align="' + p.align + '"' : '';
+	h += '>';
+
+	for (n in p)
+		h += '<param name="' + n + '" value="' + p[n] + '">';
+
+	h += '<embed type="' + mt + '"';
+
+	for (n in p)
+		h += n + '="' + p[n] + '" ';
+
+	h += '></embed></object>';
+
+	document.write(h);
+}
diff --git a/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/preview/preview.html b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/preview/preview.html
new file mode 100644
index 0000000..c09a7f0
--- /dev/null
+++ b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/preview/preview.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+<script type="text/javascript" src="jscripts/embed.js"></script>
+<script type="text/javascript"><!--
+document.write('<base href="' + tinyMCEPopup.getWindowArg("base") + '">');
+// -->
+</script>
+<title>{#preview.preview_desc}</title>
+</head>
+<body id="content">
+<script type="text/javascript">
+	document.write(tinyMCEPopup.editor.getContent());
+</script>
+</body>
+</html>
diff --git a/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/save/editor_plugin_src.js b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/save/editor_plugin_src.js
new file mode 100644
index 0000000..5ab6491
--- /dev/null
+++ b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/save/editor_plugin_src.js
@@ -0,0 +1,101 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.Save', {
+		init : function(ed, url) {
+			var t = this;
+
+			t.editor = ed;
+
+			// Register commands
+			ed.addCommand('mceSave', t._save, t);
+			ed.addCommand('mceCancel', t._cancel, t);
+
+			// Register buttons
+			ed.addButton('save', {title : 'save.save_desc', cmd : 'mceSave'});
+			ed.addButton('cancel', {title : 'save.cancel_desc', cmd : 'mceCancel'});
+
+			ed.onNodeChange.add(t._nodeChange, t);
+			ed.addShortcut('ctrl+s', ed.getLang('save.save_desc'), 'mceSave');
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Save',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/save',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		},
+
+		// Private methods
+
+		_nodeChange : function(ed, cm, n) {
+			var ed = this.editor;
+
+			if (ed.getParam('save_enablewhendirty')) {
+				cm.setDisabled('save', !ed.isDirty());
+				cm.setDisabled('cancel', !ed.isDirty());
+			}
+		},
+
+		// Private methods
+
+		_save : function() {
+			var ed = this.editor, formObj, os, i, elementId;
+
+			formObj = tinymce.DOM.get(ed.id).form || tinymce.DOM.getParent(ed.id, 'form');
+
+			if (ed.getParam("save_enablewhendirty") && !ed.isDirty())
+				return;
+
+			tinyMCE.triggerSave();
+
+			// Use callback instead
+			if (os = ed.getParam("save_onsavecallback")) {
+				if (ed.execCallback('save_onsavecallback', ed)) {
+					ed.startContent = tinymce.trim(ed.getContent({format : 'raw'}));
+					ed.nodeChanged();
+				}
+
+				return;
+			}
+
+			if (formObj) {
+				ed.isNotDirty = true;
+
+				if (formObj.onsubmit == null || formObj.onsubmit() != false)
+					formObj.submit();
+
+				ed.nodeChanged();
+			} else
+				ed.windowManager.alert("Error: No form element found.");
+		},
+
+		_cancel : function() {
+			var ed = this.editor, os, h = tinymce.trim(ed.startContent);
+
+			// Use callback instead
+			if (os = ed.getParam("save_oncancelcallback")) {
+				ed.execCallback('save_oncancelcallback', ed);
+				return;
+			}
+
+			ed.setContent(h);
+			ed.undoManager.clear();
+			ed.nodeChanged();
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('save', tinymce.plugins.Save);
+})();
\ No newline at end of file
diff --git a/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/searchreplace/js/searchreplace.js b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/searchreplace/js/searchreplace.js
new file mode 100644
index 0000000..85c542e
--- /dev/null
+++ b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/searchreplace/js/searchreplace.js
@@ -0,0 +1,152 @@
+tinyMCEPopup.requireLangPack();
+
+var SearchReplaceDialog = {
+	init : function(ed) {
+		var t = this, f = document.forms[0], m = tinyMCEPopup.getWindowArg("mode");
+
+		t.switchMode(m);
+
+		f[m + '_panel_searchstring'].value = tinyMCEPopup.getWindowArg("search_string");
+
+		// Focus input field
+		f[m + '_panel_searchstring'].focus();
+		
+		mcTabs.onChange.add(function(tab_id, panel_id) {
+			t.switchMode(tab_id.substring(0, tab_id.indexOf('_')));
+		});
+
+	},
+
+	switchMode : function(m) {
+		var f, lm = this.lastMode;
+
+		if (lm != m) {
+			f = document.forms[0];
+
+			if (lm) {
+				f[m + '_panel_searchstring'].value = f[lm + '_panel_searchstring'].value;
+				f[m + '_panel_backwardsu'].checked = f[lm + '_panel_backwardsu'].checked;
+				f[m + '_panel_backwardsd'].checked = f[lm + '_panel_backwardsd'].checked;
+				f[m + '_panel_casesensitivebox'].checked = f[lm + '_panel_casesensitivebox'].checked;
+			}
+
+			mcTabs.displayTab(m + '_tab',  m + '_panel');
+			document.getElementById("replaceBtn").style.display = (m == "replace") ? "inline" : "none";
+			document.getElementById("replaceAllBtn").style.display = (m == "replace") ? "inline" : "none";
+			this.lastMode = m;
+		}
+	},
+
+	searchNext : function(a) {
+		var ed = tinyMCEPopup.editor, se = ed.selection, r = se.getRng(), f, m = this.lastMode, s, b, fl = 0, w = ed.getWin(), wm = ed.windowManager, fo = 0;
+
+		if (tinymce.isIE11 && !window.find) {
+			ed.windowManager.alert("This feature is not available in IE 11+. Upgrade TinyMCE to 4.x to get this functionallity back.");
+			return;
+		}
+
+		// Get input
+		f = document.forms[0];
+		s = f[m + '_panel_searchstring'].value;
+		b = f[m + '_panel_backwardsu'].checked;
+		ca = f[m + '_panel_casesensitivebox'].checked;
+		rs = f['replace_panel_replacestring'].value;
+
+		if (tinymce.isIE) {
+			r = ed.getDoc().selection.createRange();
+		}
+
+		if (s == '')
+			return;
+
+		function fix() {
+			// Correct Firefox graphics glitches
+			// TODO: Verify if this is actually needed any more, maybe it was for very old FF versions? 
+			r = se.getRng().cloneRange();
+			ed.getDoc().execCommand('SelectAll', false, null);
+			se.setRng(r);
+		};
+
+		function replace() {
+			ed.selection.setContent(rs); // Needs to be duplicated due to selection bug in IE
+		};
+
+		// IE flags
+		if (ca)
+			fl = fl | 4;
+
+		switch (a) {
+			case 'all':
+				// Move caret to beginning of text
+				ed.execCommand('SelectAll');
+				ed.selection.collapse(true);
+
+				if (tinymce.isIE) {
+					ed.focus();
+					r = ed.getDoc().selection.createRange();
+
+					while (r.findText(s, b ? -1 : 1, fl)) {
+						r.scrollIntoView();
+						r.select();
+						replace();
+						fo = 1;
+
+						if (b) {
+							r.moveEnd("character", -(rs.length)); // Otherwise will loop forever
+						} else {
+							// to avoid looping for ever in MSIE 9/10 when just
+							// changing the case
+							r.moveStart("character", rs.length);
+						}
+					}
+
+					tinyMCEPopup.storeSelection();
+				} else {
+					while (w.find(s, ca, b, false, false, false, false)) {
+						replace();
+						fo = 1;
+					}
+				}
+
+				if (fo)
+					tinyMCEPopup.alert(ed.getLang('searchreplace_dlg.allreplaced'));
+				else
+					tinyMCEPopup.alert(ed.getLang('searchreplace_dlg.notfound'));
+
+				return;
+
+			case 'current':
+				if (!ed.selection.isCollapsed())
+					replace();
+
+				break;
+		}
+
+		se.collapse(b);
+		r = se.getRng();
+
+		// Whats the point
+		if (!s)
+			return;
+
+		if (tinymce.isIE) {
+			ed.focus();
+			r = ed.getDoc().selection.createRange();
+
+			if (r.findText(s, b ? -1 : 1, fl)) {
+				r.scrollIntoView();
+				r.select();
+			} else
+				tinyMCEPopup.alert(ed.getLang('searchreplace_dlg.notfound'));
+
+			tinyMCEPopup.storeSelection();
+		} else {
+			if (!w.find(s, ca, b, false, false, false, false))
+				tinyMCEPopup.alert(ed.getLang('searchreplace_dlg.notfound'));
+			else
+				fix();
+		}
+	}
+};
+
+tinyMCEPopup.onInit.add(SearchReplaceDialog.init, SearchReplaceDialog);
diff --git a/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin_src.js b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin_src.js
new file mode 100644
index 0000000..4081181
--- /dev/null
+++ b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin_src.js
@@ -0,0 +1,471 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	var JSONRequest = tinymce.util.JSONRequest, each = tinymce.each, DOM = tinymce.DOM;
+
+	tinymce.create('tinymce.plugins.SpellcheckerPlugin', {
+		getInfo : function() {
+			return {
+				longname : 'Spellchecker',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/spellchecker',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		},
+
+		init : function(ed, url) {
+			var t = this, cm;
+
+			t.url = url;
+			t.editor = ed;
+			t.rpcUrl = ed.getParam("spellchecker_rpc_url", "{backend}");
+
+			if (t.rpcUrl == '{backend}') {
+				// Sniff if the browser supports native spellchecking (Don't know of a better way)
+				if (tinymce.isIE)
+					return;
+
+				t.hasSupport = true;
+
+				// Disable the context menu when spellchecking is active
+				ed.onContextMenu.addToTop(function(ed, e) {
+					if (t.active)
+						return false;
+				});
+			}
+
+			// Register commands
+			ed.addCommand('mceSpellCheck', function() {
+				if (t.rpcUrl == '{backend}') {
+					// Enable/disable native spellchecker
+					t.editor.getBody().spellcheck = t.active = !t.active;
+					return;
+				}
+
+				if (!t.active) {
+					ed.setProgressState(1);
+					t._sendRPC('checkWords', [t.selectedLang, t._getWords()], function(r) {
+						if (r.length > 0) {
+							t.active = 1;
+							t._markWords(r);
+							ed.setProgressState(0);
+							ed.nodeChanged();
+						} else {
+							ed.setProgressState(0);
+
+							if (ed.getParam('spellchecker_report_no_misspellings', true))
+								ed.windowManager.alert('spellchecker.no_mpell');
+						}
+					});
+				} else
+					t._done();
+			});
+
+			if (ed.settings.content_css !== false)
+				ed.contentCSS.push(url + '/css/content.css');
+
+			ed.onClick.add(t._showMenu, t);
+			ed.onContextMenu.add(t._showMenu, t);
+			ed.onBeforeGetContent.add(function() {
+				if (t.active)
+					t._removeWords();
+			});
+
+			ed.onNodeChange.add(function(ed, cm) {
+				cm.setActive('spellchecker', t.active);
+			});
+
+			ed.onSetContent.add(function() {
+				t._done();
+			});
+
+			ed.onBeforeGetContent.add(function() {
+				t._done();
+			});
+
+			ed.onBeforeExecCommand.add(function(ed, cmd) {
+				if (cmd == 'mceFullScreen')
+					t._done();
+			});
+
+			// Find selected language
+			t.languages = {};
+			each(ed.getParam('spellchecker_languages', '+English=en,Danish=da,Dutch=nl,Finnish=fi,French=fr,German=de,Italian=it,Polish=pl,Portuguese=pt,Spanish=es,Swedish=sv', 'hash'), function(v, k) {
+				if (k.indexOf('+') === 0) {
+					k = k.substring(1);
+					t.selectedLang = v;
+				}
+
+				t.languages[k] = v;
+			});
+		},
+
+		createControl : function(n, cm) {
+			var t = this, c, ed = t.editor;
+
+			if (n == 'spellchecker') {
+				// Use basic button if we use the native spellchecker
+				if (t.rpcUrl == '{backend}') {
+					// Create simple toggle button if we have native support
+					if (t.hasSupport)
+						c = cm.createButton(n, {title : 'spellchecker.desc', cmd : 'mceSpellCheck', scope : t});
+
+					return c;
+				}
+
+				c = cm.createSplitButton(n, {title : 'spellchecker.desc', cmd : 'mceSpellCheck', scope : t});
+
+				c.onRenderMenu.add(function(c, m) {
+					m.add({title : 'spellchecker.langs', 'class' : 'mceMenuItemTitle'}).setDisabled(1);
+					t.menuItems = {};
+					each(t.languages, function(v, k) {
+						var o = {icon : 1}, mi;
+
+						o.onclick = function() {
+							if (v == t.selectedLang) {
+								return;
+							}
+							t._updateMenu(mi);
+							t.selectedLang = v;
+						};
+
+						o.title = k;
+						mi = m.add(o);
+						mi.setSelected(v == t.selectedLang);
+						t.menuItems[v] = mi;
+						if (v == t.selectedLang)
+							t.selectedItem = mi;
+					});
+				});
+
+
+
+				return c;
+			}
+		},
+
+		setLanguage: function(lang) {
+			var t = this;
+
+			if (lang == t.selectedLang) {
+				// allowed
+				return;
+			}
+
+			if (tinymce.grep(t.languages, function(v) { return v === lang; }).length === 0) {
+				throw "Unknown language: " + lang;
+			}
+
+			t.selectedLang = lang;
+
+			// if the menu has been shown, update it as well
+			if (t.menuItems) {
+				t._updateMenu(t.menuItems[lang]);
+			}
+
+			if (t.active) {
+				// clear error in the old language.
+				t._done();
+
+				// Don't immediately block the UI to check spelling in the new language, this is an API not a user action.
+			}
+		},
+
+		// Internal functions
+
+		_updateMenu: function(mi) {
+			mi.setSelected(1);
+			this.selectedItem.setSelected(0);
+			this.selectedItem = mi;
+		},
+
+		_walk : function(n, f) {
+			var d = this.editor.getDoc(), w;
+
+			if (d.createTreeWalker) {
+				w = d.createTreeWalker(n, NodeFilter.SHOW_TEXT, null, false);
+
+				while ((n = w.nextNode()) != null)
+					f.call(this, n);
+			} else
+				tinymce.walk(n, f, 'childNodes');
+		},
+
+		_getSeparators : function() {
+			var re = '', i, str = this.editor.getParam('spellchecker_word_separator_chars', '\\s!"#$%&()*+,-./:;<=>?@[\]^_{|}����������������\u201d\u201c');
+
+			// Build word separator regexp
+			for (i=0; i<str.length; i++)
+				re += '\\' + str.charAt(i);
+
+			return re;
+		},
+
+		_getWords : function() {
+			var ed = this.editor, wl = [], tx = '', lo = {}, rawWords = [];
+
+			// Get area text
+			this._walk(ed.getBody(), function(n) {
+				if (n.nodeType == 3)
+					tx += n.nodeValue + ' ';
+			});
+
+			// split the text up into individual words
+			if (ed.getParam('spellchecker_word_pattern')) {
+				// look for words that match the pattern
+				rawWords = tx.match('(' + ed.getParam('spellchecker_word_pattern') + ')', 'gi');
+			} else {
+				// Split words by separator
+				tx = tx.replace(new RegExp('([0-9]|[' + this._getSeparators() + '])', 'g'), ' ');
+				tx = tinymce.trim(tx.replace(/(\s+)/g, ' '));
+				rawWords = tx.split(' ');
+			}
+
+			// Build word array and remove duplicates
+			each(rawWords, function(v) {
+				if (!lo[v]) {
+					wl.push(v);
+					lo[v] = 1;
+				}
+			});
+
+			return wl;
+		},
+
+		_removeWords : function(w) {
+			var ed = this.editor, dom = ed.dom, se = ed.selection, r = se.getRng(true);
+
+			each(dom.select('span').reverse(), function(n) {
+				if (n && (dom.hasClass(n, 'mceItemHiddenSpellWord') || dom.hasClass(n, 'mceItemHidden'))) {
+					if (!w || dom.decode(n.innerHTML) == w)
+						dom.remove(n, 1);
+				}
+			});
+
+			se.setRng(r);
+		},
+
+		_markWords : function(wl) {
+			var ed = this.editor, dom = ed.dom, doc = ed.getDoc(), se = ed.selection, r = se.getRng(true), nl = [],
+				w = wl.join('|'), re = this._getSeparators(), rx = new RegExp('(^|[' + re + '])(' + w + ')(?=[' + re + ']|$)', 'g');
+
+			// Collect all text nodes
+			this._walk(ed.getBody(), function(n) {
+				if (n.nodeType == 3) {
+					nl.push(n);
+				}
+			});
+
+			// Wrap incorrect words in spans
+			each(nl, function(n) {
+				var node, elem, txt, pos, v = n.nodeValue;
+
+				rx.lastIndex = 0;
+				if (rx.test(v)) {
+					// Encode the content
+					v = dom.encode(v);
+					// Create container element
+					elem = dom.create('span', {'class' : 'mceItemHidden'});
+
+					// Following code fixes IE issues by creating text nodes
+					// using DOM methods instead of innerHTML.
+					// Bug #3124: <PRE> elements content is broken after spellchecking.
+					// Bug #1408: Preceding whitespace characters are removed
+					// @TODO: I'm not sure that both are still issues on IE9.
+					if (tinymce.isIE) {
+						// Enclose mispelled words with temporal tag
+						v = v.replace(rx, '$1<mcespell>$2</mcespell>');
+						// Loop over the content finding mispelled words
+						while ((pos = v.indexOf('<mcespell>')) != -1) {
+							// Add text node for the content before the word
+							txt = v.substring(0, pos);
+							if (txt.length) {
+								node = doc.createTextNode(dom.decode(txt));
+								elem.appendChild(node);
+							}
+							v = v.substring(pos+10);
+							pos = v.indexOf('</mcespell>');
+							txt = v.substring(0, pos);
+							v = v.substring(pos+11);
+							// Add span element for the word
+							elem.appendChild(dom.create('span', {'class' : 'mceItemHiddenSpellWord'}, txt));
+						}
+						// Add text node for the rest of the content
+						if (v.length) {
+							node = doc.createTextNode(dom.decode(v));
+							elem.appendChild(node);
+						}
+					} else {
+						// Other browsers preserve whitespace characters on innerHTML usage
+						elem.innerHTML = v.replace(rx, '$1<span class="mceItemHiddenSpellWord">$2</span>');
+					}
+
+					// Finally, replace the node with the container
+					dom.replace(elem, n);
+				}
+			});
+
+			se.setRng(r);
+		},
+
+		_showMenu : function(ed, e) {
+			var t = this, ed = t.editor, m = t._menu, p1, dom = ed.dom, vp = dom.getViewPort(ed.getWin()), wordSpan = e.target;
+
+			e = 0; // Fixes IE memory leak
+
+			if (!m) {
+				m = ed.controlManager.createDropMenu('spellcheckermenu', {'class' : 'mceNoIcons'});
+				t._menu = m;
+			}
+
+			if (dom.hasClass(wordSpan, 'mceItemHiddenSpellWord')) {
+				m.removeAll();
+				m.add({title : 'spellchecker.wait', 'class' : 'mceMenuItemTitle'}).setDisabled(1);
+
+				t._sendRPC('getSuggestions', [t.selectedLang, dom.decode(wordSpan.innerHTML)], function(r) {
+					var ignoreRpc;
+
+					m.removeAll();
+
+					if (r.length > 0) {
+						m.add({title : 'spellchecker.sug', 'class' : 'mceMenuItemTitle'}).setDisabled(1);
+						each(r, function(v) {
+							m.add({title : v, onclick : function() {
+								dom.replace(ed.getDoc().createTextNode(v), wordSpan);
+								t._checkDone();
+							}});
+						});
+
+						m.addSeparator();
+					} else
+						m.add({title : 'spellchecker.no_sug', 'class' : 'mceMenuItemTitle'}).setDisabled(1);
+
+					if (ed.getParam('show_ignore_words', true)) {
+						ignoreRpc = t.editor.getParam("spellchecker_enable_ignore_rpc", '');
+						m.add({
+							title : 'spellchecker.ignore_word',
+							onclick : function() {
+								var word = wordSpan.innerHTML;
+
+								dom.remove(wordSpan, 1);
+								t._checkDone();
+
+								// tell the server if we need to
+								if (ignoreRpc) {
+									ed.setProgressState(1);
+									t._sendRPC('ignoreWord', [t.selectedLang, word], function(r) {
+										ed.setProgressState(0);
+									});
+								}
+							}
+						});
+
+						m.add({
+							title : 'spellchecker.ignore_words',
+							onclick : function() {
+								var word = wordSpan.innerHTML;
+
+								t._removeWords(dom.decode(word));
+								t._checkDone();
+
+								// tell the server if we need to
+								if (ignoreRpc) {
+									ed.setProgressState(1);
+									t._sendRPC('ignoreWords', [t.selectedLang, word], function(r) {
+										ed.setProgressState(0);
+									});
+								}
+							}
+						});
+					}
+
+					if (t.editor.getParam("spellchecker_enable_learn_rpc")) {
+						m.add({
+							title : 'spellchecker.learn_word',
+							onclick : function() {
+								var word = wordSpan.innerHTML;
+
+								dom.remove(wordSpan, 1);
+								t._checkDone();
+
+								ed.setProgressState(1);
+								t._sendRPC('learnWord', [t.selectedLang, word], function(r) {
+									ed.setProgressState(0);
+								});
+							}
+						});
+					}
+
+					m.update();
+				});
+
+				p1 = DOM.getPos(ed.getContentAreaContainer());
+				m.settings.offset_x = p1.x;
+				m.settings.offset_y = p1.y;
+
+				ed.selection.select(wordSpan);
+				p1 = dom.getPos(wordSpan);
+				m.showMenu(p1.x, p1.y + wordSpan.offsetHeight - vp.y);
+
+				return tinymce.dom.Event.cancel(e);
+			} else
+				m.hideMenu();
+		},
+
+		_checkDone : function() {
+			var t = this, ed = t.editor, dom = ed.dom, o;
+
+			each(dom.select('span'), function(n) {
+				if (n && dom.hasClass(n, 'mceItemHiddenSpellWord')) {
+					o = true;
+					return false;
+				}
+			});
+
+			if (!o)
+				t._done();
+		},
+
+		_done : function() {
+			var t = this, la = t.active;
+
+			if (t.active) {
+				t.active = 0;
+				t._removeWords();
+
+				if (t._menu)
+					t._menu.hideMenu();
+
+				if (la)
+					t.editor.nodeChanged();
+			}
+		},
+
+		_sendRPC : function(m, p, cb) {
+			var t = this;
+
+			JSONRequest.sendRPC({
+				url : t.rpcUrl,
+				method : m,
+				params : p,
+				success : cb,
+				error : function(e, x) {
+					t.editor.setProgressState(0);
+					t.editor.windowManager.alert(e.errstr || ('Error response: ' + x.responseText));
+				}
+			});
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('spellchecker', tinymce.plugins.SpellcheckerPlugin);
+})();
diff --git a/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin_src.js b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin_src.js
new file mode 100644
index 0000000..5a2d848
--- /dev/null
+++ b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin_src.js
@@ -0,0 +1,71 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.StylePlugin', {
+		init : function(ed, url) {
+			// Register commands
+			ed.addCommand('mceStyleProps', function() {
+
+				var applyStyleToBlocks = false;
+				var blocks = ed.selection.getSelectedBlocks();
+				var styles = [];
+
+				if (blocks.length === 1) {
+					styles.push(ed.selection.getNode().style.cssText);
+				}
+				else {
+					tinymce.each(blocks, function(block) {
+						styles.push(ed.dom.getAttrib(block, 'style'));
+					});
+					applyStyleToBlocks = true;
+				}
+
+				ed.windowManager.open({
+					file : url + '/props.htm',
+					width : 480 + parseInt(ed.getLang('style.delta_width', 0)),
+					height : 340 + parseInt(ed.getLang('style.delta_height', 0)),
+					inline : 1
+				}, {
+					applyStyleToBlocks : applyStyleToBlocks,
+					plugin_url : url,
+					styles : styles
+				});
+			});
+
+			ed.addCommand('mceSetElementStyle', function(ui, v) {
+				if (e = ed.selection.getNode()) {
+					ed.dom.setAttrib(e, 'style', v);
+					ed.execCommand('mceRepaint');
+				}
+			});
+
+			ed.onNodeChange.add(function(ed, cm, n) {
+				cm.setDisabled('styleprops', n.nodeName === 'BODY');
+			});
+
+			// Register buttons
+			ed.addButton('styleprops', {title : 'style.desc', cmd : 'mceStyleProps'});
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Style',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/style',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('style', tinymce.plugins.StylePlugin);
+})();
diff --git a/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/style/js/props.js b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/style/js/props.js
new file mode 100644
index 0000000..853222b
--- /dev/null
+++ b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/style/js/props.js
@@ -0,0 +1,709 @@
+tinyMCEPopup.requireLangPack();
+
+var defaultFonts = "" + 
+	"Arial, Helvetica, sans-serif=Arial, Helvetica, sans-serif;" + 
+	"Times New Roman, Times, serif=Times New Roman, Times, serif;" + 
+	"Courier New, Courier, mono=Courier New, Courier, mono;" + 
+	"Times New Roman, Times, serif=Times New Roman, Times, serif;" + 
+	"Georgia, Times New Roman, Times, serif=Georgia, Times New Roman, Times, serif;" + 
+	"Verdana, Arial, Helvetica, sans-serif=Verdana, Arial, Helvetica, sans-serif;" + 
+	"Geneva, Arial, Helvetica, sans-serif=Geneva, Arial, Helvetica, sans-serif";
+
+var defaultSizes = "9;10;12;14;16;18;24;xx-small;x-small;small;medium;large;x-large;xx-large;smaller;larger";
+var defaultMeasurement = "+pixels=px;points=pt;inches=in;centimetres=cm;millimetres=mm;picas=pc;ems=em;exs=ex;%";
+var defaultSpacingMeasurement = "pixels=px;points=pt;inches=in;centimetres=cm;millimetres=mm;picas=pc;+ems=em;exs=ex;%";
+var defaultIndentMeasurement = "pixels=px;+points=pt;inches=in;centimetres=cm;millimetres=mm;picas=pc;ems=em;exs=ex;%";
+var defaultWeight = "normal;bold;bolder;lighter;100;200;300;400;500;600;700;800;900";
+var defaultTextStyle = "normal;italic;oblique";
+var defaultVariant = "normal;small-caps";
+var defaultLineHeight = "normal";
+var defaultAttachment = "fixed;scroll";
+var defaultRepeat = "no-repeat;repeat;repeat-x;repeat-y";
+var defaultPosH = "left;center;right";
+var defaultPosV = "top;center;bottom";
+var defaultVAlign = "baseline;sub;super;top;text-top;middle;bottom;text-bottom";
+var defaultDisplay = "inline;block;list-item;run-in;compact;marker;table;inline-table;table-row-group;table-header-group;table-footer-group;table-row;table-column-group;table-column;table-cell;table-caption;none";
+var defaultBorderStyle = "none;solid;dashed;dotted;double;groove;ridge;inset;outset";
+var defaultBorderWidth = "thin;medium;thick";
+var defaultListType = "disc;circle;square;decimal;lower-roman;upper-roman;lower-alpha;upper-alpha;none";
+
+function aggregateStyles(allStyles) {
+	var mergedStyles = {};
+
+	tinymce.each(allStyles, function(style) {
+		if (style !== '') {
+			var parsedStyles = tinyMCEPopup.editor.dom.parseStyle(style);
+			for (var name in parsedStyles) {
+				if (parsedStyles.hasOwnProperty(name)) {
+					if (mergedStyles[name] === undefined) {
+						mergedStyles[name] = parsedStyles[name];
+					}
+					else if (name === 'text-decoration') {
+						if (mergedStyles[name].indexOf(parsedStyles[name]) === -1) {
+							mergedStyles[name] = mergedStyles[name] +' '+ parsedStyles[name];
+						}
+					}
+				}
+			}
+		}
+	});
+
+  return mergedStyles;
+}
+
+var applyActionIsInsert;
+var existingStyles;
+
+function init(ed) {
+	var ce = document.getElementById('container'), h;
+
+	existingStyles = aggregateStyles(tinyMCEPopup.getWindowArg('styles'));
+	ce.style.cssText = tinyMCEPopup.editor.dom.serializeStyle(existingStyles);
+
+	applyActionIsInsert = ed.getParam("edit_css_style_insert_span", false);
+	document.getElementById('toggle_insert_span').checked = applyActionIsInsert;
+
+	h = getBrowserHTML('background_image_browser','background_image','image','advimage');
+	document.getElementById("background_image_browser").innerHTML = h;
+
+	document.getElementById('text_color_pickcontainer').innerHTML = getColorPickerHTML('text_color_pick','text_color');
+	document.getElementById('background_color_pickcontainer').innerHTML = getColorPickerHTML('background_color_pick','background_color');
+	document.getElementById('border_color_top_pickcontainer').innerHTML = getColorPickerHTML('border_color_top_pick','border_color_top');
+	document.getElementById('border_color_right_pickcontainer').innerHTML = getColorPickerHTML('border_color_right_pick','border_color_right');
+	document.getElementById('border_color_bottom_pickcontainer').innerHTML = getColorPickerHTML('border_color_bottom_pick','border_color_bottom');
+	document.getElementById('border_color_left_pickcontainer').innerHTML = getColorPickerHTML('border_color_left_pick','border_color_left');
+
+	fillSelect(0, 'text_font', 'style_font', defaultFonts, ';', true);
+	fillSelect(0, 'text_size', 'style_font_size', defaultSizes, ';', true);
+	fillSelect(0, 'text_size_measurement', 'style_font_size_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'text_case', 'style_text_case', "capitalize;uppercase;lowercase", ';', true);
+	fillSelect(0, 'text_weight', 'style_font_weight', defaultWeight, ';', true);
+	fillSelect(0, 'text_style', 'style_font_style', defaultTextStyle, ';', true);
+	fillSelect(0, 'text_variant', 'style_font_variant', defaultVariant, ';', true);
+	fillSelect(0, 'text_lineheight', 'style_font_line_height', defaultLineHeight, ';', true);
+	fillSelect(0, 'text_lineheight_measurement', 'style_font_line_height_measurement', defaultMeasurement, ';', true);
+
+	fillSelect(0, 'background_attachment', 'style_background_attachment', defaultAttachment, ';', true);
+	fillSelect(0, 'background_repeat', 'style_background_repeat', defaultRepeat, ';', true);
+
+	fillSelect(0, 'background_hpos_measurement', 'style_background_hpos_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'background_vpos_measurement', 'style_background_vpos_measurement', defaultMeasurement, ';', true);
+
+	fillSelect(0, 'background_hpos', 'style_background_hpos', defaultPosH, ';', true);
+	fillSelect(0, 'background_vpos', 'style_background_vpos', defaultPosV, ';', true);
+
+	fillSelect(0, 'block_wordspacing', 'style_wordspacing', 'normal', ';', true);
+	fillSelect(0, 'block_wordspacing_measurement', 'style_wordspacing_measurement', defaultSpacingMeasurement, ';', true);
+	fillSelect(0, 'block_letterspacing', 'style_letterspacing', 'normal', ';', true);
+	fillSelect(0, 'block_letterspacing_measurement', 'style_letterspacing_measurement', defaultSpacingMeasurement, ';', true);
+	fillSelect(0, 'block_vertical_alignment', 'style_vertical_alignment', defaultVAlign, ';', true);
+	fillSelect(0, 'block_text_align', 'style_text_align', "left;right;center;justify", ';', true);
+	fillSelect(0, 'block_whitespace', 'style_whitespace', "normal;pre;nowrap", ';', true);
+	fillSelect(0, 'block_display', 'style_display', defaultDisplay, ';', true);
+	fillSelect(0, 'block_text_indent_measurement', 'style_text_indent_measurement', defaultIndentMeasurement, ';', true);
+
+	fillSelect(0, 'box_width_measurement', 'style_box_width_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'box_height_measurement', 'style_box_height_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'box_float', 'style_float', 'left;right;none', ';', true);
+	fillSelect(0, 'box_clear', 'style_clear', 'left;right;both;none', ';', true);
+	fillSelect(0, 'box_padding_left_measurement', 'style_padding_left_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'box_padding_top_measurement', 'style_padding_top_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'box_padding_bottom_measurement', 'style_padding_bottom_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'box_padding_right_measurement', 'style_padding_right_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'box_margin_left_measurement', 'style_margin_left_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'box_margin_top_measurement', 'style_margin_top_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'box_margin_bottom_measurement', 'style_margin_bottom_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'box_margin_right_measurement', 'style_margin_right_measurement', defaultMeasurement, ';', true);
+
+	fillSelect(0, 'border_style_top', 'style_border_style_top', defaultBorderStyle, ';', true);
+	fillSelect(0, 'border_style_right', 'style_border_style_right', defaultBorderStyle, ';', true);
+	fillSelect(0, 'border_style_bottom', 'style_border_style_bottom', defaultBorderStyle, ';', true);
+	fillSelect(0, 'border_style_left', 'style_border_style_left', defaultBorderStyle, ';', true);
+
+	fillSelect(0, 'border_width_top', 'style_border_width_top', defaultBorderWidth, ';', true);
+	fillSelect(0, 'border_width_right', 'style_border_width_right', defaultBorderWidth, ';', true);
+	fillSelect(0, 'border_width_bottom', 'style_border_width_bottom', defaultBorderWidth, ';', true);
+	fillSelect(0, 'border_width_left', 'style_border_width_left', defaultBorderWidth, ';', true);
+
+	fillSelect(0, 'border_width_top_measurement', 'style_border_width_top_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'border_width_right_measurement', 'style_border_width_right_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'border_width_bottom_measurement', 'style_border_width_bottom_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'border_width_left_measurement', 'style_border_width_left_measurement', defaultMeasurement, ';', true);
+
+	fillSelect(0, 'list_type', 'style_list_type', defaultListType, ';', true);
+	fillSelect(0, 'list_position', 'style_list_position', "inside;outside", ';', true);
+
+	fillSelect(0, 'positioning_type', 'style_positioning_type', "absolute;relative;static", ';', true);
+	fillSelect(0, 'positioning_visibility', 'style_positioning_visibility', "inherit;visible;hidden", ';', true);
+
+	fillSelect(0, 'positioning_width_measurement', 'style_positioning_width_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'positioning_height_measurement', 'style_positioning_height_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'positioning_overflow', 'style_positioning_overflow', "visible;hidden;scroll;auto", ';', true);
+
+	fillSelect(0, 'positioning_placement_top_measurement', 'style_positioning_placement_top_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'positioning_placement_right_measurement', 'style_positioning_placement_right_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'positioning_placement_bottom_measurement', 'style_positioning_placement_bottom_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'positioning_placement_left_measurement', 'style_positioning_placement_left_measurement', defaultMeasurement, ';', true);
+
+	fillSelect(0, 'positioning_clip_top_measurement', 'style_positioning_clip_top_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'positioning_clip_right_measurement', 'style_positioning_clip_right_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'positioning_clip_bottom_measurement', 'style_positioning_clip_bottom_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'positioning_clip_left_measurement', 'style_positioning_clip_left_measurement', defaultMeasurement, ';', true);
+
+	TinyMCE_EditableSelects.init();
+	setupFormData();
+	showDisabledControls();
+}
+
+function setupFormData() {
+	var ce = document.getElementById('container'), f = document.forms[0], s, b, i;
+
+	// Setup text fields
+
+	selectByValue(f, 'text_font', ce.style.fontFamily, true, true);
+	selectByValue(f, 'text_size', getNum(ce.style.fontSize), true, true);
+	selectByValue(f, 'text_size_measurement', getMeasurement(ce.style.fontSize));
+	selectByValue(f, 'text_weight', ce.style.fontWeight, true, true);
+	selectByValue(f, 'text_style', ce.style.fontStyle, true, true);
+	selectByValue(f, 'text_lineheight', getNum(ce.style.lineHeight), true, true);
+	selectByValue(f, 'text_lineheight_measurement', getMeasurement(ce.style.lineHeight));
+	selectByValue(f, 'text_case', ce.style.textTransform, true, true);
+	selectByValue(f, 'text_variant', ce.style.fontVariant, true, true);
+	f.text_color.value = tinyMCEPopup.editor.dom.toHex(ce.style.color);
+	updateColor('text_color_pick', 'text_color');
+	f.text_underline.checked = inStr(ce.style.textDecoration, 'underline');
+	f.text_overline.checked = inStr(ce.style.textDecoration, 'overline');
+	f.text_linethrough.checked = inStr(ce.style.textDecoration, 'line-through');
+	f.text_blink.checked = inStr(ce.style.textDecoration, 'blink');
+	f.text_none.checked = inStr(ce.style.textDecoration, 'none');
+	updateTextDecorations();
+
+	// Setup background fields
+
+	f.background_color.value = tinyMCEPopup.editor.dom.toHex(ce.style.backgroundColor);
+	updateColor('background_color_pick', 'background_color');
+	f.background_image.value = ce.style.backgroundImage.replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");
+	selectByValue(f, 'background_repeat', ce.style.backgroundRepeat, true, true);
+	selectByValue(f, 'background_attachment', ce.style.backgroundAttachment, true, true);
+	selectByValue(f, 'background_hpos', getNum(getVal(ce.style.backgroundPosition, 0)), true, true);
+	selectByValue(f, 'background_hpos_measurement', getMeasurement(getVal(ce.style.backgroundPosition, 0)));
+	selectByValue(f, 'background_vpos', getNum(getVal(ce.style.backgroundPosition, 1)), true, true);
+	selectByValue(f, 'background_vpos_measurement', getMeasurement(getVal(ce.style.backgroundPosition, 1)));
+
+	// Setup block fields
+
+	selectByValue(f, 'block_wordspacing', getNum(ce.style.wordSpacing), true, true);
+	selectByValue(f, 'block_wordspacing_measurement', getMeasurement(ce.style.wordSpacing));
+	selectByValue(f, 'block_letterspacing', getNum(ce.style.letterSpacing), true, true);
+	selectByValue(f, 'block_letterspacing_measurement', getMeasurement(ce.style.letterSpacing));
+	selectByValue(f, 'block_vertical_alignment', ce.style.verticalAlign, true, true);
+	selectByValue(f, 'block_text_align', ce.style.textAlign, true, true);
+	f.block_text_indent.value = getNum(ce.style.textIndent);
+	selectByValue(f, 'block_text_indent_measurement', getMeasurement(ce.style.textIndent));
+	selectByValue(f, 'block_whitespace', ce.style.whiteSpace, true, true);
+	selectByValue(f, 'block_display', ce.style.display, true, true);
+
+	// Setup box fields
+
+	f.box_width.value = getNum(ce.style.width);
+	selectByValue(f, 'box_width_measurement', getMeasurement(ce.style.width));
+
+	f.box_height.value = getNum(ce.style.height);
+	selectByValue(f, 'box_height_measurement', getMeasurement(ce.style.height));
+	selectByValue(f, 'box_float', ce.style.cssFloat || ce.style.styleFloat, true, true);
+
+	selectByValue(f, 'box_clear', ce.style.clear, true, true);
+
+	setupBox(f, ce, 'box_padding', 'padding', '');
+	setupBox(f, ce, 'box_margin', 'margin', '');
+
+	// Setup border fields
+
+	setupBox(f, ce, 'border_style', 'border', 'Style');
+	setupBox(f, ce, 'border_width', 'border', 'Width');
+	setupBox(f, ce, 'border_color', 'border', 'Color');
+
+	updateColor('border_color_top_pick', 'border_color_top');
+	updateColor('border_color_right_pick', 'border_color_right');
+	updateColor('border_color_bottom_pick', 'border_color_bottom');
+	updateColor('border_color_left_pick', 'border_color_left');
+
+	f.elements.border_color_top.value = tinyMCEPopup.editor.dom.toHex(f.elements.border_color_top.value);
+	f.elements.border_color_right.value = tinyMCEPopup.editor.dom.toHex(f.elements.border_color_right.value);
+	f.elements.border_color_bottom.value = tinyMCEPopup.editor.dom.toHex(f.elements.border_color_bottom.value);
+	f.elements.border_color_left.value = tinyMCEPopup.editor.dom.toHex(f.elements.border_color_left.value);
+
+	// Setup list fields
+
+	selectByValue(f, 'list_type', ce.style.listStyleType, true, true);
+	selectByValue(f, 'list_position', ce.style.listStylePosition, true, true);
+	f.list_bullet_image.value = ce.style.listStyleImage.replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");
+
+	// Setup box fields
+
+	selectByValue(f, 'positioning_type', ce.style.position, true, true);
+	selectByValue(f, 'positioning_visibility', ce.style.visibility, true, true);
+	selectByValue(f, 'positioning_overflow', ce.style.overflow, true, true);
+	f.positioning_zindex.value = ce.style.zIndex ? ce.style.zIndex : "";
+
+	f.positioning_width.value = getNum(ce.style.width);
+	selectByValue(f, 'positioning_width_measurement', getMeasurement(ce.style.width));
+
+	f.positioning_height.value = getNum(ce.style.height);
+	selectByValue(f, 'positioning_height_measurement', getMeasurement(ce.style.height));
+
+	setupBox(f, ce, 'positioning_placement', '', '', ['top', 'right', 'bottom', 'left']);
+
+	s = ce.style.clip.replace(new RegExp("rect\\('?([^']*)'?\\)", 'gi'), "$1");
+	s = s.replace(/,/g, ' ');
+
+	if (!hasEqualValues([getVal(s, 0), getVal(s, 1), getVal(s, 2), getVal(s, 3)])) {
+		f.positioning_clip_top.value = getNum(getVal(s, 0));
+		selectByValue(f, 'positioning_clip_top_measurement', getMeasurement(getVal(s, 0)));
+		f.positioning_clip_right.value = getNum(getVal(s, 1));
+		selectByValue(f, 'positioning_clip_right_measurement', getMeasurement(getVal(s, 1)));
+		f.positioning_clip_bottom.value = getNum(getVal(s, 2));
+		selectByValue(f, 'positioning_clip_bottom_measurement', getMeasurement(getVal(s, 2)));
+		f.positioning_clip_left.value = getNum(getVal(s, 3));
+		selectByValue(f, 'positioning_clip_left_measurement', getMeasurement(getVal(s, 3)));
+	} else {
+		f.positioning_clip_top.value = getNum(getVal(s, 0));
+		selectByValue(f, 'positioning_clip_top_measurement', getMeasurement(getVal(s, 0)));
+		f.positioning_clip_right.value = f.positioning_clip_bottom.value = f.positioning_clip_left.value;
+	}
+
+//	setupBox(f, ce, '', 'border', 'Color');
+}
+
+function getMeasurement(s) {
+	return s.replace(/^([0-9.]+)(.*)$/, "$2");
+}
+
+function getNum(s) {
+	if (new RegExp('^(?:[0-9.]+)(?:[a-z%]+)$', 'gi').test(s))
+		return s.replace(/[^0-9.]/g, '');
+
+	return s;
+}
+
+function inStr(s, n) {
+	return new RegExp(n, 'gi').test(s);
+}
+
+function getVal(s, i) {
+	var a = s.split(' ');
+
+	if (a.length > 1)
+		return a[i];
+
+	return "";
+}
+
+function setValue(f, n, v) {
+	if (f.elements[n].type == "text")
+		f.elements[n].value = v;
+	else
+		selectByValue(f, n, v, true, true);
+}
+
+function setupBox(f, ce, fp, pr, sf, b) {
+	if (typeof(b) == "undefined")
+		b = ['Top', 'Right', 'Bottom', 'Left'];
+
+	if (isSame(ce, pr, sf, b)) {
+		f.elements[fp + "_same"].checked = true;
+
+		setValue(f, fp + "_top", getNum(ce.style[pr + b[0] + sf]));
+		f.elements[fp + "_top"].disabled = false;
+
+		f.elements[fp + "_right"].value = "";
+		f.elements[fp + "_right"].disabled = true;
+		f.elements[fp + "_bottom"].value = "";
+		f.elements[fp + "_bottom"].disabled = true;
+		f.elements[fp + "_left"].value = "";
+		f.elements[fp + "_left"].disabled = true;
+
+		if (f.elements[fp + "_top_measurement"]) {
+			selectByValue(f, fp + '_top_measurement', getMeasurement(ce.style[pr + b[0] + sf]));
+			f.elements[fp + "_left_measurement"].disabled = true;
+			f.elements[fp + "_bottom_measurement"].disabled = true;
+			f.elements[fp + "_right_measurement"].disabled = true;
+		}
+	} else {
+		f.elements[fp + "_same"].checked = false;
+
+		setValue(f, fp + "_top", getNum(ce.style[pr + b[0] + sf]));
+		f.elements[fp + "_top"].disabled = false;
+
+		setValue(f, fp + "_right", getNum(ce.style[pr + b[1] + sf]));
+		f.elements[fp + "_right"].disabled = false;
+
+		setValue(f, fp + "_bottom", getNum(ce.style[pr + b[2] + sf]));
+		f.elements[fp + "_bottom"].disabled = false;
+
+		setValue(f, fp + "_left", getNum(ce.style[pr + b[3] + sf]));
+		f.elements[fp + "_left"].disabled = false;
+
+		if (f.elements[fp + "_top_measurement"]) {
+			selectByValue(f, fp + '_top_measurement', getMeasurement(ce.style[pr + b[0] + sf]));
+			selectByValue(f, fp + '_right_measurement', getMeasurement(ce.style[pr + b[1] + sf]));
+			selectByValue(f, fp + '_bottom_measurement', getMeasurement(ce.style[pr + b[2] + sf]));
+			selectByValue(f, fp + '_left_measurement', getMeasurement(ce.style[pr + b[3] + sf]));
+			f.elements[fp + "_left_measurement"].disabled = false;
+			f.elements[fp + "_bottom_measurement"].disabled = false;
+			f.elements[fp + "_right_measurement"].disabled = false;
+		}
+	}
+}
+
+function isSame(e, pr, sf, b) {
+	var a = [], i, x;
+
+	if (typeof(b) == "undefined")
+		b = ['Top', 'Right', 'Bottom', 'Left'];
+
+	if (typeof(sf) == "undefined" || sf == null)
+		sf = "";
+
+	a[0] = e.style[pr + b[0] + sf];
+	a[1] = e.style[pr + b[1] + sf];
+	a[2] = e.style[pr + b[2] + sf];
+	a[3] = e.style[pr + b[3] + sf];
+
+	for (i=0; i<a.length; i++) {
+		if (a[i] == null)
+			return false;
+
+		for (x=0; x<a.length; x++) {
+			if (a[x] != a[i])
+				return false;
+		}
+	}
+
+	return true;
+};
+
+function hasEqualValues(a) {
+	var i, x;
+
+	for (i=0; i<a.length; i++) {
+		if (a[i] == null)
+			return false;
+
+		for (x=0; x<a.length; x++) {
+			if (a[x] != a[i])
+				return false;
+		}
+	}
+
+	return true;
+}
+
+function toggleApplyAction() {
+	applyActionIsInsert = ! applyActionIsInsert;
+}
+
+function applyAction() {
+	var ce = document.getElementById('container'), ed = tinyMCEPopup.editor;
+
+	generateCSS();
+
+	tinyMCEPopup.restoreSelection();
+
+	var newStyles = tinyMCEPopup.editor.dom.parseStyle(ce.style.cssText);
+
+	if (applyActionIsInsert) {
+		ed.formatter.register('plugin_style', {
+			inline: 'span', styles: existingStyles
+		});
+		ed.formatter.remove('plugin_style');
+
+		ed.formatter.register('plugin_style', {
+			inline: 'span', styles: newStyles
+		});
+		ed.formatter.apply('plugin_style');
+	} else {
+		var nodes;
+
+		if (tinyMCEPopup.getWindowArg('applyStyleToBlocks')) {
+			nodes = ed.selection.getSelectedBlocks();
+		}
+		else {
+			nodes = ed.selection.getNode();
+		}
+
+		ed.dom.setAttrib(nodes, 'style', tinyMCEPopup.editor.dom.serializeStyle(newStyles));
+	}
+}
+
+function updateAction() {
+	applyAction();
+	tinyMCEPopup.close();
+}
+
+function generateCSS() {
+	var ce = document.getElementById('container'), f = document.forms[0], num = new RegExp('[0-9]+', 'g'), s, t;
+
+	ce.style.cssText = "";
+
+	// Build text styles
+	ce.style.fontFamily = f.text_font.value;
+	ce.style.fontSize = f.text_size.value + (isNum(f.text_size.value) ? (f.text_size_measurement.value || 'px') : "");
+	ce.style.fontStyle = f.text_style.value;
+	ce.style.lineHeight = f.text_lineheight.value + (isNum(f.text_lineheight.value) ? f.text_lineheight_measurement.value : "");
+	ce.style.textTransform = f.text_case.value;
+	ce.style.fontWeight = f.text_weight.value;
+	ce.style.fontVariant = f.text_variant.value;
+	ce.style.color = f.text_color.value;
+
+	s = "";
+	s += f.text_underline.checked ? " underline" : "";
+	s += f.text_overline.checked ? " overline" : "";
+	s += f.text_linethrough.checked ? " line-through" : "";
+	s += f.text_blink.checked ? " blink" : "";
+	s = s.length > 0 ? s.substring(1) : s;
+
+	if (f.text_none.checked)
+		s = "none";
+
+	ce.style.textDecoration = s;
+
+	// Build background styles
+
+	ce.style.backgroundColor = f.background_color.value;
+	ce.style.backgroundImage = f.background_image.value != "" ? "url(" + f.background_image.value + ")" : "";
+	ce.style.backgroundRepeat = f.background_repeat.value;
+	ce.style.backgroundAttachment = f.background_attachment.value;
+
+	if (f.background_hpos.value != "") {
+		s = "";
+		s += f.background_hpos.value + (isNum(f.background_hpos.value) ? f.background_hpos_measurement.value : "") + " ";
+		s += f.background_vpos.value + (isNum(f.background_vpos.value) ? f.background_vpos_measurement.value : "");
+		ce.style.backgroundPosition = s;
+	}
+
+	// Build block styles
+
+	ce.style.wordSpacing = f.block_wordspacing.value + (isNum(f.block_wordspacing.value) ? f.block_wordspacing_measurement.value : "");
+	ce.style.letterSpacing = f.block_letterspacing.value + (isNum(f.block_letterspacing.value) ? f.block_letterspacing_measurement.value : "");
+	ce.style.verticalAlign = f.block_vertical_alignment.value;
+	ce.style.textAlign = f.block_text_align.value;
+	ce.style.textIndent = f.block_text_indent.value + (isNum(f.block_text_indent.value) ? f.block_text_indent_measurement.value : "");
+	ce.style.whiteSpace = f.block_whitespace.value;
+	ce.style.display = f.block_display.value;
+
+	// Build box styles
+
+	ce.style.width = f.box_width.value + (isNum(f.box_width.value) ? f.box_width_measurement.value : "");
+	ce.style.height = f.box_height.value + (isNum(f.box_height.value) ? f.box_height_measurement.value : "");
+	ce.style.styleFloat = f.box_float.value;
+	ce.style.cssFloat = f.box_float.value;
+
+	ce.style.clear = f.box_clear.value;
+
+	if (!f.box_padding_same.checked) {
+		ce.style.paddingTop = f.box_padding_top.value + (isNum(f.box_padding_top.value) ? f.box_padding_top_measurement.value : "");
+		ce.style.paddingRight = f.box_padding_right.value + (isNum(f.box_padding_right.value) ? f.box_padding_right_measurement.value : "");
+		ce.style.paddingBottom = f.box_padding_bottom.value + (isNum(f.box_padding_bottom.value) ? f.box_padding_bottom_measurement.value : "");
+		ce.style.paddingLeft = f.box_padding_left.value + (isNum(f.box_padding_left.value) ? f.box_padding_left_measurement.value : "");
+	} else
+		ce.style.padding = f.box_padding_top.value + (isNum(f.box_padding_top.value) ? f.box_padding_top_measurement.value : "");		
+
+	if (!f.box_margin_same.checked) {
+		ce.style.marginTop = f.box_margin_top.value + (isNum(f.box_margin_top.value) ? f.box_margin_top_measurement.value : "");
+		ce.style.marginRight = f.box_margin_right.value + (isNum(f.box_margin_right.value) ? f.box_margin_right_measurement.value : "");
+		ce.style.marginBottom = f.box_margin_bottom.value + (isNum(f.box_margin_bottom.value) ? f.box_margin_bottom_measurement.value : "");
+		ce.style.marginLeft = f.box_margin_left.value + (isNum(f.box_margin_left.value) ? f.box_margin_left_measurement.value : "");
+	} else
+		ce.style.margin = f.box_margin_top.value + (isNum(f.box_margin_top.value) ? f.box_margin_top_measurement.value : "");		
+
+	// Build border styles
+
+	if (!f.border_style_same.checked) {
+		ce.style.borderTopStyle = f.border_style_top.value;
+		ce.style.borderRightStyle = f.border_style_right.value;
+		ce.style.borderBottomStyle = f.border_style_bottom.value;
+		ce.style.borderLeftStyle = f.border_style_left.value;
+	} else
+		ce.style.borderStyle = f.border_style_top.value;
+
+	if (!f.border_width_same.checked) {
+		ce.style.borderTopWidth = f.border_width_top.value + (isNum(f.border_width_top.value) ? f.border_width_top_measurement.value : "");
+		ce.style.borderRightWidth = f.border_width_right.value + (isNum(f.border_width_right.value) ? f.border_width_right_measurement.value : "");
+		ce.style.borderBottomWidth = f.border_width_bottom.value + (isNum(f.border_width_bottom.value) ? f.border_width_bottom_measurement.value : "");
+		ce.style.borderLeftWidth = f.border_width_left.value + (isNum(f.border_width_left.value) ? f.border_width_left_measurement.value : "");
+	} else
+		ce.style.borderWidth = f.border_width_top.value + (isNum(f.border_width_top.value) ? f.border_width_top_measurement.value : "");
+
+	if (!f.border_color_same.checked) {
+		ce.style.borderTopColor = f.border_color_top.value;
+		ce.style.borderRightColor = f.border_color_right.value;
+		ce.style.borderBottomColor = f.border_color_bottom.value;
+		ce.style.borderLeftColor = f.border_color_left.value;
+	} else
+		ce.style.borderColor = f.border_color_top.value;
+
+	// Build list styles
+
+	ce.style.listStyleType = f.list_type.value;
+	ce.style.listStylePosition = f.list_position.value;
+	ce.style.listStyleImage = f.list_bullet_image.value != "" ? "url(" + f.list_bullet_image.value + ")" : "";
+
+	// Build positioning styles
+
+	ce.style.position = f.positioning_type.value;
+	ce.style.visibility = f.positioning_visibility.value;
+
+	if (ce.style.width == "")
+		ce.style.width = f.positioning_width.value + (isNum(f.positioning_width.value) ? f.positioning_width_measurement.value : "");
+
+	if (ce.style.height == "")
+		ce.style.height = f.positioning_height.value + (isNum(f.positioning_height.value) ? f.positioning_height_measurement.value : "");
+
+	ce.style.zIndex = f.positioning_zindex.value;
+	ce.style.overflow = f.positioning_overflow.value;
+
+	if (!f.positioning_placement_same.checked) {
+		ce.style.top = f.positioning_placement_top.value + (isNum(f.positioning_placement_top.value) ? f.positioning_placement_top_measurement.value : "");
+		ce.style.right = f.positioning_placement_right.value + (isNum(f.positioning_placement_right.value) ? f.positioning_placement_right_measurement.value : "");
+		ce.style.bottom = f.positioning_placement_bottom.value + (isNum(f.positioning_placement_bottom.value) ? f.positioning_placement_bottom_measurement.value : "");
+		ce.style.left = f.positioning_placement_left.value + (isNum(f.positioning_placement_left.value) ? f.positioning_placement_left_measurement.value : "");
+	} else {
+		s = f.positioning_placement_top.value + (isNum(f.positioning_placement_top.value) ? f.positioning_placement_top_measurement.value : "");
+		ce.style.top = s;
+		ce.style.right = s;
+		ce.style.bottom = s;
+		ce.style.left = s;
+	}
+
+	if (!f.positioning_clip_same.checked) {
+		s = "rect(";
+		s += (isNum(f.positioning_clip_top.value) ? f.positioning_clip_top.value + f.positioning_clip_top_measurement.value : "auto") + " ";
+		s += (isNum(f.positioning_clip_right.value) ? f.positioning_clip_right.value + f.positioning_clip_right_measurement.value : "auto") + " ";
+		s += (isNum(f.positioning_clip_bottom.value) ? f.positioning_clip_bottom.value + f.positioning_clip_bottom_measurement.value : "auto") + " ";
+		s += (isNum(f.positioning_clip_left.value) ? f.positioning_clip_left.value + f.positioning_clip_left_measurement.value : "auto");
+		s += ")";
+
+		if (s != "rect(auto auto auto auto)")
+			ce.style.clip = s;
+	} else {
+		s = "rect(";
+		t = isNum(f.positioning_clip_top.value) ? f.positioning_clip_top.value + f.positioning_clip_top_measurement.value : "auto";
+		s += t + " ";
+		s += t + " ";
+		s += t + " ";
+		s += t + ")";
+
+		if (s != "rect(auto auto auto auto)")
+			ce.style.clip = s;
+	}
+
+	ce.style.cssText = ce.style.cssText;
+}
+
+function isNum(s) {
+	return new RegExp('[0-9]+', 'g').test(s);
+}
+
+function showDisabledControls() {
+	var f = document.forms, i, a;
+
+	for (i=0; i<f.length; i++) {
+		for (a=0; a<f[i].elements.length; a++) {
+			if (f[i].elements[a].disabled)
+				tinyMCEPopup.editor.dom.addClass(f[i].elements[a], "disabled");
+			else
+				tinyMCEPopup.editor.dom.removeClass(f[i].elements[a], "disabled");
+		}
+	}
+}
+
+function fillSelect(f, s, param, dval, sep, em) {
+	var i, ar, p, se;
+
+	f = document.forms[f];
+	sep = typeof(sep) == "undefined" ? ";" : sep;
+
+	if (em)
+		addSelectValue(f, s, "", "");
+
+	ar = tinyMCEPopup.getParam(param, dval).split(sep);
+	for (i=0; i<ar.length; i++) {
+		se = false;
+
+		if (ar[i].charAt(0) == '+') {
+			ar[i] = ar[i].substring(1);
+			se = true;
+		}
+
+		p = ar[i].split('=');
+
+		if (p.length > 1) {
+			addSelectValue(f, s, p[0], p[1]);
+
+			if (se)
+				selectByValue(f, s, p[1]);
+		} else {
+			addSelectValue(f, s, p[0], p[0]);
+
+			if (se)
+				selectByValue(f, s, p[0]);
+		}
+	}
+}
+
+function toggleSame(ce, pre) {
+	var el = document.forms[0].elements, i;
+
+	if (ce.checked) {
+		el[pre + "_top"].disabled = false;
+		el[pre + "_right"].disabled = true;
+		el[pre + "_bottom"].disabled = true;
+		el[pre + "_left"].disabled = true;
+
+		if (el[pre + "_top_measurement"]) {
+			el[pre + "_top_measurement"].disabled = false;
+			el[pre + "_right_measurement"].disabled = true;
+			el[pre + "_bottom_measurement"].disabled = true;
+			el[pre + "_left_measurement"].disabled = true;
+		}
+	} else {
+		el[pre + "_top"].disabled = false;
+		el[pre + "_right"].disabled = false;
+		el[pre + "_bottom"].disabled = false;
+		el[pre + "_left"].disabled = false;
+
+		if (el[pre + "_top_measurement"]) {
+			el[pre + "_top_measurement"].disabled = false;
+			el[pre + "_right_measurement"].disabled = false;
+			el[pre + "_bottom_measurement"].disabled = false;
+			el[pre + "_left_measurement"].disabled = false;
+		}
+	}
+
+	showDisabledControls();
+}
+
+function synch(fr, to) {
+	var f = document.forms[0];
+
+	f.elements[to].value = f.elements[fr].value;
+
+	if (f.elements[fr + "_measurement"])
+		selectByValue(f, to + "_measurement", f.elements[fr + "_measurement"].value);
+}
+
+function updateTextDecorations(){
+	var el = document.forms[0].elements;
+
+	var textDecorations = ["text_underline", "text_overline", "text_linethrough", "text_blink"];
+	var noneChecked = el["text_none"].checked;
+	tinymce.each(textDecorations, function(id) {
+		el[id].disabled = noneChecked;
+		if (noneChecked) {
+			el[id].checked = false;
+		}
+	});
+}
+
+tinyMCEPopup.onInit.add(init);
diff --git a/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin_src.js b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin_src.js
new file mode 100644
index 0000000..94f4532
--- /dev/null
+++ b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin_src.js
@@ -0,0 +1,122 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each, explode = tinymce.explode;
+
+	tinymce.create('tinymce.plugins.TabFocusPlugin', {
+		init : function(ed, url) {
+			function tabCancel(ed, e) {
+				if (e.keyCode === 9)
+					return Event.cancel(e);
+			}
+
+			function tabHandler(ed, e) {
+				var x, i, f, el, v;
+
+				function find(d) {
+					el = DOM.select(':input:enabled,*[tabindex]:not(iframe)');
+
+					function canSelectRecursive(e) {
+						return e.nodeName==="BODY" || (e.type != 'hidden' &&
+							!(e.style.display == "none") &&
+							!(e.style.visibility == "hidden") && canSelectRecursive(e.parentNode));
+					}
+					function canSelectInOldIe(el) {
+						return el.attributes["tabIndex"].specified || el.nodeName == "INPUT" || el.nodeName == "TEXTAREA";
+					}
+					function isOldIe() {
+						return tinymce.isIE6 || tinymce.isIE7;
+					}
+					function canSelect(el) {
+						return ((!isOldIe() || canSelectInOldIe(el))) && el.getAttribute("tabindex") != '-1' && canSelectRecursive(el);
+					}
+
+					each(el, function(e, i) {
+						if (e.id == ed.id) {
+							x = i;
+							return false;
+						}
+					});
+					if (d > 0) {
+						for (i = x + 1; i < el.length; i++) {
+							if (canSelect(el[i]))
+								return el[i];
+						}
+					} else {
+						for (i = x - 1; i >= 0; i--) {
+							if (canSelect(el[i]))
+								return el[i];
+						}
+					}
+
+					return null;
+				}
+
+				if (e.keyCode === 9) {
+					v = explode(ed.getParam('tab_focus', ed.getParam('tabfocus_elements', ':prev,:next')));
+
+					if (v.length == 1) {
+						v[1] = v[0];
+						v[0] = ':prev';
+					}
+
+					// Find element to focus
+					if (e.shiftKey) {
+						if (v[0] == ':prev')
+							el = find(-1);
+						else
+							el = DOM.get(v[0]);
+					} else {
+						if (v[1] == ':next')
+							el = find(1);
+						else
+							el = DOM.get(v[1]);
+					}
+
+					if (el) {
+						if (el.id && (ed = tinymce.get(el.id || el.name)))
+							ed.focus();
+						else
+							window.setTimeout(function() {
+								if (!tinymce.isWebKit)
+									window.focus();
+								el.focus();
+							}, 10);
+
+						return Event.cancel(e);
+					}
+				}
+			}
+
+			ed.onKeyUp.add(tabCancel);
+
+			if (tinymce.isGecko) {
+				ed.onKeyPress.add(tabHandler);
+				ed.onKeyDown.add(tabCancel);
+			} else
+				ed.onKeyDown.add(tabHandler);
+
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Tabfocus',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/tabfocus',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('tabfocus', tinymce.plugins.TabFocusPlugin);
+})();
diff --git a/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin_src.js b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin_src.js
new file mode 100644
index 0000000..0456483
--- /dev/null
+++ b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin_src.js
@@ -0,0 +1,1456 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function(tinymce) {
+	var each = tinymce.each;
+
+	// Checks if the selection/caret is at the start of the specified block element
+	function isAtStart(rng, par) {
+		var doc = par.ownerDocument, rng2 = doc.createRange(), elm;
+
+		rng2.setStartBefore(par);
+		rng2.setEnd(rng.endContainer, rng.endOffset);
+
+		elm = doc.createElement('body');
+		elm.appendChild(rng2.cloneContents());
+
+		// Check for text characters of other elements that should be treated as content
+		return elm.innerHTML.replace(/<(br|img|object|embed|input|textarea)[^>]*>/gi, '-').replace(/<[^>]+>/g, '').length == 0;
+	};
+
+	function getSpanVal(td, name) {
+		return parseInt(td.getAttribute(name) || 1);
+	}
+
+	/**
+	 * Table Grid class.
+	 */
+	function TableGrid(table, dom, selection) {
+		var grid, startPos, endPos, selectedCell;
+
+		buildGrid();
+		selectedCell = dom.getParent(selection.getStart(), 'th,td');
+		if (selectedCell) {
+			startPos = getPos(selectedCell);
+			endPos = findEndPos();
+			selectedCell = getCell(startPos.x, startPos.y);
+		}
+
+		function cloneNode(node, children) {
+			node = node.cloneNode(children);
+			node.removeAttribute('id');
+
+			return node;
+		}
+
+		function buildGrid() {
+			var startY = 0;
+
+			grid = [];
+
+			each(['thead', 'tbody', 'tfoot'], function(part) {
+				var rows = dom.select('> ' + part + ' tr', table);
+
+				each(rows, function(tr, y) {
+					y += startY;
+
+					each(dom.select('> td, > th', tr), function(td, x) {
+						var x2, y2, rowspan, colspan;
+
+						// Skip over existing cells produced by rowspan
+						if (grid[y]) {
+							while (grid[y][x])
+								x++;
+						}
+
+						// Get col/rowspan from cell
+						rowspan = getSpanVal(td, 'rowspan');
+						colspan = getSpanVal(td, 'colspan');
+
+						// Fill out rowspan/colspan right and down
+						for (y2 = y; y2 < y + rowspan; y2++) {
+							if (!grid[y2])
+								grid[y2] = [];
+
+							for (x2 = x; x2 < x + colspan; x2++) {
+								grid[y2][x2] = {
+									part : part,
+									real : y2 == y && x2 == x,
+									elm : td,
+									rowspan : rowspan,
+									colspan : colspan
+								};
+							}
+						}
+					});
+				});
+
+				startY += rows.length;
+			});
+		};
+
+		function getCell(x, y) {
+			var row;
+
+			row = grid[y];
+			if (row)
+				return row[x];
+		};
+
+		function setSpanVal(td, name, val) {
+			if (td) {
+				val = parseInt(val);
+
+				if (val === 1)
+					td.removeAttribute(name, 1);
+				else
+					td.setAttribute(name, val, 1);
+			}
+		}
+
+		function isCellSelected(cell) {
+			return cell && (dom.hasClass(cell.elm, 'mceSelected') || cell == selectedCell);
+		};
+
+		function getSelectedRows() {
+			var rows = [];
+
+			each(table.rows, function(row) {
+				each(row.cells, function(cell) {
+					if (dom.hasClass(cell, 'mceSelected') || cell == selectedCell.elm) {
+						rows.push(row);
+						return false;
+					}
+				});
+			});
+
+			return rows;
+		};
+
+		function deleteTable() {
+			var rng = dom.createRng();
+
+			rng.setStartAfter(table);
+			rng.setEndAfter(table);
+
+			selection.setRng(rng);
+
+			dom.remove(table);
+		};
+
+		function cloneCell(cell) {
+			var formatNode;
+
+			// Clone formats
+			tinymce.walk(cell, function(node) {
+				var curNode;
+
+				if (node.nodeType == 3) {
+					each(dom.getParents(node.parentNode, null, cell).reverse(), function(node) {
+						node = cloneNode(node, false);
+
+						if (!formatNode)
+							formatNode = curNode = node;
+						else if (curNode)
+							curNode.appendChild(node);
+
+						curNode = node;
+					});
+
+					// Add something to the inner node
+					if (curNode)
+						curNode.innerHTML = tinymce.isIE && !tinymce.isIE11 ? '&nbsp;' : '<br data-mce-bogus="1" />';
+
+					return false;
+				}
+			}, 'childNodes');
+
+			cell = cloneNode(cell, false);
+			setSpanVal(cell, 'rowSpan', 1);
+			setSpanVal(cell, 'colSpan', 1);
+
+			if (formatNode) {
+				cell.appendChild(formatNode);
+			} else {
+				if (!tinymce.isIE || tinymce.isIE11)
+					cell.innerHTML = '<br data-mce-bogus="1" />';
+			}
+
+			return cell;
+		};
+
+		function cleanup() {
+			var rng = dom.createRng();
+
+			// Empty rows
+			each(dom.select('tr', table), function(tr) {
+				if (tr.cells.length == 0)
+					dom.remove(tr);
+			});
+
+			// Empty table
+			if (dom.select('tr', table).length == 0) {
+				rng.setStartAfter(table);
+				rng.setEndAfter(table);
+				selection.setRng(rng);
+				dom.remove(table);
+				return;
+			}
+
+			// Empty header/body/footer
+			each(dom.select('thead,tbody,tfoot', table), function(part) {
+				if (part.rows.length == 0)
+					dom.remove(part);
+			});
+
+			// Restore selection to start position if it still exists
+			buildGrid();
+
+			// Restore the selection to the closest table position
+			row = grid[Math.min(grid.length - 1, startPos.y)];
+			if (row) {
+				selection.select(row[Math.min(row.length - 1, startPos.x)].elm, true);
+				selection.collapse(true);
+			}
+		};
+
+		function fillLeftDown(x, y, rows, cols) {
+			var tr, x2, r, c, cell;
+
+			tr = grid[y][x].elm.parentNode;
+			for (r = 1; r <= rows; r++) {
+				tr = dom.getNext(tr, 'tr');
+
+				if (tr) {
+					// Loop left to find real cell
+					for (x2 = x; x2 >= 0; x2--) {
+						cell = grid[y + r][x2].elm;
+
+						if (cell.parentNode == tr) {
+							// Append clones after
+							for (c = 1; c <= cols; c++)
+								dom.insertAfter(cloneCell(cell), cell);
+
+							break;
+						}
+					}
+
+					if (x2 == -1) {
+						// Insert nodes before first cell
+						for (c = 1; c <= cols; c++)
+							tr.insertBefore(cloneCell(tr.cells[0]), tr.cells[0]);
+					}
+				}
+			}
+		};
+
+		function split() {
+			each(grid, function(row, y) {
+				each(row, function(cell, x) {
+					var colSpan, rowSpan, newCell, i;
+
+					if (isCellSelected(cell)) {
+						cell = cell.elm;
+						colSpan = getSpanVal(cell, 'colspan');
+						rowSpan = getSpanVal(cell, 'rowspan');
+
+						if (colSpan > 1 || rowSpan > 1) {
+							setSpanVal(cell, 'rowSpan', 1);
+							setSpanVal(cell, 'colSpan', 1);
+
+							// Insert cells right
+							for (i = 0; i < colSpan - 1; i++)
+								dom.insertAfter(cloneCell(cell), cell);
+
+							fillLeftDown(x, y, rowSpan - 1, colSpan);
+						}
+					}
+				});
+			});
+		};
+
+		function merge(cell, cols, rows) {
+			var startX, startY, endX, endY, x, y, startCell, endCell, cell, children, count;
+
+			// Use specified cell and cols/rows
+			if (cell) {
+				pos = getPos(cell);
+				startX = pos.x;
+				startY = pos.y;
+				endX = startX + (cols - 1);
+				endY = startY + (rows - 1);
+			} else {
+				startPos = endPos = null;
+
+				// Calculate start/end pos by checking for selected cells in grid works better with context menu
+				each(grid, function(row, y) {
+					each(row, function(cell, x) {
+						if (isCellSelected(cell)) {
+							if (!startPos) {
+								startPos = {x: x, y: y};
+							}
+
+							endPos = {x: x, y: y};
+						}
+					});
+				});
+
+				// Use selection
+				startX = startPos.x;
+				startY = startPos.y;
+				endX = endPos.x;
+				endY = endPos.y;
+			}
+
+			// Find start/end cells
+			startCell = getCell(startX, startY);
+			endCell = getCell(endX, endY);
+
+			// Check if the cells exists and if they are of the same part for example tbody = tbody
+			if (startCell && endCell && startCell.part == endCell.part) {
+				// Split and rebuild grid
+				split();
+				buildGrid();
+
+				// Set row/col span to start cell
+				startCell = getCell(startX, startY).elm;
+				setSpanVal(startCell, 'colSpan', (endX - startX) + 1);
+				setSpanVal(startCell, 'rowSpan', (endY - startY) + 1);
+
+				// Remove other cells and add it's contents to the start cell
+				for (y = startY; y <= endY; y++) {
+					for (x = startX; x <= endX; x++) {
+						if (!grid[y] || !grid[y][x])
+							continue;
+
+						cell = grid[y][x].elm;
+
+						if (cell != startCell) {
+							// Move children to startCell
+							children = tinymce.grep(cell.childNodes);
+							each(children, function(node) {
+								startCell.appendChild(node);
+							});
+
+							// Remove bogus nodes if there is children in the target cell
+							if (children.length) {
+								children = tinymce.grep(startCell.childNodes);
+								count = 0;
+								each(children, function(node) {
+									if (node.nodeName == 'BR' && dom.getAttrib(node, 'data-mce-bogus') && count++ < children.length - 1)
+										startCell.removeChild(node);
+								});
+							}
+							
+							// Remove cell
+							dom.remove(cell);
+						}
+					}
+				}
+
+				// Remove empty rows etc and restore caret location
+				cleanup();
+			}
+		};
+
+		function insertRow(before) {
+			var posY, cell, lastCell, x, rowElm, newRow, newCell, otherCell, rowSpan;
+
+			// Find first/last row
+			each(grid, function(row, y) {
+				each(row, function(cell, x) {
+					if (isCellSelected(cell)) {
+						cell = cell.elm;
+						rowElm = cell.parentNode;
+						newRow = cloneNode(rowElm, false);
+						posY = y;
+
+						if (before)
+							return false;
+					}
+				});
+
+				if (before)
+					return !posY;
+			});
+
+			for (x = 0; x < grid[0].length; x++) {
+				// Cell not found could be because of an invalid table structure
+				if (!grid[posY][x])
+					continue;
+
+				cell = grid[posY][x].elm;
+
+				if (cell != lastCell) {
+					if (!before) {
+						rowSpan = getSpanVal(cell, 'rowspan');
+						if (rowSpan > 1) {
+							setSpanVal(cell, 'rowSpan', rowSpan + 1);
+							continue;
+						}
+					} else {
+						// Check if cell above can be expanded
+						if (posY > 0 && grid[posY - 1][x]) {
+							otherCell = grid[posY - 1][x].elm;
+							rowSpan = getSpanVal(otherCell, 'rowSpan');
+							if (rowSpan > 1) {
+								setSpanVal(otherCell, 'rowSpan', rowSpan + 1);
+								continue;
+							}
+						}
+					}
+
+					// Insert new cell into new row
+					newCell = cloneCell(cell);
+					setSpanVal(newCell, 'colSpan', cell.colSpan);
+
+					newRow.appendChild(newCell);
+
+					lastCell = cell;
+				}
+			}
+
+			if (newRow.hasChildNodes()) {
+				if (!before)
+					dom.insertAfter(newRow, rowElm);
+				else
+					rowElm.parentNode.insertBefore(newRow, rowElm);
+			}
+		};
+
+		function insertCol(before) {
+			var posX, lastCell;
+
+			// Find first/last column
+			each(grid, function(row, y) {
+				each(row, function(cell, x) {
+					if (isCellSelected(cell)) {
+						posX = x;
+
+						if (before)
+							return false;
+					}
+				});
+
+				if (before)
+					return !posX;
+			});
+
+			each(grid, function(row, y) {
+				var cell, rowSpan, colSpan;
+
+				if (!row[posX])
+					return;
+
+				cell = row[posX].elm;
+				if (cell != lastCell) {
+					colSpan = getSpanVal(cell, 'colspan');
+					rowSpan = getSpanVal(cell, 'rowspan');
+
+					if (colSpan == 1) {
+						if (!before) {
+							dom.insertAfter(cloneCell(cell), cell);
+							fillLeftDown(posX, y, rowSpan - 1, colSpan);
+						} else {
+							cell.parentNode.insertBefore(cloneCell(cell), cell);
+							fillLeftDown(posX, y, rowSpan - 1, colSpan);
+						}
+					} else
+						setSpanVal(cell, 'colSpan', cell.colSpan + 1);
+
+					lastCell = cell;
+				}
+			});
+		};
+
+		function deleteCols() {
+			var cols = [];
+
+			// Get selected column indexes
+			each(grid, function(row, y) {
+				each(row, function(cell, x) {
+					if (isCellSelected(cell) && tinymce.inArray(cols, x) === -1) {
+						each(grid, function(row) {
+							var cell = row[x].elm, colSpan;
+
+							colSpan = getSpanVal(cell, 'colSpan');
+
+							if (colSpan > 1)
+								setSpanVal(cell, 'colSpan', colSpan - 1);
+							else
+								dom.remove(cell);
+						});
+
+						cols.push(x);
+					}
+				});
+			});
+
+			cleanup();
+		};
+
+		function deleteRows() {
+			var rows;
+
+			function deleteRow(tr) {
+				var nextTr, pos, lastCell;
+
+				nextTr = dom.getNext(tr, 'tr');
+
+				// Move down row spanned cells
+				each(tr.cells, function(cell) {
+					var rowSpan = getSpanVal(cell, 'rowSpan');
+
+					if (rowSpan > 1) {
+						setSpanVal(cell, 'rowSpan', rowSpan - 1);
+						pos = getPos(cell);
+						fillLeftDown(pos.x, pos.y, 1, 1);
+					}
+				});
+
+				// Delete cells
+				pos = getPos(tr.cells[0]);
+				each(grid[pos.y], function(cell) {
+					var rowSpan;
+
+					cell = cell.elm;
+
+					if (cell != lastCell) {
+						rowSpan = getSpanVal(cell, 'rowSpan');
+
+						if (rowSpan <= 1)
+							dom.remove(cell);
+						else
+							setSpanVal(cell, 'rowSpan', rowSpan - 1);
+
+						lastCell = cell;
+					}
+				});
+			};
+
+			// Get selected rows and move selection out of scope
+			rows = getSelectedRows();
+
+			// Delete all selected rows
+			each(rows.reverse(), function(tr) {
+				deleteRow(tr);
+			});
+
+			cleanup();
+		};
+
+		function cutRows() {
+			var rows = getSelectedRows();
+
+			dom.remove(rows);
+			cleanup();
+
+			return rows;
+		};
+
+		function copyRows() {
+			var rows = getSelectedRows();
+
+			each(rows, function(row, i) {
+				rows[i] = cloneNode(row, true);
+			});
+
+			return rows;
+		};
+
+		function pasteRows(rows, before) {
+			// If we don't have any rows in the clipboard, return immediately
+			if(!rows)
+				return;
+
+			var selectedRows = getSelectedRows(),
+				targetRow = selectedRows[before ? 0 : selectedRows.length - 1],
+				targetCellCount = targetRow.cells.length;
+
+			// Calc target cell count
+			each(grid, function(row) {
+				var match;
+
+				targetCellCount = 0;
+				each(row, function(cell, x) {
+					if (cell.real)
+						targetCellCount += cell.colspan;
+
+					if (cell.elm.parentNode == targetRow)
+						match = 1;
+				});
+
+				if (match)
+					return false;
+			});
+
+			if (!before)
+				rows.reverse();
+
+			each(rows, function(row) {
+				var cellCount = row.cells.length, cell;
+
+				// Remove col/rowspans
+				for (i = 0; i < cellCount; i++) {
+					cell = row.cells[i];
+					setSpanVal(cell, 'colSpan', 1);
+					setSpanVal(cell, 'rowSpan', 1);
+				}
+
+				// Needs more cells
+				for (i = cellCount; i < targetCellCount; i++)
+					row.appendChild(cloneCell(row.cells[cellCount - 1]));
+
+				// Needs less cells
+				for (i = targetCellCount; i < cellCount; i++)
+					dom.remove(row.cells[i]);
+
+				// Add before/after
+				if (before)
+					targetRow.parentNode.insertBefore(row, targetRow);
+				else
+					dom.insertAfter(row, targetRow);
+			});
+
+			// Remove current selection
+			dom.removeClass(dom.select('td.mceSelected,th.mceSelected'), 'mceSelected');
+		};
+
+		function getPos(target) {
+			var pos;
+
+			each(grid, function(row, y) {
+				each(row, function(cell, x) {
+					if (cell.elm == target) {
+						pos = {x : x, y : y};
+						return false;
+					}
+				});
+
+				return !pos;
+			});
+
+			return pos;
+		};
+
+		function setStartCell(cell) {
+			startPos = getPos(cell);
+		};
+
+		function findEndPos() {
+			var pos, maxX, maxY;
+
+			maxX = maxY = 0;
+
+			each(grid, function(row, y) {
+				each(row, function(cell, x) {
+					var colSpan, rowSpan;
+
+					if (isCellSelected(cell)) {
+						cell = grid[y][x];
+
+						if (x > maxX)
+							maxX = x;
+
+						if (y > maxY)
+							maxY = y;
+
+						if (cell.real) {
+							colSpan = cell.colspan - 1;
+							rowSpan = cell.rowspan - 1;
+
+							if (colSpan) {
+								if (x + colSpan > maxX)
+									maxX = x + colSpan;
+							}
+
+							if (rowSpan) {
+								if (y + rowSpan > maxY)
+									maxY = y + rowSpan;
+							}
+						}
+					}
+				});
+			});
+
+			return {x : maxX, y : maxY};
+		};
+
+		function setEndCell(cell) {
+			var startX, startY, endX, endY, maxX, maxY, colSpan, rowSpan;
+
+			endPos = getPos(cell);
+
+			if (startPos && endPos) {
+				// Get start/end positions
+				startX = Math.min(startPos.x, endPos.x);
+				startY = Math.min(startPos.y, endPos.y);
+				endX = Math.max(startPos.x, endPos.x);
+				endY = Math.max(startPos.y, endPos.y);
+
+				// Expand end positon to include spans
+				maxX = endX;
+				maxY = endY;
+
+				// Expand startX
+				for (y = startY; y <= maxY; y++) {
+					cell = grid[y][startX];
+
+					if (!cell.real) {
+						if (startX - (cell.colspan - 1) < startX)
+							startX -= cell.colspan - 1;
+					}
+				}
+
+				// Expand startY
+				for (x = startX; x <= maxX; x++) {
+					cell = grid[startY][x];
+
+					if (!cell.real) {
+						if (startY - (cell.rowspan - 1) < startY)
+							startY -= cell.rowspan - 1;
+					}
+				}
+
+				// Find max X, Y
+				for (y = startY; y <= endY; y++) {
+					for (x = startX; x <= endX; x++) {
+						cell = grid[y][x];
+
+						if (cell.real) {
+							colSpan = cell.colspan - 1;
+							rowSpan = cell.rowspan - 1;
+
+							if (colSpan) {
+								if (x + colSpan > maxX)
+									maxX = x + colSpan;
+							}
+
+							if (rowSpan) {
+								if (y + rowSpan > maxY)
+									maxY = y + rowSpan;
+							}
+						}
+					}
+				}
+
+				// Remove current selection
+				dom.removeClass(dom.select('td.mceSelected,th.mceSelected'), 'mceSelected');
+
+				// Add new selection
+				for (y = startY; y <= maxY; y++) {
+					for (x = startX; x <= maxX; x++) {
+						if (grid[y][x])
+							dom.addClass(grid[y][x].elm, 'mceSelected');
+					}
+				}
+			}
+		};
+
+		// Expose to public
+		tinymce.extend(this, {
+			deleteTable : deleteTable,
+			split : split,
+			merge : merge,
+			insertRow : insertRow,
+			insertCol : insertCol,
+			deleteCols : deleteCols,
+			deleteRows : deleteRows,
+			cutRows : cutRows,
+			copyRows : copyRows,
+			pasteRows : pasteRows,
+			getPos : getPos,
+			setStartCell : setStartCell,
+			setEndCell : setEndCell
+		});
+	};
+
+	tinymce.create('tinymce.plugins.TablePlugin', {
+		init : function(ed, url) {
+			var winMan, clipboardRows, hasCellSelection = true; // Might be selected cells on reload
+
+			function createTableGrid(node) {
+				var selection = ed.selection, tblElm = ed.dom.getParent(node || selection.getNode(), 'table');
+
+				if (tblElm)
+					return new TableGrid(tblElm, ed.dom, selection);
+			};
+
+			function cleanup() {
+				// Restore selection possibilities
+				ed.getBody().style.webkitUserSelect = '';
+
+				if (hasCellSelection) {
+					ed.dom.removeClass(ed.dom.select('td.mceSelected,th.mceSelected'), 'mceSelected');
+					hasCellSelection = false;
+				}
+			};
+
+			// Register buttons
+			each([
+				['table', 'table.desc', 'mceInsertTable', true],
+				['delete_table', 'table.del', 'mceTableDelete'],
+				['delete_col', 'table.delete_col_desc', 'mceTableDeleteCol'],
+				['delete_row', 'table.delete_row_desc', 'mceTableDeleteRow'],
+				['col_after', 'table.col_after_desc', 'mceTableInsertColAfter'],
+				['col_before', 'table.col_before_desc', 'mceTableInsertColBefore'],
+				['row_after', 'table.row_after_desc', 'mceTableInsertRowAfter'],
+				['row_before', 'table.row_before_desc', 'mceTableInsertRowBefore'],
+				['row_props', 'table.row_desc', 'mceTableRowProps', true],
+				['cell_props', 'table.cell_desc', 'mceTableCellProps', true],
+				['split_cells', 'table.split_cells_desc', 'mceTableSplitCells', true],
+				['merge_cells', 'table.merge_cells_desc', 'mceTableMergeCells', true]
+			], function(c) {
+				ed.addButton(c[0], {title : c[1], cmd : c[2], ui : c[3]});
+			});
+
+			// Select whole table is a table border is clicked
+			if (!tinymce.isIE) {
+				ed.onClick.add(function(ed, e) {
+					e = e.target;
+
+					if (e.nodeName === 'TABLE') {
+						ed.selection.select(e);
+						ed.nodeChanged();
+					}
+				});
+			}
+
+			ed.onPreProcess.add(function(ed, args) {
+				var nodes, i, node, dom = ed.dom, value;
+
+				nodes = dom.select('table', args.node);
+				i = nodes.length;
+				while (i--) {
+					node = nodes[i];
+					dom.setAttrib(node, 'data-mce-style', '');
+
+					if ((value = dom.getAttrib(node, 'width'))) {
+						dom.setStyle(node, 'width', value);
+						dom.setAttrib(node, 'width', '');
+					}
+
+					if ((value = dom.getAttrib(node, 'height'))) {
+						dom.setStyle(node, 'height', value);
+						dom.setAttrib(node, 'height', '');
+					}
+				}
+			});
+
+			// Handle node change updates
+			ed.onNodeChange.add(function(ed, cm, n) {
+				var p;
+
+				n = ed.selection.getStart();
+				p = ed.dom.getParent(n, 'td,th,caption');
+				cm.setActive('table', n.nodeName === 'TABLE' || !!p);
+
+				// Disable table tools if we are in caption
+				if (p && p.nodeName === 'CAPTION')
+					p = 0;
+
+				cm.setDisabled('delete_table', !p);
+				cm.setDisabled('delete_col', !p);
+				cm.setDisabled('delete_table', !p);
+				cm.setDisabled('delete_row', !p);
+				cm.setDisabled('col_after', !p);
+				cm.setDisabled('col_before', !p);
+				cm.setDisabled('row_after', !p);
+				cm.setDisabled('row_before', !p);
+				cm.setDisabled('row_props', !p);
+				cm.setDisabled('cell_props', !p);
+				cm.setDisabled('split_cells', !p);
+				cm.setDisabled('merge_cells', !p);
+			});
+
+			ed.onInit.add(function(ed) {
+				var startTable, startCell, dom = ed.dom, tableGrid;
+
+				winMan = ed.windowManager;
+
+				// Add cell selection logic
+				ed.onMouseDown.add(function(ed, e) {
+					if (e.button != 2) {
+						cleanup();
+
+						startCell = dom.getParent(e.target, 'td,th');
+						startTable = dom.getParent(startCell, 'table');
+					}
+				});
+
+				dom.bind(ed.getDoc(), 'mouseover', function(e) {
+					var sel, table, target = e.target;
+
+					if (startCell && (tableGrid || target != startCell) && (target.nodeName == 'TD' || target.nodeName == 'TH')) {
+						table = dom.getParent(target, 'table');
+						if (table == startTable) {
+							if (!tableGrid) {
+								tableGrid = createTableGrid(table);
+								tableGrid.setStartCell(startCell);
+
+								ed.getBody().style.webkitUserSelect = 'none';
+							}
+
+							tableGrid.setEndCell(target);
+							hasCellSelection = true;
+						}
+
+						// Remove current selection
+						sel = ed.selection.getSel();
+
+						try {
+							if (sel.removeAllRanges)
+								sel.removeAllRanges();
+							else
+								sel.empty();
+						} catch (ex) {
+							// IE9 might throw errors here
+						}
+
+						e.preventDefault();
+					}
+				});
+
+				ed.onMouseUp.add(function(ed, e) {
+					var rng, sel = ed.selection, selectedCells, nativeSel = sel.getSel(), walker, node, lastNode, endNode;
+
+					// Move selection to startCell
+					if (startCell) {
+						if (tableGrid)
+							ed.getBody().style.webkitUserSelect = '';
+
+						function setPoint(node, start) {
+							var walker = new tinymce.dom.TreeWalker(node, node);
+
+							do {
+								// Text node
+								if (node.nodeType == 3 && tinymce.trim(node.nodeValue).length != 0) {
+									if (start)
+										rng.setStart(node, 0);
+									else
+										rng.setEnd(node, node.nodeValue.length);
+
+									return;
+								}
+
+								// BR element
+								if (node.nodeName == 'BR') {
+									if (start)
+										rng.setStartBefore(node);
+									else
+										rng.setEndBefore(node);
+
+									return;
+								}
+							} while (node = (start ? walker.next() : walker.prev()));
+						}
+
+						// Try to expand text selection as much as we can only Gecko supports cell selection
+						selectedCells = dom.select('td.mceSelected,th.mceSelected');
+						if (selectedCells.length > 0) {
+							rng = dom.createRng();
+							node = selectedCells[0];
+							endNode = selectedCells[selectedCells.length - 1];
+							rng.setStartBefore(node);
+							rng.setEndAfter(node);
+
+							setPoint(node, 1);
+							walker = new tinymce.dom.TreeWalker(node, dom.getParent(selectedCells[0], 'table'));
+
+							do {
+								if (node.nodeName == 'TD' || node.nodeName == 'TH') {
+									if (!dom.hasClass(node, 'mceSelected'))
+										break;
+
+									lastNode = node;
+								}
+							} while (node = walker.next());
+
+							setPoint(lastNode);
+
+							sel.setRng(rng);
+						}
+
+						ed.nodeChanged();
+						startCell = tableGrid = startTable = null;
+					}
+				});
+
+				ed.onKeyUp.add(function(ed, e) {
+					cleanup();
+				});
+
+				ed.onKeyDown.add(function (ed, e) {
+					fixTableCellSelection(ed);
+				});
+
+				ed.onMouseDown.add(function (ed, e) {
+					if (e.button != 2) {
+						fixTableCellSelection(ed);
+					}
+				});
+				function tableCellSelected(ed, rng, n, currentCell) {
+					// The decision of when a table cell is selected is somewhat involved.  The fact that this code is
+					// required is actually a pointer to the root cause of this bug. A cell is selected when the start 
+					// and end offsets are 0, the start container is a text, and the selection node is either a TR (most cases)
+					// or the parent of the table (in the case of the selection containing the last cell of a table).
+					var TEXT_NODE = 3, table = ed.dom.getParent(rng.startContainer, 'TABLE'), 
+					tableParent, allOfCellSelected, tableCellSelection;
+					if (table) 
+					tableParent = table.parentNode;
+					allOfCellSelected =rng.startContainer.nodeType == TEXT_NODE && 
+						rng.startOffset == 0 && 
+						rng.endOffset == 0 && 
+						currentCell && 
+						(n.nodeName=="TR" || n==tableParent);
+					tableCellSelection = (n.nodeName=="TD"||n.nodeName=="TH")&& !currentCell;	   
+					return  allOfCellSelected || tableCellSelection;
+					// return false;
+				}
+				
+				// this nasty hack is here to work around some WebKit selection bugs.
+				function fixTableCellSelection(ed) {
+					if (!tinymce.isWebKit)
+						return;
+
+					var rng = ed.selection.getRng();
+					var n = ed.selection.getNode();
+					var currentCell = ed.dom.getParent(rng.startContainer, 'TD,TH');
+				
+					if (!tableCellSelected(ed, rng, n, currentCell))
+						return;
+						if (!currentCell) {
+							currentCell=n;
+						}
+					
+					// Get the very last node inside the table cell
+					var end = currentCell.lastChild;
+					while (end.lastChild)
+						end = end.lastChild;
+					
+					// Select the entire table cell. Nothing outside of the table cell should be selected.
+					rng.setEnd(end, end.nodeValue.length);
+					ed.selection.setRng(rng);
+				}
+				ed.plugins.table.fixTableCellSelection=fixTableCellSelection;
+
+				// Add context menu
+				if (ed && ed.plugins.contextmenu) {
+					ed.plugins.contextmenu.onContextMenu.add(function(th, m, e) {
+						var sm, se = ed.selection, el = se.getNode() || ed.getBody();
+
+						if (ed.dom.getParent(e, 'td') || ed.dom.getParent(e, 'th') || ed.dom.select('td.mceSelected,th.mceSelected').length) {
+							m.removeAll();
+
+							if (el.nodeName == 'A' && !ed.dom.getAttrib(el, 'name')) {
+								m.add({title : 'advanced.link_desc', icon : 'link', cmd : ed.plugins.advlink ? 'mceAdvLink' : 'mceLink', ui : true});
+								m.add({title : 'advanced.unlink_desc', icon : 'unlink', cmd : 'UnLink'});
+								m.addSeparator();
+							}
+
+							if (el.nodeName == 'IMG' && el.className.indexOf('mceItem') == -1) {
+								m.add({title : 'advanced.image_desc', icon : 'image', cmd : ed.plugins.advimage ? 'mceAdvImage' : 'mceImage', ui : true});
+								m.addSeparator();
+							}
+
+							m.add({title : 'table.desc', icon : 'table', cmd : 'mceInsertTable', value : {action : 'insert'}});
+							m.add({title : 'table.props_desc', icon : 'table_props', cmd : 'mceInsertTable'});
+							m.add({title : 'table.del', icon : 'delete_table', cmd : 'mceTableDelete'});
+							m.addSeparator();
+
+							// Cell menu
+							sm = m.addMenu({title : 'table.cell'});
+							sm.add({title : 'table.cell_desc', icon : 'cell_props', cmd : 'mceTableCellProps'});
+							sm.add({title : 'table.split_cells_desc', icon : 'split_cells', cmd : 'mceTableSplitCells'});
+							sm.add({title : 'table.merge_cells_desc', icon : 'merge_cells', cmd : 'mceTableMergeCells'});
+
+							// Row menu
+							sm = m.addMenu({title : 'table.row'});
+							sm.add({title : 'table.row_desc', icon : 'row_props', cmd : 'mceTableRowProps'});
+							sm.add({title : 'table.row_before_desc', icon : 'row_before', cmd : 'mceTableInsertRowBefore'});
+							sm.add({title : 'table.row_after_desc', icon : 'row_after', cmd : 'mceTableInsertRowAfter'});
+							sm.add({title : 'table.delete_row_desc', icon : 'delete_row', cmd : 'mceTableDeleteRow'});
+							sm.addSeparator();
+							sm.add({title : 'table.cut_row_desc', icon : 'cut', cmd : 'mceTableCutRow'});
+							sm.add({title : 'table.copy_row_desc', icon : 'copy', cmd : 'mceTableCopyRow'});
+							sm.add({title : 'table.paste_row_before_desc', icon : 'paste', cmd : 'mceTablePasteRowBefore'}).setDisabled(!clipboardRows);
+							sm.add({title : 'table.paste_row_after_desc', icon : 'paste', cmd : 'mceTablePasteRowAfter'}).setDisabled(!clipboardRows);
+
+							// Column menu
+							sm = m.addMenu({title : 'table.col'});
+							sm.add({title : 'table.col_before_desc', icon : 'col_before', cmd : 'mceTableInsertColBefore'});
+							sm.add({title : 'table.col_after_desc', icon : 'col_after', cmd : 'mceTableInsertColAfter'});
+							sm.add({title : 'table.delete_col_desc', icon : 'delete_col', cmd : 'mceTableDeleteCol'});
+						} else
+							m.add({title : 'table.desc', icon : 'table', cmd : 'mceInsertTable'});
+					});
+				}
+
+				// Fix to allow navigating up and down in a table in WebKit browsers.
+				if (tinymce.isWebKit) {
+					function moveSelection(ed, e) {
+						var VK = tinymce.VK;
+						var key = e.keyCode;
+
+						function handle(upBool, sourceNode, event) {
+							var siblingDirection = upBool ? 'previousSibling' : 'nextSibling';
+							var currentRow = ed.dom.getParent(sourceNode, 'tr');
+							var siblingRow = currentRow[siblingDirection];
+
+							if (siblingRow) {
+								moveCursorToRow(ed, sourceNode, siblingRow, upBool);
+								tinymce.dom.Event.cancel(event);
+								return true;
+							} else {
+								var tableNode = ed.dom.getParent(currentRow, 'table');
+								var middleNode = currentRow.parentNode;
+								var parentNodeName = middleNode.nodeName.toLowerCase();
+								if (parentNodeName === 'tbody' || parentNodeName === (upBool ? 'tfoot' : 'thead')) {
+									var targetParent = getTargetParent(upBool, tableNode, middleNode, 'tbody');
+									if (targetParent !== null) {
+										return moveToRowInTarget(upBool, targetParent, sourceNode, event);
+									}
+								}
+								return escapeTable(upBool, currentRow, siblingDirection, tableNode, event);
+							}
+						}
+
+						function getTargetParent(upBool, topNode, secondNode, nodeName) {
+							var tbodies = ed.dom.select('>' + nodeName, topNode);
+							var position = tbodies.indexOf(secondNode);
+							if (upBool && position === 0 || !upBool && position === tbodies.length - 1) {
+								return getFirstHeadOrFoot(upBool, topNode);
+							} else if (position === -1) {
+								var topOrBottom = secondNode.tagName.toLowerCase() === 'thead' ? 0 : tbodies.length - 1;
+								return tbodies[topOrBottom];
+							} else {
+								return tbodies[position + (upBool ? -1 : 1)];
+							}
+						}
+
+						function getFirstHeadOrFoot(upBool, parent) {
+							var tagName = upBool ? 'thead' : 'tfoot';
+							var headOrFoot = ed.dom.select('>' + tagName, parent);
+							return headOrFoot.length !== 0 ? headOrFoot[0] : null;
+						}
+
+						function moveToRowInTarget(upBool, targetParent, sourceNode, event) {
+							var targetRow = getChildForDirection(targetParent, upBool);
+							targetRow && moveCursorToRow(ed, sourceNode, targetRow, upBool);
+							tinymce.dom.Event.cancel(event);
+							return true;
+						}
+
+						function escapeTable(upBool, currentRow, siblingDirection, table, event) {
+							var tableSibling = table[siblingDirection];
+							if (tableSibling) {
+								moveCursorToStartOfElement(tableSibling);
+								return true;
+							} else {
+								var parentCell = ed.dom.getParent(table, 'td,th');
+								if (parentCell) {
+									return handle(upBool, parentCell, event);
+								} else {
+									var backUpSibling = getChildForDirection(currentRow, !upBool);
+									moveCursorToStartOfElement(backUpSibling);
+									return tinymce.dom.Event.cancel(event);
+								}
+							}
+						}
+
+						function getChildForDirection(parent, up) {
+							var child =  parent && parent[up ? 'lastChild' : 'firstChild'];
+							// BR is not a valid table child to return in this case we return the table cell
+							return child && child.nodeName === 'BR' ? ed.dom.getParent(child, 'td,th') : child;
+						}
+
+						function moveCursorToStartOfElement(n) {
+							ed.selection.setCursorLocation(n, 0);
+						}
+
+						function isVerticalMovement() {
+							return key == VK.UP || key == VK.DOWN;
+						}
+
+						function isInTable(ed) {
+							var node = ed.selection.getNode();
+							var currentRow = ed.dom.getParent(node, 'tr');
+							return currentRow !== null;
+						}
+
+						function columnIndex(column) {
+							var colIndex = 0;
+							var c = column;
+							while (c.previousSibling) {
+								c = c.previousSibling;
+								colIndex = colIndex + getSpanVal(c, "colspan");
+							}
+							return colIndex;
+						}
+
+						function findColumn(rowElement, columnIndex) {
+							var c = 0;
+							var r = 0;
+							each(rowElement.children, function(cell, i) {
+								c = c + getSpanVal(cell, "colspan");
+								r = i;
+								if (c > columnIndex)
+									return false;
+							});
+							return r;
+						}
+
+						function moveCursorToRow(ed, node, row, upBool) {
+							var srcColumnIndex = columnIndex(ed.dom.getParent(node, 'td,th'));
+							var tgtColumnIndex = findColumn(row, srcColumnIndex);
+							var tgtNode = row.childNodes[tgtColumnIndex];
+							var rowCellTarget = getChildForDirection(tgtNode, upBool);
+							moveCursorToStartOfElement(rowCellTarget || tgtNode);
+						}
+
+						function shouldFixCaret(preBrowserNode) {
+							var newNode = ed.selection.getNode();
+							var newParent = ed.dom.getParent(newNode, 'td,th');
+							var oldParent = ed.dom.getParent(preBrowserNode, 'td,th');
+							return newParent && newParent !== oldParent && checkSameParentTable(newParent, oldParent)
+						}
+
+						function checkSameParentTable(nodeOne, NodeTwo) {
+							return ed.dom.getParent(nodeOne, 'TABLE') === ed.dom.getParent(NodeTwo, 'TABLE');
+						}
+
+						if (isVerticalMovement() && isInTable(ed)) {
+							var preBrowserNode = ed.selection.getNode();
+							setTimeout(function() {
+								if (shouldFixCaret(preBrowserNode)) {
+									handle(!e.shiftKey && key === VK.UP, preBrowserNode, e);
+								}
+							}, 0);
+						}
+					}
+
+					ed.onKeyDown.add(moveSelection);
+				}
+
+				// Fixes an issue on Gecko where it's impossible to place the caret behind a table
+				// This fix will force a paragraph element after the table but only when the forced_root_block setting is enabled
+				function fixTableCaretPos() {
+					var last;
+
+					// Skip empty text nodes form the end
+					for (last = ed.getBody().lastChild; last && last.nodeType == 3 && !last.nodeValue.length; last = last.previousSibling) ;
+
+					if (last && last.nodeName == 'TABLE') {
+						if (ed.settings.forced_root_block)
+							ed.dom.add(ed.getBody(), ed.settings.forced_root_block, null, tinymce.isIE && !tinymce.isIE11 ? '&nbsp;' : '<br data-mce-bogus="1" />');
+						else
+							ed.dom.add(ed.getBody(), 'br', {'data-mce-bogus': '1'});
+					}
+				};
+
+				// Fixes an bug where it's impossible to place the caret before a table in Gecko
+				// this fix solves it by detecting when the caret is at the beginning of such a table
+				// and then manually moves the caret infront of the table
+				if (tinymce.isGecko) {
+					ed.onKeyDown.add(function(ed, e) {
+						var rng, table, dom = ed.dom;
+
+						// On gecko it's not possible to place the caret before a table
+						if (e.keyCode == 37 || e.keyCode == 38) {
+							rng = ed.selection.getRng();
+							table = dom.getParent(rng.startContainer, 'table');
+
+							if (table && ed.getBody().firstChild == table) {
+								if (isAtStart(rng, table)) {
+									rng = dom.createRng();
+
+									rng.setStartBefore(table);
+									rng.setEndBefore(table);
+
+									ed.selection.setRng(rng);
+
+									e.preventDefault();
+								}
+							}
+						}
+					});
+				}
+
+				ed.onKeyUp.add(fixTableCaretPos);
+				ed.onSetContent.add(fixTableCaretPos);
+				ed.onVisualAid.add(fixTableCaretPos);
+
+				ed.onPreProcess.add(function(ed, o) {
+					var last = o.node.lastChild;
+
+					if (last && (last.nodeName == "BR" || (last.childNodes.length == 1 && (last.firstChild.nodeName == 'BR' || last.firstChild.nodeValue == '\u00a0'))) && last.previousSibling && last.previousSibling.nodeName == "TABLE") {
+						ed.dom.remove(last);
+					}
+				});
+
+
+				/**
+				 * Fixes bug in Gecko where shift-enter in table cell does not place caret on new line
+				 *
+				 * Removed: Since the new enter logic seems to fix this one.
+				 */
+				/*
+				if (tinymce.isGecko) {
+					ed.onKeyDown.add(function(ed, e) {
+						if (e.keyCode === tinymce.VK.ENTER && e.shiftKey) {
+							var node = ed.selection.getRng().startContainer;
+							var tableCell = dom.getParent(node, 'td,th');
+							if (tableCell) {
+								var zeroSizedNbsp = ed.getDoc().createTextNode("\uFEFF");
+								dom.insertAfter(zeroSizedNbsp, node);
+							}
+						}
+					});
+				}
+				*/
+
+				fixTableCaretPos();
+				ed.startContent = ed.getContent({format : 'raw'});
+			});
+
+			// Register action commands
+			each({
+				mceTableSplitCells : function(grid) {
+					grid.split();
+				},
+
+				mceTableMergeCells : function(grid) {
+					var rowSpan, colSpan, cell;
+
+					cell = ed.dom.getParent(ed.selection.getNode(), 'th,td');
+					if (cell) {
+						rowSpan = cell.rowSpan;
+						colSpan = cell.colSpan;
+					}
+
+					if (!ed.dom.select('td.mceSelected,th.mceSelected').length) {
+						winMan.open({
+							url : url + '/merge_cells.htm',
+							width : 240 + parseInt(ed.getLang('table.merge_cells_delta_width', 0)),
+							height : 110 + parseInt(ed.getLang('table.merge_cells_delta_height', 0)),
+							inline : 1
+						}, {
+							rows : rowSpan,
+							cols : colSpan,
+							onaction : function(data) {
+								grid.merge(cell, data.cols, data.rows);
+							},
+							plugin_url : url
+						});
+					} else
+						grid.merge();
+				},
+
+				mceTableInsertRowBefore : function(grid) {
+					grid.insertRow(true);
+				},
+
+				mceTableInsertRowAfter : function(grid) {
+					grid.insertRow();
+				},
+
+				mceTableInsertColBefore : function(grid) {
+					grid.insertCol(true);
+				},
+
+				mceTableInsertColAfter : function(grid) {
+					grid.insertCol();
+				},
+
+				mceTableDeleteCol : function(grid) {
+					grid.deleteCols();
+				},
+
+				mceTableDeleteRow : function(grid) {
+					grid.deleteRows();
+				},
+
+				mceTableCutRow : function(grid) {
+					clipboardRows = grid.cutRows();
+				},
+
+				mceTableCopyRow : function(grid) {
+					clipboardRows = grid.copyRows();
+				},
+
+				mceTablePasteRowBefore : function(grid) {
+					grid.pasteRows(clipboardRows, true);
+				},
+
+				mceTablePasteRowAfter : function(grid) {
+					grid.pasteRows(clipboardRows);
+				},
+
+				mceTableDelete : function(grid) {
+					grid.deleteTable();
+				}
+			}, function(func, name) {
+				ed.addCommand(name, function() {
+					var grid = createTableGrid();
+
+					if (grid) {
+						func(grid);
+						ed.execCommand('mceRepaint');
+						cleanup();
+					}
+				});
+			});
+
+			// Register dialog commands
+			each({
+				mceInsertTable : function(val) {
+					winMan.open({
+						url : url + '/table.htm',
+						width : 400 + parseInt(ed.getLang('table.table_delta_width', 0)),
+						height : 320 + parseInt(ed.getLang('table.table_delta_height', 0)),
+						inline : 1
+					}, {
+						plugin_url : url,
+						action : val ? val.action : 0
+					});
+				},
+
+				mceTableRowProps : function() {
+					winMan.open({
+						url : url + '/row.htm',
+						width : 400 + parseInt(ed.getLang('table.rowprops_delta_width', 0)),
+						height : 295 + parseInt(ed.getLang('table.rowprops_delta_height', 0)),
+						inline : 1
+					}, {
+						plugin_url : url
+					});
+				},
+
+				mceTableCellProps : function() {
+					winMan.open({
+						url : url + '/cell.htm',
+						width : 400 + parseInt(ed.getLang('table.cellprops_delta_width', 0)),
+						height : 295 + parseInt(ed.getLang('table.cellprops_delta_height', 0)),
+						inline : 1
+					}, {
+						plugin_url : url
+					});
+				}
+			}, function(func, name) {
+				ed.addCommand(name, function(ui, val) {
+					func(val);
+				});
+			});
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('table', tinymce.plugins.TablePlugin);
+})(tinymce);
diff --git a/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js
new file mode 100644
index 0000000..6f77e67
--- /dev/null
+++ b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js
@@ -0,0 +1,319 @@
+tinyMCEPopup.requireLangPack();
+
+var ed;
+
+function init() {
+	ed = tinyMCEPopup.editor;
+	tinyMCEPopup.resizeToInnerSize();
+
+	document.getElementById('backgroundimagebrowsercontainer').innerHTML = getBrowserHTML('backgroundimagebrowser','backgroundimage','image','table');
+	document.getElementById('bordercolor_pickcontainer').innerHTML = getColorPickerHTML('bordercolor_pick','bordercolor');
+	document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor')
+
+	var inst = ed;
+	var tdElm = ed.dom.getParent(ed.selection.getStart(), "td,th");
+	var formObj = document.forms[0];
+	var st = ed.dom.parseStyle(ed.dom.getAttrib(tdElm, "style"));
+
+	// Get table cell data
+	var celltype = tdElm.nodeName.toLowerCase();
+	var align = ed.dom.getAttrib(tdElm, 'align');
+	var valign = ed.dom.getAttrib(tdElm, 'valign');
+	var width = trimSize(getStyle(tdElm, 'width', 'width'));
+	var height = trimSize(getStyle(tdElm, 'height', 'height'));
+	var bordercolor = convertRGBToHex(getStyle(tdElm, 'bordercolor', 'borderLeftColor'));
+	var bgcolor = convertRGBToHex(getStyle(tdElm, 'bgcolor', 'backgroundColor'));
+	var className = ed.dom.getAttrib(tdElm, 'class');
+	var backgroundimage = getStyle(tdElm, 'background', 'backgroundImage').replace(new RegExp("url\\(['\"]?([^'\"]*)['\"]?\\)", 'gi'), "$1");
+	var id = ed.dom.getAttrib(tdElm, 'id');
+	var lang = ed.dom.getAttrib(tdElm, 'lang');
+	var dir = ed.dom.getAttrib(tdElm, 'dir');
+	var scope = ed.dom.getAttrib(tdElm, 'scope');
+
+	// Setup form
+	addClassesToList('class', 'table_cell_styles');
+	TinyMCE_EditableSelects.init();
+
+	if (!ed.dom.hasClass(tdElm, 'mceSelected')) {
+		formObj.bordercolor.value = bordercolor;
+		formObj.bgcolor.value = bgcolor;
+		formObj.backgroundimage.value = backgroundimage;
+		formObj.width.value = width;
+		formObj.height.value = height;
+		formObj.id.value = id;
+		formObj.lang.value = lang;
+		formObj.style.value = ed.dom.serializeStyle(st);
+		selectByValue(formObj, 'align', align);
+		selectByValue(formObj, 'valign', valign);
+		selectByValue(formObj, 'class', className, true, true);
+		selectByValue(formObj, 'celltype', celltype);
+		selectByValue(formObj, 'dir', dir);
+		selectByValue(formObj, 'scope', scope);
+
+		// Resize some elements
+		if (isVisible('backgroundimagebrowser'))
+			document.getElementById('backgroundimage').style.width = '180px';
+
+		updateColor('bordercolor_pick', 'bordercolor');
+		updateColor('bgcolor_pick', 'bgcolor');
+	} else
+		tinyMCEPopup.dom.hide('action');
+}
+
+function updateAction() {
+	var el, inst = ed, tdElm, trElm, tableElm, formObj = document.forms[0];
+
+	if (!AutoValidator.validate(formObj)) {
+		tinyMCEPopup.alert(AutoValidator.getErrorMessages(formObj).join('. ') + '.');
+		return false;
+	}
+
+	tinyMCEPopup.restoreSelection();
+	el = ed.selection.getStart();
+	tdElm = ed.dom.getParent(el, "td,th");
+	trElm = ed.dom.getParent(el, "tr");
+	tableElm = ed.dom.getParent(el, "table");
+
+	// Cell is selected
+	if (ed.dom.hasClass(tdElm, 'mceSelected')) {
+		// Update all selected sells
+		tinymce.each(ed.dom.select('td.mceSelected,th.mceSelected'), function(td) {
+			updateCell(td);
+		});
+
+		ed.addVisual();
+		ed.nodeChanged();
+		inst.execCommand('mceEndUndoLevel');
+		tinyMCEPopup.close();
+		return;
+	}
+
+	switch (getSelectValue(formObj, 'action')) {
+		case "cell":
+			var celltype = getSelectValue(formObj, 'celltype');
+			var scope = getSelectValue(formObj, 'scope');
+
+			function doUpdate(s) {
+				if (s) {
+					updateCell(tdElm);
+
+					ed.addVisual();
+					ed.nodeChanged();
+					inst.execCommand('mceEndUndoLevel');
+					tinyMCEPopup.close();
+				}
+			};
+
+			if (ed.getParam("accessibility_warnings", 1)) {
+				if (celltype == "th" && scope == "")
+					tinyMCEPopup.confirm(ed.getLang('table_dlg.missing_scope', '', true), doUpdate);
+				else
+					doUpdate(1);
+
+				return;
+			}
+
+			updateCell(tdElm);
+			break;
+
+		case "row":
+			var cell = trElm.firstChild;
+
+			if (cell.nodeName != "TD" && cell.nodeName != "TH")
+				cell = nextCell(cell);
+
+			do {
+				cell = updateCell(cell, true);
+			} while ((cell = nextCell(cell)) != null);
+
+			break;
+
+		case "col":
+			var curr, col = 0, cell = trElm.firstChild, rows = tableElm.getElementsByTagName("tr");
+
+			if (cell.nodeName != "TD" && cell.nodeName != "TH")
+				cell = nextCell(cell);
+
+			do {
+				if (cell == tdElm)
+					break;
+				col += cell.getAttribute("colspan")?cell.getAttribute("colspan"):1;
+			} while ((cell = nextCell(cell)) != null);
+
+			for (var i=0; i<rows.length; i++) {
+				cell = rows[i].firstChild;
+
+				if (cell.nodeName != "TD" && cell.nodeName != "TH")
+					cell = nextCell(cell);
+
+				curr = 0;
+				do {
+					if (curr == col) {
+						cell = updateCell(cell, true);
+						break;
+					}
+					curr += cell.getAttribute("colspan")?cell.getAttribute("colspan"):1;
+				} while ((cell = nextCell(cell)) != null);
+			}
+
+			break;
+
+		case "all":
+			var rows = tableElm.getElementsByTagName("tr");
+
+			for (var i=0; i<rows.length; i++) {
+				var cell = rows[i].firstChild;
+
+				if (cell.nodeName != "TD" && cell.nodeName != "TH")
+					cell = nextCell(cell);
+
+				do {
+					cell = updateCell(cell, true);
+				} while ((cell = nextCell(cell)) != null);
+			}
+
+			break;
+	}
+
+	ed.addVisual();
+	ed.nodeChanged();
+	inst.execCommand('mceEndUndoLevel');
+	tinyMCEPopup.close();
+}
+
+function nextCell(elm) {
+	while ((elm = elm.nextSibling) != null) {
+		if (elm.nodeName == "TD" || elm.nodeName == "TH")
+			return elm;
+	}
+
+	return null;
+}
+
+function updateCell(td, skip_id) {
+	var inst = ed;
+	var formObj = document.forms[0];
+	var curCellType = td.nodeName.toLowerCase();
+	var celltype = getSelectValue(formObj, 'celltype');
+	var doc = inst.getDoc();
+	var dom = ed.dom;
+
+	if (!skip_id)
+		dom.setAttrib(td, 'id', formObj.id.value);
+
+	dom.setAttrib(td, 'align', formObj.align.value);
+	dom.setAttrib(td, 'vAlign', formObj.valign.value);
+	dom.setAttrib(td, 'lang', formObj.lang.value);
+	dom.setAttrib(td, 'dir', getSelectValue(formObj, 'dir'));
+	dom.setAttrib(td, 'style', ed.dom.serializeStyle(ed.dom.parseStyle(formObj.style.value)));
+	dom.setAttrib(td, 'scope', formObj.scope.value);
+	dom.setAttrib(td, 'class', getSelectValue(formObj, 'class'));
+
+	// Clear deprecated attributes
+	ed.dom.setAttrib(td, 'width', '');
+	ed.dom.setAttrib(td, 'height', '');
+	ed.dom.setAttrib(td, 'bgColor', '');
+	ed.dom.setAttrib(td, 'borderColor', '');
+	ed.dom.setAttrib(td, 'background', '');
+
+	// Set styles
+	td.style.width = getCSSSize(formObj.width.value);
+	td.style.height = getCSSSize(formObj.height.value);
+	if (formObj.bordercolor.value != "") {
+		td.style.borderColor = formObj.bordercolor.value;
+		td.style.borderStyle = td.style.borderStyle == "" ? "solid" : td.style.borderStyle;
+		td.style.borderWidth = td.style.borderWidth == "" ? "1px" : td.style.borderWidth;
+	} else
+		td.style.borderColor = '';
+
+	td.style.backgroundColor = formObj.bgcolor.value;
+
+	if (formObj.backgroundimage.value != "")
+		td.style.backgroundImage = "url('" + formObj.backgroundimage.value + "')";
+	else
+		td.style.backgroundImage = '';
+
+	if (curCellType != celltype) {
+		// changing to a different node type
+		var newCell = doc.createElement(celltype);
+
+		for (var c=0; c<td.childNodes.length; c++)
+			newCell.appendChild(td.childNodes[c].cloneNode(1));
+
+		for (var a=0; a<td.attributes.length; a++)
+			ed.dom.setAttrib(newCell, td.attributes[a].name, ed.dom.getAttrib(td, td.attributes[a].name));
+
+		td.parentNode.replaceChild(newCell, td);
+		td = newCell;
+	}
+
+	dom.setAttrib(td, 'style', dom.serializeStyle(dom.parseStyle(td.style.cssText)));
+
+	return td;
+}
+
+function changedBackgroundImage() {
+	var formObj = document.forms[0];
+	var st = ed.dom.parseStyle(formObj.style.value);
+
+	st['background-image'] = "url('" + formObj.backgroundimage.value + "')";
+
+	formObj.style.value = ed.dom.serializeStyle(st);
+}
+
+function changedSize() {
+	var formObj = document.forms[0];
+	var st = ed.dom.parseStyle(formObj.style.value);
+
+	var width = formObj.width.value;
+	if (width != "")
+		st['width'] = getCSSSize(width);
+	else
+		st['width'] = "";
+
+	var height = formObj.height.value;
+	if (height != "")
+		st['height'] = getCSSSize(height);
+	else
+		st['height'] = "";
+
+	formObj.style.value = ed.dom.serializeStyle(st);
+}
+
+function changedColor() {
+	var formObj = document.forms[0];
+	var st = ed.dom.parseStyle(formObj.style.value);
+
+	st['background-color'] = formObj.bgcolor.value;
+	st['border-color'] = formObj.bordercolor.value;
+
+	formObj.style.value = ed.dom.serializeStyle(st);
+}
+
+function changedStyle() {
+	var formObj = document.forms[0];
+	var st = ed.dom.parseStyle(formObj.style.value);
+
+	if (st['background-image'])
+		formObj.backgroundimage.value = st['background-image'].replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");
+	else
+		formObj.backgroundimage.value = '';
+
+	if (st['width'])
+		formObj.width.value = trimSize(st['width']);
+
+	if (st['height'])
+		formObj.height.value = trimSize(st['height']);
+
+	if (st['background-color']) {
+		formObj.bgcolor.value = st['background-color'];
+		updateColor('bgcolor_pick','bgcolor');
+	}
+
+	if (st['border-color']) {
+		formObj.bordercolor.value = st['border-color'];
+		updateColor('bordercolor_pick','bordercolor');
+	}
+}
+
+tinyMCEPopup.onInit.add(init);
diff --git a/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/table/js/table.js b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/table/js/table.js
new file mode 100644
index 0000000..c580556
--- /dev/null
+++ b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/table/js/table.js
@@ -0,0 +1,501 @@
+tinyMCEPopup.requireLangPack();
+
+var action, orgTableWidth, orgTableHeight, dom = tinyMCEPopup.editor.dom;
+
+function insertTable() {
+	var formObj = document.forms[0];
+	var inst = tinyMCEPopup.editor, dom = inst.dom;
+	var cols = 2, rows = 2, border = 0, cellpadding = -1, cellspacing = -1, align, width, height, className, caption, frame, rules;
+	var html = '', capEl, elm;
+	var cellLimit, rowLimit, colLimit;
+
+	tinyMCEPopup.restoreSelection();
+
+	if (!AutoValidator.validate(formObj)) {
+		tinyMCEPopup.alert(AutoValidator.getErrorMessages(formObj).join('. ') + '.');
+		return false;
+	}
+
+	elm = dom.getParent(inst.selection.getNode(), 'table');
+
+	// Get form data
+	cols = formObj.elements['cols'].value;
+	rows = formObj.elements['rows'].value;
+	border = formObj.elements['border'].value != "" ? formObj.elements['border'].value : 0;
+	cellpadding = formObj.elements['cellpadding'].value != "" ? formObj.elements['cellpadding'].value : "";
+	cellspacing = formObj.elements['cellspacing'].value != "" ? formObj.elements['cellspacing'].value : "";
+	align = getSelectValue(formObj, "align");
+	frame = getSelectValue(formObj, "tframe");
+	rules = getSelectValue(formObj, "rules");
+	width = formObj.elements['width'].value;
+	height = formObj.elements['height'].value;
+	bordercolor = formObj.elements['bordercolor'].value;
+	bgcolor = formObj.elements['bgcolor'].value;
+	className = getSelectValue(formObj, "class");
+	id = formObj.elements['id'].value;
+	summary = formObj.elements['summary'].value;
+	style = formObj.elements['style'].value;
+	dir = formObj.elements['dir'].value;
+	lang = formObj.elements['lang'].value;
+	background = formObj.elements['backgroundimage'].value;
+	caption = formObj.elements['caption'].checked;
+
+	cellLimit = tinyMCEPopup.getParam('table_cell_limit', false);
+	rowLimit = tinyMCEPopup.getParam('table_row_limit', false);
+	colLimit = tinyMCEPopup.getParam('table_col_limit', false);
+
+	// Validate table size
+	if (colLimit && cols > colLimit) {
+		tinyMCEPopup.alert(inst.getLang('table_dlg.col_limit').replace(/\{\$cols\}/g, colLimit));
+		return false;
+	} else if (rowLimit && rows > rowLimit) {
+		tinyMCEPopup.alert(inst.getLang('table_dlg.row_limit').replace(/\{\$rows\}/g, rowLimit));
+		return false;
+	} else if (cellLimit && cols * rows > cellLimit) {
+		tinyMCEPopup.alert(inst.getLang('table_dlg.cell_limit').replace(/\{\$cells\}/g, cellLimit));
+		return false;
+	}
+
+	// Update table
+	if (action == "update") {
+		dom.setAttrib(elm, 'cellPadding', cellpadding, true);
+		dom.setAttrib(elm, 'cellSpacing', cellspacing, true);
+
+		if (!isCssSize(border)) {
+			dom.setAttrib(elm, 'border', border);
+		} else {
+			dom.setAttrib(elm, 'border', '');
+		}
+
+		if (border == '') {
+			dom.setStyle(elm, 'border-width', '');
+			dom.setStyle(elm, 'border', '');
+			dom.setAttrib(elm, 'border', '');
+		}
+
+		dom.setAttrib(elm, 'align', align);
+		dom.setAttrib(elm, 'frame', frame);
+		dom.setAttrib(elm, 'rules', rules);
+		dom.setAttrib(elm, 'class', className);
+		dom.setAttrib(elm, 'style', style);
+		dom.setAttrib(elm, 'id', id);
+		dom.setAttrib(elm, 'summary', summary);
+		dom.setAttrib(elm, 'dir', dir);
+		dom.setAttrib(elm, 'lang', lang);
+
+		capEl = inst.dom.select('caption', elm)[0];
+
+		if (capEl && !caption)
+			capEl.parentNode.removeChild(capEl);
+
+		if (!capEl && caption) {
+			capEl = elm.ownerDocument.createElement('caption');
+
+			if (!tinymce.isIE || tinymce.isIE11)
+				capEl.innerHTML = '<br data-mce-bogus="1"/>';
+
+			elm.insertBefore(capEl, elm.firstChild);
+		}
+
+		if (width && inst.settings.inline_styles) {
+			dom.setStyle(elm, 'width', width);
+			dom.setAttrib(elm, 'width', '');
+		} else {
+			dom.setAttrib(elm, 'width', width, true);
+			dom.setStyle(elm, 'width', '');
+		}
+
+		// Remove these since they are not valid XHTML
+		dom.setAttrib(elm, 'borderColor', '');
+		dom.setAttrib(elm, 'bgColor', '');
+		dom.setAttrib(elm, 'background', '');
+
+		if (height && inst.settings.inline_styles) {
+			dom.setStyle(elm, 'height', height);
+			dom.setAttrib(elm, 'height', '');
+		} else {
+			dom.setAttrib(elm, 'height', height, true);
+			dom.setStyle(elm, 'height', '');
+ 		}
+
+		if (background != '')
+			elm.style.backgroundImage = "url('" + background + "')";
+		else
+			elm.style.backgroundImage = '';
+
+/*		if (tinyMCEPopup.getParam("inline_styles")) {
+			if (width != '')
+				elm.style.width = getCSSSize(width);
+		}*/
+
+		if (bordercolor != "") {
+			elm.style.borderColor = bordercolor;
+			elm.style.borderStyle = elm.style.borderStyle == "" ? "solid" : elm.style.borderStyle;
+			elm.style.borderWidth = cssSize(border);
+		} else
+			elm.style.borderColor = '';
+
+		elm.style.backgroundColor = bgcolor;
+		elm.style.height = getCSSSize(height);
+
+		inst.addVisual();
+
+		// Fix for stange MSIE align bug
+		//elm.outerHTML = elm.outerHTML;
+
+		inst.nodeChanged();
+		inst.execCommand('mceEndUndoLevel', false, {}, {skip_undo: true});
+
+		// Repaint if dimensions changed
+		if (formObj.width.value != orgTableWidth || formObj.height.value != orgTableHeight)
+			inst.execCommand('mceRepaint');
+
+		tinyMCEPopup.close();
+		return true;
+	}
+
+	// Create new table
+	html += '<table';
+
+	html += makeAttrib('id', id);
+	if (!isCssSize(border)) {
+		html += makeAttrib('border', border);
+	}
+
+	html += makeAttrib('cellpadding', cellpadding);
+	html += makeAttrib('cellspacing', cellspacing);
+	html += makeAttrib('data-mce-new', '1');
+
+	if (width && inst.settings.inline_styles) {
+		if (style)
+			style += '; ';
+
+		// Force px
+		if (/^[0-9\.]+$/.test(width))
+			width += 'px';
+
+		style += 'width: ' + width;
+	} else
+		html += makeAttrib('width', width);
+
+/*	if (height) {
+		if (style)
+			style += '; ';
+
+		style += 'height: ' + height;
+	}*/
+
+	//html += makeAttrib('height', height);
+	//html += makeAttrib('bordercolor', bordercolor);
+	//html += makeAttrib('bgcolor', bgcolor);
+	html += makeAttrib('align', align);
+	html += makeAttrib('frame', frame);
+	html += makeAttrib('rules', rules);
+	html += makeAttrib('class', className);
+	html += makeAttrib('style', style);
+	html += makeAttrib('summary', summary);
+	html += makeAttrib('dir', dir);
+	html += makeAttrib('lang', lang);
+	html += '>';
+
+	if (caption) {
+		if (!tinymce.isIE || tinymce.isIE11)
+			html += '<caption><br data-mce-bogus="1"/></caption>';
+		else
+			html += '<caption></caption>';
+	}
+
+	for (var y=0; y<rows; y++) {
+		html += "<tr>";
+
+		for (var x=0; x<cols; x++) {
+			if (!tinymce.isIE || tinymce.isIE11)
+				html += '<td><br data-mce-bogus="1"/></td>';
+			else
+				html += '<td></td>';
+		}
+
+		html += "</tr>";
+	}
+
+	html += "</table>";
+
+	// Move table
+	if (inst.settings.fix_table_elements) {
+		var patt = '';
+
+		inst.focus();
+		inst.selection.setContent('<br class="_mce_marker" />');
+
+		tinymce.each('h1,h2,h3,h4,h5,h6,p'.split(','), function(n) {
+			if (patt)
+				patt += ',';
+
+			patt += n + ' ._mce_marker';
+		});
+
+		tinymce.each(inst.dom.select(patt), function(n) {
+			inst.dom.split(inst.dom.getParent(n, 'h1,h2,h3,h4,h5,h6,p'), n);
+		});
+
+		dom.setOuterHTML(dom.select('br._mce_marker')[0], html);
+	} else
+		inst.execCommand('mceInsertContent', false, html);
+
+	tinymce.each(dom.select('table[data-mce-new]'), function(node) {
+		var tdorth = dom.select('td,th', node);
+
+		// Fixes a bug in IE where the caret cannot be placed after the table if the table is at the end of the document
+		if (tinymce.isIE && !tinymce.isIE11 && node.nextSibling == null) {
+			if (inst.settings.forced_root_block)
+				dom.insertAfter(dom.create(inst.settings.forced_root_block), node);
+			else
+				dom.insertAfter(dom.create('br', {'data-mce-bogus': '1'}), node);
+		}
+
+		try {
+			// IE9 might fail to do this selection 
+			inst.selection.setCursorLocation(tdorth[0], 0);
+		} catch (ex) {
+			// Ignore
+		}
+
+		dom.setAttrib(node, 'data-mce-new', '');
+	});
+
+	inst.addVisual();
+	inst.execCommand('mceEndUndoLevel', false, {}, {skip_undo: true});
+
+	tinyMCEPopup.close();
+}
+
+function makeAttrib(attrib, value) {
+	var formObj = document.forms[0];
+	var valueElm = formObj.elements[attrib];
+
+	if (typeof(value) == "undefined" || value == null) {
+		value = "";
+
+		if (valueElm)
+			value = valueElm.value;
+	}
+
+	if (value == "")
+		return "";
+
+	// XML encode it
+	value = value.replace(/&/g, '&amp;');
+	value = value.replace(/\"/g, '&quot;');
+	value = value.replace(/</g, '&lt;');
+	value = value.replace(/>/g, '&gt;');
+
+	return ' ' + attrib + '="' + value + '"';
+}
+
+function init() {
+	tinyMCEPopup.resizeToInnerSize();
+
+	document.getElementById('backgroundimagebrowsercontainer').innerHTML = getBrowserHTML('backgroundimagebrowser','backgroundimage','image','table');
+	document.getElementById('backgroundimagebrowsercontainer').innerHTML = getBrowserHTML('backgroundimagebrowser','backgroundimage','image','table');
+	document.getElementById('bordercolor_pickcontainer').innerHTML = getColorPickerHTML('bordercolor_pick','bordercolor');
+	document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor');
+
+	var cols = 2, rows = 2, border = tinyMCEPopup.getParam('table_default_border', '0'), cellpadding = tinyMCEPopup.getParam('table_default_cellpadding', ''), cellspacing = tinyMCEPopup.getParam('table_default_cellspacing', '');
+	var align = "", width = "", height = "", bordercolor = "", bgcolor = "", className = "";
+	var id = "", summary = "", style = "", dir = "", lang = "", background = "", bgcolor = "", bordercolor = "", rules = "", frame = "";
+	var inst = tinyMCEPopup.editor, dom = inst.dom;
+	var formObj = document.forms[0];
+	var elm = dom.getParent(inst.selection.getNode(), "table");
+
+	// Hide advanced fields that isn't available in the schema
+	tinymce.each("summary id rules dir style frame".split(" "), function(name) {
+		var tr = tinyMCEPopup.dom.getParent(name, "tr") || tinyMCEPopup.dom.getParent("t" + name, "tr");
+
+		if (tr && !tinyMCEPopup.editor.schema.isValid("table", name)) {
+			tr.style.display = 'none';
+		}
+	});
+
+	action = tinyMCEPopup.getWindowArg('action');
+
+	if (!action)
+		action = elm ? "update" : "insert";
+
+	if (elm && action != "insert") {
+		var rowsAr = elm.rows;
+		var cols = 0;
+		for (var i=0; i<rowsAr.length; i++)
+			if (rowsAr[i].cells.length > cols)
+				cols = rowsAr[i].cells.length;
+
+		cols = cols;
+		rows = rowsAr.length;
+
+		st = dom.parseStyle(dom.getAttrib(elm, "style"));
+		border = trimSize(getStyle(elm, 'border', 'borderWidth'));
+		cellpadding = dom.getAttrib(elm, 'cellpadding', "");
+		cellspacing = dom.getAttrib(elm, 'cellspacing', "");
+		width = trimSize(getStyle(elm, 'width', 'width'));
+		height = trimSize(getStyle(elm, 'height', 'height'));
+		bordercolor = convertRGBToHex(getStyle(elm, 'bordercolor', 'borderLeftColor'));
+		bgcolor = convertRGBToHex(getStyle(elm, 'bgcolor', 'backgroundColor'));
+		align = dom.getAttrib(elm, 'align', align);
+		frame = dom.getAttrib(elm, 'frame');
+		rules = dom.getAttrib(elm, 'rules');
+		className = tinymce.trim(dom.getAttrib(elm, 'class').replace(/mceItem.+/g, ''));
+		id = dom.getAttrib(elm, 'id');
+		summary = dom.getAttrib(elm, 'summary');
+		style = dom.serializeStyle(st);
+		dir = dom.getAttrib(elm, 'dir');
+		lang = dom.getAttrib(elm, 'lang');
+		background = getStyle(elm, 'background', 'backgroundImage').replace(new RegExp("url\\(['\"]?([^'\"]*)['\"]?\\)", 'gi'), "$1");
+		formObj.caption.checked = elm.getElementsByTagName('caption').length > 0;
+
+		orgTableWidth = width;
+		orgTableHeight = height;
+
+		action = "update";
+		formObj.insert.value = inst.getLang('update');
+	}
+
+	addClassesToList('class', "table_styles");
+	TinyMCE_EditableSelects.init();
+
+	// Update form
+	selectByValue(formObj, 'align', align);
+	selectByValue(formObj, 'tframe', frame);
+	selectByValue(formObj, 'rules', rules);
+	selectByValue(formObj, 'class', className, true, true);
+	formObj.cols.value = cols;
+	formObj.rows.value = rows;
+	formObj.border.value = border;
+	formObj.cellpadding.value = cellpadding;
+	formObj.cellspacing.value = cellspacing;
+	formObj.width.value = width;
+	formObj.height.value = height;
+	formObj.bordercolor.value = bordercolor;
+	formObj.bgcolor.value = bgcolor;
+	formObj.id.value = id;
+	formObj.summary.value = summary;
+	formObj.style.value = style;
+	formObj.dir.value = dir;
+	formObj.lang.value = lang;
+	formObj.backgroundimage.value = background;
+
+	updateColor('bordercolor_pick', 'bordercolor');
+	updateColor('bgcolor_pick', 'bgcolor');
+
+	// Resize some elements
+	if (isVisible('backgroundimagebrowser'))
+		document.getElementById('backgroundimage').style.width = '180px';
+
+	// Disable some fields in update mode
+	if (action == "update") {
+		formObj.cols.disabled = true;
+		formObj.rows.disabled = true;
+	}
+}
+
+function changedSize() {
+	var formObj = document.forms[0];
+	var st = dom.parseStyle(formObj.style.value);
+
+/*	var width = formObj.width.value;
+	if (width != "")
+		st['width'] = tinyMCEPopup.getParam("inline_styles") ? getCSSSize(width) : "";
+	else
+		st['width'] = "";*/
+
+	var height = formObj.height.value;
+	if (height != "")
+		st['height'] = getCSSSize(height);
+	else
+		st['height'] = "";
+
+	formObj.style.value = dom.serializeStyle(st);
+}
+
+function isCssSize(value) {
+	return /^[0-9.]+(%|in|cm|mm|em|ex|pt|pc|px)$/.test(value);
+}
+
+function cssSize(value, def) {
+	value = tinymce.trim(value || def);
+
+	if (!isCssSize(value)) {
+		return parseInt(value, 10) + 'px';
+	}
+
+	return value;
+}
+
+function changedBackgroundImage() {
+	var formObj = document.forms[0];
+	var st = dom.parseStyle(formObj.style.value);
+
+	st['background-image'] = "url('" + formObj.backgroundimage.value + "')";
+
+	formObj.style.value = dom.serializeStyle(st);
+}
+
+function changedBorder() {
+	var formObj = document.forms[0];
+	var st = dom.parseStyle(formObj.style.value);
+
+	// Update border width if the element has a color
+	if (formObj.border.value != "" && (isCssSize(formObj.border.value) || formObj.bordercolor.value != ""))
+		st['border-width'] = cssSize(formObj.border.value);
+	else {
+		if (!formObj.border.value) {
+			st['border'] = '';
+			st['border-width'] = '';
+		}
+	}
+
+	formObj.style.value = dom.serializeStyle(st);
+}
+
+function changedColor() {
+	var formObj = document.forms[0];
+	var st = dom.parseStyle(formObj.style.value);
+
+	st['background-color'] = formObj.bgcolor.value;
+
+	if (formObj.bordercolor.value != "") {
+		st['border-color'] = formObj.bordercolor.value;
+
+		// Add border-width if it's missing
+		if (!st['border-width'])
+			st['border-width'] = cssSize(formObj.border.value, 1);
+	}
+
+	formObj.style.value = dom.serializeStyle(st);
+}
+
+function changedStyle() {
+	var formObj = document.forms[0];
+	var st = dom.parseStyle(formObj.style.value);
+
+	if (st['background-image'])
+		formObj.backgroundimage.value = st['background-image'].replace(new RegExp("url\\(['\"]?([^'\"]*)['\"]?\\)", 'gi'), "$1");
+	else
+		formObj.backgroundimage.value = '';
+
+	if (st['width'])
+		formObj.width.value = trimSize(st['width']);
+
+	if (st['height'])
+		formObj.height.value = trimSize(st['height']);
+
+	if (st['background-color']) {
+		formObj.bgcolor.value = st['background-color'];
+		updateColor('bgcolor_pick','bgcolor');
+	}
+
+	if (st['border-color']) {
+		formObj.bordercolor.value = st['border-color'];
+		updateColor('bordercolor_pick','bordercolor');
+	}
+}
+
+tinyMCEPopup.onInit.add(init);
diff --git a/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/template/editor_plugin_src.js b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/template/editor_plugin_src.js
new file mode 100644
index 0000000..28baed2
--- /dev/null
+++ b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/template/editor_plugin_src.js
@@ -0,0 +1,159 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	var each = tinymce.each;
+
+	tinymce.create('tinymce.plugins.TemplatePlugin', {
+		init : function(ed, url) {
+			var t = this;
+
+			t.editor = ed;
+
+			// Register commands
+			ed.addCommand('mceTemplate', function(ui) {
+				ed.windowManager.open({
+					file : url + '/template.htm',
+					width : ed.getParam('template_popup_width', 750),
+					height : ed.getParam('template_popup_height', 600),
+					inline : 1
+				}, {
+					plugin_url : url
+				});
+			});
+
+			ed.addCommand('mceInsertTemplate', t._insertTemplate, t);
+
+			// Register buttons
+			ed.addButton('template', {title : 'template.desc', cmd : 'mceTemplate'});
+
+			ed.onPreProcess.add(function(ed, o) {
+				var dom = ed.dom;
+
+				each(dom.select('div', o.node), function(e) {
+					if (dom.hasClass(e, 'mceTmpl')) {
+						each(dom.select('*', e), function(e) {
+							if (dom.hasClass(e, ed.getParam('template_mdate_classes', 'mdate').replace(/\s+/g, '|')))
+								e.innerHTML = t._getDateTime(new Date(), ed.getParam("template_mdate_format", ed.getLang("template.mdate_format")));
+						});
+
+						t._replaceVals(e);
+					}
+				});
+			});
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Template plugin',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://www.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/template',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		},
+
+		_insertTemplate : function(ui, v) {
+			var t = this, ed = t.editor, h, el, dom = ed.dom, sel = ed.selection.getContent();
+
+			h = v.content;
+
+			each(t.editor.getParam('template_replace_values'), function(v, k) {
+				if (typeof(v) != 'function')
+					h = h.replace(new RegExp('\\{\\$' + k + '\\}', 'g'), v);
+			});
+
+			el = dom.create('div', null, h);
+
+			// Find template element within div
+			n = dom.select('.mceTmpl', el);
+			if (n && n.length > 0) {
+				el = dom.create('div', null);
+				el.appendChild(n[0].cloneNode(true));
+			}
+
+			function hasClass(n, c) {
+				return new RegExp('\\b' + c + '\\b', 'g').test(n.className);
+			};
+
+			each(dom.select('*', el), function(n) {
+				// Replace cdate
+				if (hasClass(n, ed.getParam('template_cdate_classes', 'cdate').replace(/\s+/g, '|')))
+					n.innerHTML = t._getDateTime(new Date(), ed.getParam("template_cdate_format", ed.getLang("template.cdate_format")));
+
+				// Replace mdate
+				if (hasClass(n, ed.getParam('template_mdate_classes', 'mdate').replace(/\s+/g, '|')))
+					n.innerHTML = t._getDateTime(new Date(), ed.getParam("template_mdate_format", ed.getLang("template.mdate_format")));
+
+				// Replace selection
+				if (hasClass(n, ed.getParam('template_selected_content_classes', 'selcontent').replace(/\s+/g, '|')))
+					n.innerHTML = sel;
+			});
+
+			t._replaceVals(el);
+
+			ed.execCommand('mceInsertContent', false, el.innerHTML);
+			ed.addVisual();
+		},
+
+		_replaceVals : function(e) {
+			var dom = this.editor.dom, vl = this.editor.getParam('template_replace_values');
+
+			each(dom.select('*', e), function(e) {
+				each(vl, function(v, k) {
+					if (dom.hasClass(e, k)) {
+						if (typeof(vl[k]) == 'function')
+							vl[k](e);
+					}
+				});
+			});
+		},
+
+		_getDateTime : function(d, fmt) {
+				if (!fmt)
+					return "";
+
+				function addZeros(value, len) {
+					var i;
+
+					value = "" + value;
+
+					if (value.length < len) {
+						for (i=0; i<(len-value.length); i++)
+							value = "0" + value;
+					}
+
+					return value;
+				}
+
+				fmt = fmt.replace("%D", "%m/%d/%y");
+				fmt = fmt.replace("%r", "%I:%M:%S %p");
+				fmt = fmt.replace("%Y", "" + d.getFullYear());
+				fmt = fmt.replace("%y", "" + d.getYear());
+				fmt = fmt.replace("%m", addZeros(d.getMonth()+1, 2));
+				fmt = fmt.replace("%d", addZeros(d.getDate(), 2));
+				fmt = fmt.replace("%H", "" + addZeros(d.getHours(), 2));
+				fmt = fmt.replace("%M", "" + addZeros(d.getMinutes(), 2));
+				fmt = fmt.replace("%S", "" + addZeros(d.getSeconds(), 2));
+				fmt = fmt.replace("%I", "" + ((d.getHours() + 11) % 12 + 1));
+				fmt = fmt.replace("%p", "" + (d.getHours() < 12 ? "AM" : "PM"));
+				fmt = fmt.replace("%B", "" + this.editor.getLang("template_months_long").split(',')[d.getMonth()]);
+				fmt = fmt.replace("%b", "" + this.editor.getLang("template_months_short").split(',')[d.getMonth()]);
+				fmt = fmt.replace("%A", "" + this.editor.getLang("template_day_long").split(',')[d.getDay()]);
+				fmt = fmt.replace("%a", "" + this.editor.getLang("template_day_short").split(',')[d.getDay()]);
+				fmt = fmt.replace("%%", "%");
+
+				return fmt;
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('template', tinymce.plugins.TemplatePlugin);
+})();
\ No newline at end of file
diff --git a/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/template/js/template.js b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/template/js/template.js
new file mode 100644
index 0000000..673395a
--- /dev/null
+++ b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/template/js/template.js
@@ -0,0 +1,106 @@
+tinyMCEPopup.requireLangPack();
+
+var TemplateDialog = {
+	preInit : function() {
+		var url = tinyMCEPopup.getParam("template_external_list_url");
+
+		if (url != null)
+			document.write('<sc'+'ript language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></sc'+'ript>');
+	},
+
+	init : function() {
+		var ed = tinyMCEPopup.editor, tsrc, sel, x, u;
+
+ 		tsrc = ed.getParam("template_templates", false);
+ 		sel = document.getElementById('tpath');
+
+		// Setup external template list
+		if (!tsrc && typeof(tinyMCETemplateList) != 'undefined') {
+			for (x=0, tsrc = []; x<tinyMCETemplateList.length; x++)
+				tsrc.push({title : tinyMCETemplateList[x][0], src : tinyMCETemplateList[x][1], description : tinyMCETemplateList[x][2]});
+		}
+
+		for (x=0; x<tsrc.length; x++)
+			sel.options[sel.options.length] = new Option(tsrc[x].title, tinyMCEPopup.editor.documentBaseURI.toAbsolute(tsrc[x].src));
+
+		this.resize();
+		this.tsrc = tsrc;
+	},
+
+	resize : function() {
+		var w, h, e;
+
+		if (!self.innerWidth) {
+			w = document.body.clientWidth - 50;
+			h = document.body.clientHeight - 160;
+		} else {
+			w = self.innerWidth - 50;
+			h = self.innerHeight - 170;
+		}
+
+		e = document.getElementById('templatesrc');
+
+		if (e) {
+			e.style.height = Math.abs(h) + 'px';
+			e.style.width = Math.abs(w - 5) + 'px';
+		}
+	},
+
+	loadCSSFiles : function(d) {
+		var ed = tinyMCEPopup.editor;
+
+		tinymce.each(ed.getParam("content_css", '').split(','), function(u) {
+			d.write('<link href="' + ed.documentBaseURI.toAbsolute(u) + '" rel="stylesheet" type="text/css" />');
+		});
+	},
+
+	selectTemplate : function(u, ti) {
+		var d = window.frames['templatesrc'].document, x, tsrc = this.tsrc;
+
+		if (!u)
+			return;
+
+		d.body.innerHTML = this.templateHTML = this.getFileContents(u);
+
+		for (x=0; x<tsrc.length; x++) {
+			if (tsrc[x].title == ti)
+				document.getElementById('tmpldesc').innerHTML = tsrc[x].description || '';
+		}
+	},
+
+ 	insert : function() {
+		tinyMCEPopup.execCommand('mceInsertTemplate', false, {
+			content : this.templateHTML,
+			selection : tinyMCEPopup.editor.selection.getContent()
+		});
+
+		tinyMCEPopup.close();
+	},
+
+	getFileContents : function(u) {
+		var x, d, t = 'text/plain';
+
+		function g(s) {
+			x = 0;
+
+			try {
+				x = new ActiveXObject(s);
+			} catch (s) {
+			}
+
+			return x;
+		};
+
+		x = window.ActiveXObject ? g('Msxml2.XMLHTTP') || g('Microsoft.XMLHTTP') : new XMLHttpRequest();
+
+		// Synchronous AJAX load file
+		x.overrideMimeType && x.overrideMimeType(t);
+		x.open("GET", u, false);
+		x.send(null);
+
+		return x.responseText;
+	}
+};
+
+TemplateDialog.preInit();
+tinyMCEPopup.onInit.add(TemplateDialog.init, TemplateDialog);
diff --git a/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin_src.js b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin_src.js
new file mode 100644
index 0000000..0e3572e
--- /dev/null
+++ b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin_src.js
@@ -0,0 +1,83 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.VisualChars', {
+		init : function(ed, url) {
+			var t = this;
+
+			t.editor = ed;
+
+			// Register commands
+			ed.addCommand('mceVisualChars', t._toggleVisualChars, t);
+
+			// Register buttons
+			ed.addButton('visualchars', {title : 'visualchars.desc', cmd : 'mceVisualChars'});
+
+			ed.onBeforeGetContent.add(function(ed, o) {
+				if (t.state && o.format != 'raw' && !o.draft) {
+					t.state = true;
+					t._toggleVisualChars(false);
+				}
+			});
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Visual characters',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/visualchars',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		},
+
+		// Private methods
+
+		_toggleVisualChars : function(bookmark) {
+			var t = this, ed = t.editor, nl, i, h, d = ed.getDoc(), b = ed.getBody(), nv, s = ed.selection, bo, div, bm;
+
+			t.state = !t.state;
+			ed.controlManager.setActive('visualchars', t.state);
+
+			if (bookmark)
+				bm = s.getBookmark();
+
+			if (t.state) {
+				nl = [];
+				tinymce.walk(b, function(n) {
+					if (n.nodeType == 3 && n.nodeValue && n.nodeValue.indexOf('\u00a0') != -1)
+						nl.push(n);
+				}, 'childNodes');
+
+				for (i = 0; i < nl.length; i++) {
+					nv = nl[i].nodeValue;
+					nv = nv.replace(/(\u00a0)/g, '<span data-mce-bogus="1" class="mceItemHidden mceItemNbsp">$1</span>');
+
+					div = ed.dom.create('div', null, nv);
+					while (node = div.lastChild)
+						ed.dom.insertAfter(node, nl[i]);
+
+					ed.dom.remove(nl[i]);
+				}
+			} else {
+				nl = ed.dom.select('span.mceItemNbsp', b);
+
+				for (i = nl.length - 1; i >= 0; i--)
+					ed.dom.remove(nl[i], 1);
+			}
+
+			s.moveToBookmark(bm);
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('visualchars', tinymce.plugins.VisualChars);
+})();
\ No newline at end of file
diff --git a/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin_src.js b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin_src.js
new file mode 100644
index 0000000..32ac677
--- /dev/null
+++ b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin_src.js
@@ -0,0 +1,122 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.WordCount', {
+		block : 0,
+		id : null,
+		countre : null,
+		cleanre : null,
+
+		init : function(ed, url) {
+			var t = this, last = 0, VK = tinymce.VK;
+
+			t.countre = ed.getParam('wordcount_countregex', /[\w\u2019\u00co-\u00ff^\uc397^u00f7\'-]+/g); // u2019 == &rsquo; u00c0-u00ff extended latin chars with diacritical marks. exclude uc397 multiplication & u00f7 division
+			t.cleanre = ed.getParam('wordcount_cleanregex', /[0-9.(),;:!?%#$?\'\"_+=\\\/-]*/g);
+			t.update_rate = ed.getParam('wordcount_update_rate', 2000);
+			t.update_on_delete = ed.getParam('wordcount_update_on_delete', false);
+			t.id = ed.id + '-word-count';
+
+			ed.onPostRender.add(function(ed, cm) {
+				var row, id;
+
+				// Add it to the specified id or the theme advanced path
+				id = ed.getParam('wordcount_target_id');
+				if (!id) {
+					row = tinymce.DOM.get(ed.id + '_path_row');
+
+					if (row)
+						tinymce.DOM.add(row.parentNode, 'div', {'style': 'float: right'}, ed.getLang('wordcount.words', 'Words: ') + '<span id="' + t.id + '">0</span>');
+				} else {
+					tinymce.DOM.add(id, 'span', {}, '<span id="' + t.id + '">0</span>');
+				}
+			});
+
+			ed.onInit.add(function(ed) {
+				ed.selection.onSetContent.add(function() {
+					t._count(ed);
+				});
+
+				t._count(ed);
+			});
+
+			ed.onSetContent.add(function(ed) {
+				t._count(ed);
+			});
+
+			function checkKeys(key) {
+				return key !== last && (key === VK.ENTER || last === VK.SPACEBAR || checkDelOrBksp(last));
+			}
+
+			function checkDelOrBksp(key) {
+				return key === VK.DELETE || key === VK.BACKSPACE;
+			}
+
+			ed.onKeyUp.add(function(ed, e) {
+				if (checkKeys(e.keyCode) || t.update_on_delete && checkDelOrBksp(e.keyCode)) {
+					t._count(ed);
+				}
+
+				last = e.keyCode;
+			});
+		},
+
+		_getCount : function(ed) {
+			var tc = 0;
+			var tx = ed.getContent({ format: 'raw' });
+
+			if (tx) {
+					tx = tx.replace(/\.\.\./g, ' '); // convert ellipses to spaces
+					tx = tx.replace(/<.[^<>]*?>/g, ' ').replace(/&nbsp;|&#160;/gi, ' '); // remove html tags and space chars
+
+					// deal with html entities
+					tx = tx.replace(/(\w+)(&.+?;)+(\w+)/, "$1$3").replace(/&.+?;/g, ' ');
+					tx = tx.replace(this.cleanre, ''); // remove numbers and punctuation
+
+					var wordArray = tx.match(this.countre);
+					if (wordArray) {
+							tc = wordArray.length;
+					}
+			}
+
+			return tc;
+		},
+
+		_count : function(ed) {
+			var t = this;
+
+			// Keep multiple calls from happening at the same time
+			if (t.block)
+				return;
+
+			t.block = 1;
+
+			setTimeout(function() {
+				if (!ed.destroyed) {
+					var tc = t._getCount(ed);
+					tinymce.DOM.setHTML(t.id, tc.toString());
+					setTimeout(function() {t.block = 0;}, t.update_rate);
+				}
+			}, 1);
+		},
+
+		getInfo: function() {
+			return {
+				longname : 'Word Count plugin',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/wordcount',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		}
+	});
+
+	tinymce.PluginManager.add('wordcount', tinymce.plugins.WordCount);
+})();
diff --git a/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/attributes.js b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/attributes.js
new file mode 100644
index 0000000..9e9b07e
--- /dev/null
+++ b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/attributes.js
@@ -0,0 +1,111 @@
+/**
+ * attributes.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+function init() {
+	tinyMCEPopup.resizeToInnerSize();
+	var inst = tinyMCEPopup.editor;
+	var dom = inst.dom;
+	var elm = inst.selection.getNode();
+	var f = document.forms[0];
+	var onclick = dom.getAttrib(elm, 'onclick');
+
+	setFormValue('title', dom.getAttrib(elm, 'title'));
+	setFormValue('id', dom.getAttrib(elm, 'id'));
+	setFormValue('style', dom.getAttrib(elm, "style"));
+	setFormValue('dir', dom.getAttrib(elm, 'dir'));
+	setFormValue('lang', dom.getAttrib(elm, 'lang'));
+	setFormValue('tabindex', dom.getAttrib(elm, 'tabindex', typeof(elm.tabindex) != "undefined" ? elm.tabindex : ""));
+	setFormValue('accesskey', dom.getAttrib(elm, 'accesskey', typeof(elm.accesskey) != "undefined" ? elm.accesskey : ""));
+	setFormValue('onfocus', dom.getAttrib(elm, 'onfocus'));
+	setFormValue('onblur', dom.getAttrib(elm, 'onblur'));
+	setFormValue('onclick', onclick);
+	setFormValue('ondblclick', dom.getAttrib(elm, 'ondblclick'));
+	setFormValue('onmousedown', dom.getAttrib(elm, 'onmousedown'));
+	setFormValue('onmouseup', dom.getAttrib(elm, 'onmouseup'));
+	setFormValue('onmouseover', dom.getAttrib(elm, 'onmouseover'));
+	setFormValue('onmousemove', dom.getAttrib(elm, 'onmousemove'));
+	setFormValue('onmouseout', dom.getAttrib(elm, 'onmouseout'));
+	setFormValue('onkeypress', dom.getAttrib(elm, 'onkeypress'));
+	setFormValue('onkeydown', dom.getAttrib(elm, 'onkeydown'));
+	setFormValue('onkeyup', dom.getAttrib(elm, 'onkeyup'));
+	className = dom.getAttrib(elm, 'class');
+
+	addClassesToList('classlist', 'advlink_styles');
+	selectByValue(f, 'classlist', className, true);
+
+	TinyMCE_EditableSelects.init();
+}
+
+function setFormValue(name, value) {
+	if(value && document.forms[0].elements[name]){
+		document.forms[0].elements[name].value = value;
+	}
+}
+
+function insertAction() {
+	var inst = tinyMCEPopup.editor;
+	var elm = inst.selection.getNode();
+
+	setAllAttribs(elm);
+	tinyMCEPopup.execCommand("mceEndUndoLevel");
+	tinyMCEPopup.close();
+}
+
+function setAttrib(elm, attrib, value) {
+	var formObj = document.forms[0];
+	var valueElm = formObj.elements[attrib.toLowerCase()];
+	var inst = tinyMCEPopup.editor;
+	var dom = inst.dom;
+
+	if (typeof(value) == "undefined" || value == null) {
+		value = "";
+
+		if (valueElm)
+			value = valueElm.value;
+	}
+
+	dom.setAttrib(elm, attrib.toLowerCase(), value);
+}
+
+function setAllAttribs(elm) {
+	var f = document.forms[0];
+
+	setAttrib(elm, 'title');
+	setAttrib(elm, 'id');
+	setAttrib(elm, 'style');
+	setAttrib(elm, 'class', getSelectValue(f, 'classlist'));
+	setAttrib(elm, 'dir');
+	setAttrib(elm, 'lang');
+	setAttrib(elm, 'tabindex');
+	setAttrib(elm, 'accesskey');
+	setAttrib(elm, 'onfocus');
+	setAttrib(elm, 'onblur');
+	setAttrib(elm, 'onclick');
+	setAttrib(elm, 'ondblclick');
+	setAttrib(elm, 'onmousedown');
+	setAttrib(elm, 'onmouseup');
+	setAttrib(elm, 'onmouseover');
+	setAttrib(elm, 'onmousemove');
+	setAttrib(elm, 'onmouseout');
+	setAttrib(elm, 'onkeypress');
+	setAttrib(elm, 'onkeydown');
+	setAttrib(elm, 'onkeyup');
+
+	// Refresh in old MSIE
+//	if (tinyMCE.isMSIE5)
+//		elm.outerHTML = elm.outerHTML;
+}
+
+function insertAttribute() {
+	tinyMCEPopup.close();
+}
+
+tinyMCEPopup.onInit.add(init);
+tinyMCEPopup.requireLangPack();
diff --git a/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/element_common.js b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/element_common.js
new file mode 100644
index 0000000..6df1b77
--- /dev/null
+++ b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/element_common.js
@@ -0,0 +1,229 @@
+/**
+ * element_common.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+tinyMCEPopup.requireLangPack();
+
+function initCommonAttributes(elm) {
+	var formObj = document.forms[0], dom = tinyMCEPopup.editor.dom;
+
+	// Setup form data for common element attributes
+	setFormValue('title', dom.getAttrib(elm, 'title'));
+	setFormValue('id', dom.getAttrib(elm, 'id'));
+	selectByValue(formObj, 'class', dom.getAttrib(elm, 'class'), true);
+	setFormValue('style', dom.getAttrib(elm, 'style'));
+	selectByValue(formObj, 'dir', dom.getAttrib(elm, 'dir'));
+	setFormValue('lang', dom.getAttrib(elm, 'lang'));
+	setFormValue('onfocus', dom.getAttrib(elm, 'onfocus'));
+	setFormValue('onblur', dom.getAttrib(elm, 'onblur'));
+	setFormValue('onclick', dom.getAttrib(elm, 'onclick'));
+	setFormValue('ondblclick', dom.getAttrib(elm, 'ondblclick'));
+	setFormValue('onmousedown', dom.getAttrib(elm, 'onmousedown'));
+	setFormValue('onmouseup', dom.getAttrib(elm, 'onmouseup'));
+	setFormValue('onmouseover', dom.getAttrib(elm, 'onmouseover'));
+	setFormValue('onmousemove', dom.getAttrib(elm, 'onmousemove'));
+	setFormValue('onmouseout', dom.getAttrib(elm, 'onmouseout'));
+	setFormValue('onkeypress', dom.getAttrib(elm, 'onkeypress'));
+	setFormValue('onkeydown', dom.getAttrib(elm, 'onkeydown'));
+	setFormValue('onkeyup', dom.getAttrib(elm, 'onkeyup'));
+}
+
+function setFormValue(name, value) {
+	if(document.forms[0].elements[name]) document.forms[0].elements[name].value = value;
+}
+
+function insertDateTime(id) {
+	document.getElementById(id).value = getDateTime(new Date(), "%Y-%m-%dT%H:%M:%S");
+}
+
+function getDateTime(d, fmt) {
+	fmt = fmt.replace("%D", "%m/%d/%y");
+	fmt = fmt.replace("%r", "%I:%M:%S %p");
+	fmt = fmt.replace("%Y", "" + d.getFullYear());
+	fmt = fmt.replace("%y", "" + d.getYear());
+	fmt = fmt.replace("%m", addZeros(d.getMonth()+1, 2));
+	fmt = fmt.replace("%d", addZeros(d.getDate(), 2));
+	fmt = fmt.replace("%H", "" + addZeros(d.getHours(), 2));
+	fmt = fmt.replace("%M", "" + addZeros(d.getMinutes(), 2));
+	fmt = fmt.replace("%S", "" + addZeros(d.getSeconds(), 2));
+	fmt = fmt.replace("%I", "" + ((d.getHours() + 11) % 12 + 1));
+	fmt = fmt.replace("%p", "" + (d.getHours() < 12 ? "AM" : "PM"));
+	fmt = fmt.replace("%%", "%");
+
+	return fmt;
+}
+
+function addZeros(value, len) {
+	var i;
+
+	value = "" + value;
+
+	if (value.length < len) {
+		for (i=0; i<(len-value.length); i++)
+			value = "0" + value;
+	}
+
+	return value;
+}
+
+function selectByValue(form_obj, field_name, value, add_custom, ignore_case) {
+	if (!form_obj || !form_obj.elements[field_name])
+		return;
+
+	var sel = form_obj.elements[field_name];
+
+	var found = false;
+	for (var i=0; i<sel.options.length; i++) {
+		var option = sel.options[i];
+
+		if (option.value == value || (ignore_case && option.value.toLowerCase() == value.toLowerCase())) {
+			option.selected = true;
+			found = true;
+		} else
+			option.selected = false;
+	}
+
+	if (!found && add_custom && value != '') {
+		var option = new Option('Value: ' + value, value);
+		option.selected = true;
+		sel.options[sel.options.length] = option;
+	}
+
+	return found;
+}
+
+function setAttrib(elm, attrib, value) {
+	var formObj = document.forms[0];
+	var valueElm = formObj.elements[attrib.toLowerCase()];
+	tinyMCEPopup.editor.dom.setAttrib(elm, attrib, value || valueElm.value);
+}
+
+function setAllCommonAttribs(elm) {
+	setAttrib(elm, 'title');
+	setAttrib(elm, 'id');
+	setAttrib(elm, 'class');
+	setAttrib(elm, 'style');
+	setAttrib(elm, 'dir');
+	setAttrib(elm, 'lang');
+	/*setAttrib(elm, 'onfocus');
+	setAttrib(elm, 'onblur');
+	setAttrib(elm, 'onclick');
+	setAttrib(elm, 'ondblclick');
+	setAttrib(elm, 'onmousedown');
+	setAttrib(elm, 'onmouseup');
+	setAttrib(elm, 'onmouseover');
+	setAttrib(elm, 'onmousemove');
+	setAttrib(elm, 'onmouseout');
+	setAttrib(elm, 'onkeypress');
+	setAttrib(elm, 'onkeydown');
+	setAttrib(elm, 'onkeyup');*/
+}
+
+SXE = {
+	currentAction : "insert",
+	inst : tinyMCEPopup.editor,
+	updateElement : null
+}
+
+SXE.focusElement = SXE.inst.selection.getNode();
+
+SXE.initElementDialog = function(element_name) {
+	addClassesToList('class', 'xhtmlxtras_styles');
+	TinyMCE_EditableSelects.init();
+
+	element_name = element_name.toLowerCase();
+	var elm = SXE.inst.dom.getParent(SXE.focusElement, element_name.toUpperCase());
+	if (elm != null && elm.nodeName.toUpperCase() == element_name.toUpperCase()) {
+		SXE.currentAction = "update";
+	}
+
+	if (SXE.currentAction == "update") {
+		initCommonAttributes(elm);
+		SXE.updateElement = elm;
+	}
+
+	document.forms[0].insert.value = tinyMCEPopup.getLang(SXE.currentAction, 'Insert', true); 
+}
+
+SXE.insertElement = function(element_name) {
+	var elm = SXE.inst.dom.getParent(SXE.focusElement, element_name.toUpperCase()), h, tagName;
+
+	if (elm == null) {
+		var s = SXE.inst.selection.getContent();
+		if(s.length > 0) {
+			tagName = element_name;
+
+			insertInlineElement(element_name);
+			var elementArray = tinymce.grep(SXE.inst.dom.select(element_name));
+			for (var i=0; i<elementArray.length; i++) {
+				var elm = elementArray[i];
+
+				if (SXE.inst.dom.getAttrib(elm, 'data-mce-new')) {
+					elm.id = '';
+					elm.setAttribute('id', '');
+					elm.removeAttribute('id');
+					elm.removeAttribute('data-mce-new');
+
+					setAllCommonAttribs(elm);
+				}
+			}
+		}
+	} else {
+		setAllCommonAttribs(elm);
+	}
+	SXE.inst.nodeChanged();
+	tinyMCEPopup.execCommand('mceEndUndoLevel');
+}
+
+SXE.removeElement = function(element_name){
+	element_name = element_name.toLowerCase();
+	elm = SXE.inst.dom.getParent(SXE.focusElement, element_name.toUpperCase());
+	if(elm && elm.nodeName.toUpperCase() == element_name.toUpperCase()){
+		tinyMCE.execCommand('mceRemoveNode', false, elm);
+		SXE.inst.nodeChanged();
+		tinyMCEPopup.execCommand('mceEndUndoLevel');
+	}
+}
+
+SXE.showRemoveButton = function() {
+		document.getElementById("remove").style.display = '';
+}
+
+SXE.containsClass = function(elm,cl) {
+	return (elm.className.indexOf(cl) > -1) ? true : false;
+}
+
+SXE.removeClass = function(elm,cl) {
+	if(elm.className == null || elm.className == "" || !SXE.containsClass(elm,cl)) {
+		return true;
+	}
+	var classNames = elm.className.split(" ");
+	var newClassNames = "";
+	for (var x = 0, cnl = classNames.length; x < cnl; x++) {
+		if (classNames[x] != cl) {
+			newClassNames += (classNames[x] + " ");
+		}
+	}
+	elm.className = newClassNames.substring(0,newClassNames.length-1); //removes extra space at the end
+}
+
+SXE.addClass = function(elm,cl) {
+	if(!SXE.containsClass(elm,cl)) elm.className ? elm.className += " " + cl : elm.className = cl;
+	return true;
+}
+
+function insertInlineElement(en) {
+	var ed = tinyMCEPopup.editor, dom = ed.dom;
+
+	ed.getDoc().execCommand('FontName', false, 'mceinline');
+	tinymce.each(dom.select('span,font'), function(n) {
+		if (n.style.fontFamily == 'mceinline' || n.face == 'mceinline')
+			dom.replace(dom.create(en, {'data-mce-new' : 1}), n, 1);
+	});
+}
diff --git a/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/themes/advanced/editor_template_src.js b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/themes/advanced/editor_template_src.js
new file mode 100644
index 0000000..84039ce
--- /dev/null
+++ b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/themes/advanced/editor_template_src.js
@@ -0,0 +1,1490 @@
+/**
+ * editor_template_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function(tinymce) {
+	var DOM = tinymce.DOM, Event = tinymce.dom.Event, extend = tinymce.extend, each = tinymce.each, Cookie = tinymce.util.Cookie, lastExtID, explode = tinymce.explode;
+
+	// Generates a preview for a format
+	function getPreviewCss(ed, fmt) {
+		var name, previewElm, dom = ed.dom, previewCss = '', parentFontSize, previewStylesName;
+
+		previewStyles = ed.settings.preview_styles;
+
+		// No preview forced
+		if (previewStyles === false)
+			return '';
+
+		// Default preview
+		if (!previewStyles)
+			previewStyles = 'font-family font-size font-weight text-decoration text-transform color background-color';
+
+		// Removes any variables since these can't be previewed
+		function removeVars(val) {
+			return val.replace(/%(\w+)/g, '');
+		};
+
+		// Create block/inline element to use for preview
+		name = fmt.block || fmt.inline || 'span';
+		previewElm = dom.create(name);
+
+		// Add format styles to preview element
+		each(fmt.styles, function(value, name) {
+			value = removeVars(value);
+
+			if (value)
+				dom.setStyle(previewElm, name, value);
+		});
+
+		// Add attributes to preview element
+		each(fmt.attributes, function(value, name) {
+			value = removeVars(value);
+
+			if (value)
+				dom.setAttrib(previewElm, name, value);
+		});
+
+		// Add classes to preview element
+		each(fmt.classes, function(value) {
+			value = removeVars(value);
+
+			if (!dom.hasClass(previewElm, value))
+				dom.addClass(previewElm, value);
+		});
+
+		// Add the previewElm outside the visual area
+		dom.setStyles(previewElm, {position: 'absolute', left: -0xFFFF});
+		ed.getBody().appendChild(previewElm);
+
+		// Get parent container font size so we can compute px values out of em/% for older IE:s
+		parentFontSize = dom.getStyle(ed.getBody(), 'fontSize', true);
+		parentFontSize = /px$/.test(parentFontSize) ? parseInt(parentFontSize, 10) : 0;
+
+		each(previewStyles.split(' '), function(name) {
+			var value = dom.getStyle(previewElm, name, true);
+
+			// If background is transparent then check if the body has a background color we can use
+			if (name == 'background-color' && /transparent|rgba\s*\([^)]+,\s*0\)/.test(value)) {
+				value = dom.getStyle(ed.getBody(), name, true);
+
+				// Ignore white since it's the default color, not the nicest fix
+				if (dom.toHex(value).toLowerCase() == '#ffffff') {
+					return;
+				}
+			}
+
+			// Old IE won't calculate the font size so we need to do that manually
+			if (name == 'font-size') {
+				if (/em|%$/.test(value)) {
+					if (parentFontSize === 0) {
+						return;
+					}
+
+					// Convert font size from em/% to px
+					value = parseFloat(value, 10) / (/%$/.test(value) ? 100 : 1);
+					value = (value * parentFontSize) + 'px';
+				}
+			}
+
+			previewCss += name + ':' + value + ';';
+		});
+
+		dom.remove(previewElm);
+
+		return previewCss;
+	};
+
+	// Tell it to load theme specific language pack(s)
+	tinymce.ThemeManager.requireLangPack('advanced');
+
+	tinymce.create('tinymce.themes.AdvancedTheme', {
+		sizes : [8, 10, 12, 14, 18, 24, 36],
+
+		// Control name lookup, format: title, command
+		controls : {
+			bold : ['bold_desc', 'Bold'],
+			italic : ['italic_desc', 'Italic'],
+			underline : ['underline_desc', 'Underline'],
+			strikethrough : ['striketrough_desc', 'Strikethrough'],
+			justifyleft : ['justifyleft_desc', 'JustifyLeft'],
+			justifycenter : ['justifycenter_desc', 'JustifyCenter'],
+			justifyright : ['justifyright_desc', 'JustifyRight'],
+			justifyfull : ['justifyfull_desc', 'JustifyFull'],
+			bullist : ['bullist_desc', 'InsertUnorderedList'],
+			numlist : ['numlist_desc', 'InsertOrderedList'],
+			outdent : ['outdent_desc', 'Outdent'],
+			indent : ['indent_desc', 'Indent'],
+			cut : ['cut_desc', 'Cut'],
+			copy : ['copy_desc', 'Copy'],
+			paste : ['paste_desc', 'Paste'],
+			undo : ['undo_desc', 'Undo'],
+			redo : ['redo_desc', 'Redo'],
+			link : ['link_desc', 'mceLink'],
+			unlink : ['unlink_desc', 'unlink'],
+			image : ['image_desc', 'mceImage'],
+			cleanup : ['cleanup_desc', 'mceCleanup'],
+			help : ['help_desc', 'mceHelp'],
+			code : ['code_desc', 'mceCodeEditor'],
+			hr : ['hr_desc', 'InsertHorizontalRule'],
+			removeformat : ['removeformat_desc', 'RemoveFormat'],
+			sub : ['sub_desc', 'subscript'],
+			sup : ['sup_desc', 'superscript'],
+			forecolor : ['forecolor_desc', 'ForeColor'],
+			forecolorpicker : ['forecolor_desc', 'mceForeColor'],
+			backcolor : ['backcolor_desc', 'HiliteColor'],
+			backcolorpicker : ['backcolor_desc', 'mceBackColor'],
+			charmap : ['charmap_desc', 'mceCharMap'],
+			visualaid : ['visualaid_desc', 'mceToggleVisualAid'],
+			anchor : ['anchor_desc', 'mceInsertAnchor'],
+			newdocument : ['newdocument_desc', 'mceNewDocument'],
+			blockquote : ['blockquote_desc', 'mceBlockQuote']
+		},
+
+		stateControls : ['bold', 'italic', 'underline', 'strikethrough', 'bullist', 'numlist', 'justifyleft', 'justifycenter', 'justifyright', 'justifyfull', 'sub', 'sup', 'blockquote'],
+
+		init : function(ed, url) {
+			var t = this, s, v, o;
+
+			t.editor = ed;
+			t.url = url;
+			t.onResolveName = new tinymce.util.Dispatcher(this);
+			s = ed.settings;
+
+			ed.forcedHighContrastMode = ed.settings.detect_highcontrast && t._isHighContrast();
+			ed.settings.skin = ed.forcedHighContrastMode ? 'highcontrast' : ed.settings.skin;
+
+			// Setup default buttons
+			if (!s.theme_advanced_buttons1) {
+				s = extend({
+					theme_advanced_buttons1 : "bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,styleselect,formatselect",
+					theme_advanced_buttons2 : "bullist,numlist,|,outdent,indent,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code",
+					theme_advanced_buttons3 : "hr,removeformat,visualaid,|,sub,sup,|,charmap"
+				}, s);
+			}
+
+			// Default settings
+			t.settings = s = extend({
+				theme_advanced_path : true,
+				theme_advanced_toolbar_location : 'top',
+				theme_advanced_blockformats : "p,address,pre,h1,h2,h3,h4,h5,h6",
+				theme_advanced_toolbar_align : "left",
+				theme_advanced_statusbar_location : "bottom",
+				theme_advanced_fonts : "Andale Mono=andale mono,times;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier;Georgia=georgia,palatino;Helvetica=helvetica;Impact=impact,chicago;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco;Times New Roman=times new roman,times;Trebuchet MS=trebuchet ms,geneva;Verdana=verdana,geneva;Webdings=webdings;Wingdings=wingdings,zapf dingbats",
+				theme_advanced_more_colors : 1,
+				theme_advanced_row_height : 23,
+				theme_advanced_resize_horizontal : 1,
+				theme_advanced_resizing_use_cookie : 1,
+				theme_advanced_font_sizes : "1,2,3,4,5,6,7",
+				theme_advanced_font_selector : "span",
+				theme_advanced_show_current_color: 0,
+				readonly : ed.settings.readonly
+			}, s);
+
+			// Setup default font_size_style_values
+			if (!s.font_size_style_values)
+				s.font_size_style_values = "8pt,10pt,12pt,14pt,18pt,24pt,36pt";
+
+			if (tinymce.is(s.theme_advanced_font_sizes, 'string')) {
+				s.font_size_style_values = tinymce.explode(s.font_size_style_values);
+				s.font_size_classes = tinymce.explode(s.font_size_classes || '');
+
+				// Parse string value
+				o = {};
+				ed.settings.theme_advanced_font_sizes = s.theme_advanced_font_sizes;
+				each(ed.getParam('theme_advanced_font_sizes', '', 'hash'), function(v, k) {
+					var cl;
+
+					if (k == v && v >= 1 && v <= 7) {
+						k = v + ' (' + t.sizes[v - 1] + 'pt)';
+						cl = s.font_size_classes[v - 1];
+						v = s.font_size_style_values[v - 1] || (t.sizes[v - 1] + 'pt');
+					}
+
+					if (/^\s*\./.test(v))
+						cl = v.replace(/\./g, '');
+
+					o[k] = cl ? {'class' : cl} : {fontSize : v};
+				});
+
+				s.theme_advanced_font_sizes = o;
+			}
+
+			if ((v = s.theme_advanced_path_location) && v != 'none')
+				s.theme_advanced_statusbar_location = s.theme_advanced_path_location;
+
+			if (s.theme_advanced_statusbar_location == 'none')
+				s.theme_advanced_statusbar_location = 0;
+
+			if (ed.settings.content_css !== false)
+				ed.contentCSS.push(ed.baseURI.toAbsolute(url + "/skins/" + ed.settings.skin + "/content.css"));
+
+			// Init editor
+			ed.onInit.add(function() {
+				if (!ed.settings.readonly) {
+					ed.onNodeChange.add(t._nodeChanged, t);
+					ed.onKeyUp.add(t._updateUndoStatus, t);
+					ed.onMouseUp.add(t._updateUndoStatus, t);
+					ed.dom.bind(ed.dom.getRoot(), 'dragend', function() {
+						t._updateUndoStatus(ed);
+					});
+				}
+			});
+
+			ed.onSetProgressState.add(function(ed, b, ti) {
+				var co, id = ed.id, tb;
+
+				if (b) {
+					t.progressTimer = setTimeout(function() {
+						co = ed.getContainer();
+						co = co.insertBefore(DOM.create('DIV', {style : 'position:relative'}), co.firstChild);
+						tb = DOM.get(ed.id + '_tbl');
+
+						DOM.add(co, 'div', {id : id + '_blocker', 'class' : 'mceBlocker', style : {width : tb.clientWidth + 2, height : tb.clientHeight + 2}});
+						DOM.add(co, 'div', {id : id + '_progress', 'class' : 'mceProgress', style : {left : tb.clientWidth / 2, top : tb.clientHeight / 2}});
+					}, ti || 0);
+				} else {
+					DOM.remove(id + '_blocker');
+					DOM.remove(id + '_progress');
+					clearTimeout(t.progressTimer);
+				}
+			});
+
+			DOM.loadCSS(s.editor_css ? ed.documentBaseURI.toAbsolute(s.editor_css) : url + "/skins/" + ed.settings.skin + "/ui.css");
+
+			if (s.skin_variant)
+				DOM.loadCSS(url + "/skins/" + ed.settings.skin + "/ui_" + s.skin_variant + ".css");
+		},
+
+		_isHighContrast : function() {
+			var actualColor, div = DOM.add(DOM.getRoot(), 'div', {'style': 'background-color: rgb(171,239,86);'});
+
+			actualColor = (DOM.getStyle(div, 'background-color', true) + '').toLowerCase().replace(/ /g, '');
+			DOM.remove(div);
+
+			return actualColor != 'rgb(171,239,86)' && actualColor != '#abef56';
+		},
+
+		createControl : function(n, cf) {
+			var cd, c;
+
+			if (c = cf.createControl(n))
+				return c;
+
+			switch (n) {
+				case "styleselect":
+					return this._createStyleSelect();
+
+				case "formatselect":
+					return this._createBlockFormats();
+
+				case "fontselect":
+					return this._createFontSelect();
+
+				case "fontsizeselect":
+					return this._createFontSizeSelect();
+
+				case "forecolor":
+					return this._createForeColorMenu();
+
+				case "backcolor":
+					return this._createBackColorMenu();
+			}
+
+			if ((cd = this.controls[n]))
+				return cf.createButton(n, {title : "advanced." + cd[0], cmd : cd[1], ui : cd[2], value : cd[3]});
+		},
+
+		execCommand : function(cmd, ui, val) {
+			var f = this['_' + cmd];
+
+			if (f) {
+				f.call(this, ui, val);
+				return true;
+			}
+
+			return false;
+		},
+
+		_importClasses : function(e) {
+			var ed = this.editor, ctrl = ed.controlManager.get('styleselect');
+
+			if (ctrl.getLength() == 0) {
+				each(ed.dom.getClasses(), function(o, idx) {
+					var name = 'style_' + idx, fmt;
+
+					fmt = {
+						inline : 'span',
+						attributes : {'class' : o['class']},
+						selector : '*'
+					};
+
+					ed.formatter.register(name, fmt);
+
+					ctrl.add(o['class'], name, {
+						style: function() {
+							return getPreviewCss(ed, fmt);
+						}
+					});
+				});
+			}
+		},
+
+		_createStyleSelect : function(n) {
+			var t = this, ed = t.editor, ctrlMan = ed.controlManager, ctrl;
+
+			// Setup style select box
+			ctrl = ctrlMan.createListBox('styleselect', {
+				title : 'advanced.style_select',
+				onselect : function(name) {
+					var matches, formatNames = [], removedFormat;
+
+					each(ctrl.items, function(item) {
+						formatNames.push(item.value);
+					});
+
+					ed.focus();
+					ed.undoManager.add();
+
+					// Toggle off the current format(s)
+					matches = ed.formatter.matchAll(formatNames);
+					tinymce.each(matches, function(match) {
+						if (!name || match == name) {
+							if (match)
+								ed.formatter.remove(match);
+
+							removedFormat = true;
+						}
+					});
+
+					if (!removedFormat)
+						ed.formatter.apply(name);
+
+					ed.undoManager.add();
+					ed.nodeChanged();
+
+					return false; // No auto select
+				}
+			});
+
+			// Handle specified format
+			ed.onPreInit.add(function() {
+				var counter = 0, formats = ed.getParam('style_formats');
+
+				if (formats) {
+					each(formats, function(fmt) {
+						var name, keys = 0;
+
+						each(fmt, function() {keys++;});
+
+						if (keys > 1) {
+							name = fmt.name = fmt.name || 'style_' + (counter++);
+							ed.formatter.register(name, fmt);
+							ctrl.add(fmt.title, name, {
+								style: function() {
+									return getPreviewCss(ed, fmt);
+								}
+							});
+						} else
+							ctrl.add(fmt.title);
+					});
+				} else {
+					each(ed.getParam('theme_advanced_styles', '', 'hash'), function(val, key) {
+						var name, fmt;
+
+						if (val) {
+							name = 'style_' + (counter++);
+							fmt = {
+								inline : 'span',
+								classes : val,
+								selector : '*'
+							};
+
+							ed.formatter.register(name, fmt);
+							ctrl.add(t.editor.translate(key), name, {
+								style: function() {
+									return getPreviewCss(ed, fmt);
+								}
+							});
+						}
+					});
+				}
+			});
+
+			// Auto import classes if the ctrl box is empty
+			if (ctrl.getLength() == 0) {
+				ctrl.onPostRender.add(function(ed, n) {
+					if (!ctrl.NativeListBox) {
+						Event.add(n.id + '_text', 'focus', t._importClasses, t);
+						Event.add(n.id + '_text', 'mousedown', t._importClasses, t);
+						Event.add(n.id + '_open', 'focus', t._importClasses, t);
+						Event.add(n.id + '_open', 'mousedown', t._importClasses, t);
+					} else
+						Event.add(n.id, 'focus', t._importClasses, t);
+				});
+			}
+
+			return ctrl;
+		},
+
+		_createFontSelect : function() {
+			var c, t = this, ed = t.editor;
+
+			c = ed.controlManager.createListBox('fontselect', {
+				title : 'advanced.fontdefault',
+				onselect : function(v) {
+					var cur = c.items[c.selectedIndex];
+
+					if (!v && cur) {
+						ed.execCommand('FontName', false, cur.value);
+						return;
+					}
+
+					ed.execCommand('FontName', false, v);
+
+					// Fake selection, execCommand will fire a nodeChange and update the selection
+					c.select(function(sv) {
+						return v == sv;
+					});
+
+					if (cur && cur.value == v) {
+						c.select(null);
+					}
+
+					return false; // No auto select
+				}
+			});
+
+			if (c) {
+				each(ed.getParam('theme_advanced_fonts', t.settings.theme_advanced_fonts, 'hash'), function(v, k) {
+					c.add(ed.translate(k), v, {style : v.indexOf('dings') == -1 ? 'font-family:' + v : ''});
+				});
+			}
+
+			return c;
+		},
+
+		_createFontSizeSelect : function() {
+			var t = this, ed = t.editor, c, i = 0, cl = [];
+
+			c = ed.controlManager.createListBox('fontsizeselect', {title : 'advanced.font_size', onselect : function(v) {
+				var cur = c.items[c.selectedIndex];
+
+				if (!v && cur) {
+					cur = cur.value;
+
+					if (cur['class']) {
+						ed.formatter.toggle('fontsize_class', {value : cur['class']});
+						ed.undoManager.add();
+						ed.nodeChanged();
+					} else {
+						ed.execCommand('FontSize', false, cur.fontSize);
+					}
+
+					return;
+				}
+
+				if (v['class']) {
+					ed.focus();
+					ed.undoManager.add();
+					ed.formatter.toggle('fontsize_class', {value : v['class']});
+					ed.undoManager.add();
+					ed.nodeChanged();
+				} else
+					ed.execCommand('FontSize', false, v.fontSize);
+
+				// Fake selection, execCommand will fire a nodeChange and update the selection
+				c.select(function(sv) {
+					return v == sv;
+				});
+
+				if (cur && (cur.value.fontSize == v.fontSize || cur.value['class'] && cur.value['class'] == v['class'])) {
+					c.select(null);
+				}
+
+				return false; // No auto select
+			}});
+
+			if (c) {
+				each(t.settings.theme_advanced_font_sizes, function(v, k) {
+					var fz = v.fontSize;
+
+					if (fz >= 1 && fz <= 7)
+						fz = t.sizes[parseInt(fz) - 1] + 'pt';
+
+					c.add(k, v, {'style' : 'font-size:' + fz, 'class' : 'mceFontSize' + (i++) + (' ' + (v['class'] || ''))});
+				});
+			}
+
+			return c;
+		},
+
+		_createBlockFormats : function() {
+			var c, fmts = {
+				p : 'advanced.paragraph',
+				address : 'advanced.address',
+				pre : 'advanced.pre',
+				h1 : 'advanced.h1',
+				h2 : 'advanced.h2',
+				h3 : 'advanced.h3',
+				h4 : 'advanced.h4',
+				h5 : 'advanced.h5',
+				h6 : 'advanced.h6',
+				div : 'advanced.div',
+				blockquote : 'advanced.blockquote',
+				code : 'advanced.code',
+				dt : 'advanced.dt',
+				dd : 'advanced.dd',
+				samp : 'advanced.samp'
+			}, t = this;
+
+			c = t.editor.controlManager.createListBox('formatselect', {title : 'advanced.block', onselect : function(v) {
+				t.editor.execCommand('FormatBlock', false, v);
+				return false;
+			}});
+
+			if (c) {
+				each(t.editor.getParam('theme_advanced_blockformats', t.settings.theme_advanced_blockformats, 'hash'), function(v, k) {
+					c.add(t.editor.translate(k != v ? k : fmts[v]), v, {'class' : 'mce_formatPreview mce_' + v, style: function() {
+						return getPreviewCss(t.editor, {block: v});
+					}});
+				});
+			}
+
+			return c;
+		},
+
+		_createForeColorMenu : function() {
+			var c, t = this, s = t.settings, o = {}, v;
+
+			if (s.theme_advanced_more_colors) {
+				o.more_colors_func = function() {
+					t._mceColorPicker(0, {
+						color : c.value,
+						func : function(co) {
+							c.setColor(co);
+						}
+					});
+				};
+			}
+
+			if (v = s.theme_advanced_text_colors)
+				o.colors = v;
+
+			if (s.theme_advanced_default_foreground_color)
+				o.default_color = s.theme_advanced_default_foreground_color;
+
+			o.title = 'advanced.forecolor_desc';
+			o.cmd = 'ForeColor';
+			o.scope = this;
+
+			c = t.editor.controlManager.createColorSplitButton('forecolor', o);
+
+			return c;
+		},
+
+		_createBackColorMenu : function() {
+			var c, t = this, s = t.settings, o = {}, v;
+
+			if (s.theme_advanced_more_colors) {
+				o.more_colors_func = function() {
+					t._mceColorPicker(0, {
+						color : c.value,
+						func : function(co) {
+							c.setColor(co);
+						}
+					});
+				};
+			}
+
+			if (v = s.theme_advanced_background_colors)
+				o.colors = v;
+
+			if (s.theme_advanced_default_background_color)
+				o.default_color = s.theme_advanced_default_background_color;
+
+			o.title = 'advanced.backcolor_desc';
+			o.cmd = 'HiliteColor';
+			o.scope = this;
+
+			c = t.editor.controlManager.createColorSplitButton('backcolor', o);
+
+			return c;
+		},
+
+		renderUI : function(o) {
+			var n, ic, tb, t = this, ed = t.editor, s = t.settings, sc, p, nl;
+
+			if (ed.settings) {
+				ed.settings.aria_label = s.aria_label + ed.getLang('advanced.help_shortcut');
+			}
+
+			// TODO: ACC Should have an aria-describedby attribute which is user-configurable to describe what this field is actually for.
+			// Maybe actually inherit it from the original textara?
+			n = p = DOM.create('span', {role : 'application', 'aria-labelledby' : ed.id + '_voice', id : ed.id + '_parent', 'class' : 'mceEditor ' + ed.settings.skin + 'Skin' + (s.skin_variant ? ' ' + ed.settings.skin + 'Skin' + t._ufirst(s.skin_variant) : '') + (ed.settings.directionality == "rtl" ? ' mceRtl' : '')});
+			DOM.add(n, 'span', {'class': 'mceVoiceLabel', 'style': 'display:none;', id: ed.id + '_voice'}, s.aria_label);
+
+			if (!DOM.boxModel)
+				n = DOM.add(n, 'div', {'class' : 'mceOldBoxModel'});
+
+			n = sc = DOM.add(n, 'table', {role : "presentation", id : ed.id + '_tbl', 'class' : 'mceLayout', cellSpacing : 0, cellPadding : 0});
+			n = tb = DOM.add(n, 'tbody');
+
+			switch ((s.theme_advanced_layout_manager || '').toLowerCase()) {
+				case "rowlayout":
+					ic = t._rowLayout(s, tb, o);
+					break;
+
+				case "customlayout":
+					ic = ed.execCallback("theme_advanced_custom_layout", s, tb, o, p);
+					break;
+
+				default:
+					ic = t._simpleLayout(s, tb, o, p);
+			}
+
+			n = o.targetNode;
+
+			// Add classes to first and last TRs
+			nl = sc.rows;
+			DOM.addClass(nl[0], 'mceFirst');
+			DOM.addClass(nl[nl.length - 1], 'mceLast');
+
+			// Add classes to first and last TDs
+			each(DOM.select('tr', tb), function(n) {
+				DOM.addClass(n.firstChild, 'mceFirst');
+				DOM.addClass(n.childNodes[n.childNodes.length - 1], 'mceLast');
+			});
+
+			if (DOM.get(s.theme_advanced_toolbar_container))
+				DOM.get(s.theme_advanced_toolbar_container).appendChild(p);
+			else
+				DOM.insertAfter(p, n);
+
+			Event.add(ed.id + '_path_row', 'click', function(e) {
+				e = e.target;
+
+				if (e.nodeName == 'A') {
+					t._sel(e.className.replace(/^.*mcePath_([0-9]+).*$/, '$1'));
+					return false;
+				}
+			});
+/*
+			if (DOM.get(ed.id + '_path_row')) {
+				Event.add(ed.id + '_tbl', 'mouseover', function(e) {
+					var re;
+
+					e = e.target;
+
+					if (e.nodeName == 'SPAN' && DOM.hasClass(e.parentNode, 'mceButton')) {
+						re = DOM.get(ed.id + '_path_row');
+						t.lastPath = re.innerHTML;
+						DOM.setHTML(re, e.parentNode.title);
+					}
+				});
+
+				Event.add(ed.id + '_tbl', 'mouseout', function(e) {
+					if (t.lastPath) {
+						DOM.setHTML(ed.id + '_path_row', t.lastPath);
+						t.lastPath = 0;
+					}
+				});
+			}
+*/
+
+			if (!ed.getParam('accessibility_focus'))
+				Event.add(DOM.add(p, 'a', {href : '#'}, '<!-- IE -->'), 'focus', function() {tinyMCE.get(ed.id).focus();});
+
+			if (s.theme_advanced_toolbar_location == 'external')
+				o.deltaHeight = 0;
+
+			t.deltaHeight = o.deltaHeight;
+			o.targetNode = null;
+
+			ed.onKeyDown.add(function(ed, evt) {
+				var DOM_VK_F10 = 121, DOM_VK_F11 = 122;
+
+				if (evt.altKey) {
+		 			if (evt.keyCode === DOM_VK_F10) {
+						// Make sure focus is given to toolbar in Safari.
+						// We can't do this in IE as it prevents giving focus to toolbar when editor is in a frame
+						if (tinymce.isWebKit) {
+							window.focus();
+						}
+						t.toolbarGroup.focus();
+						return Event.cancel(evt);
+					} else if (evt.keyCode === DOM_VK_F11) {
+						DOM.get(ed.id + '_path_row').focus();
+						return Event.cancel(evt);
+					}
+				}
+			});
+
+			// alt+0 is the UK recommended shortcut for accessing the list of access controls.
+			ed.addShortcut('alt+0', '', 'mceShortcuts', t);
+
+			return {
+				iframeContainer : ic,
+				editorContainer : ed.id + '_parent',
+				sizeContainer : sc,
+				deltaHeight : o.deltaHeight
+			};
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Advanced theme',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			}
+		},
+
+		resizeBy : function(dw, dh) {
+			var e = DOM.get(this.editor.id + '_ifr');
+
+			this.resizeTo(e.clientWidth + dw, e.clientHeight + dh);
+		},
+
+		resizeTo : function(w, h, store) {
+			var ed = this.editor, s = this.settings, e = DOM.get(ed.id + '_tbl'), ifr = DOM.get(ed.id + '_ifr');
+
+			// Boundery fix box
+			w = Math.max(s.theme_advanced_resizing_min_width || 100, w);
+			h = Math.max(s.theme_advanced_resizing_min_height || 100, h);
+			w = Math.min(s.theme_advanced_resizing_max_width || 0xFFFF, w);
+			h = Math.min(s.theme_advanced_resizing_max_height || 0xFFFF, h);
+
+			// Resize iframe and container
+			DOM.setStyle(e, 'height', '');
+			DOM.setStyle(ifr, 'height', h);
+
+			if (s.theme_advanced_resize_horizontal) {
+				DOM.setStyle(e, 'width', '');
+				DOM.setStyle(ifr, 'width', w);
+
+				// Make sure that the size is never smaller than the over all ui
+				if (w < e.clientWidth) {
+					w = e.clientWidth;
+					DOM.setStyle(ifr, 'width', e.clientWidth);
+				}
+			}
+
+			// Store away the size
+			if (store && s.theme_advanced_resizing_use_cookie) {
+				Cookie.setHash("TinyMCE_" + ed.id + "_size", {
+					cw : w,
+					ch : h
+				});
+			}
+		},
+
+		destroy : function() {
+			var id = this.editor.id;
+
+			Event.clear(id + '_resize');
+			Event.clear(id + '_path_row');
+			Event.clear(id + '_external_close');
+		},
+
+		// Internal functions
+
+		_simpleLayout : function(s, tb, o, p) {
+			var t = this, ed = t.editor, lo = s.theme_advanced_toolbar_location, sl = s.theme_advanced_statusbar_location, n, ic, etb, c;
+
+			if (s.readonly) {
+				n = DOM.add(tb, 'tr');
+				n = ic = DOM.add(n, 'td', {'class' : 'mceIframeContainer'});
+				return ic;
+			}
+
+			// Create toolbar container at top
+			if (lo == 'top')
+				t._addToolbars(tb, o);
+
+			// Create external toolbar
+			if (lo == 'external') {
+				n = c = DOM.create('div', {style : 'position:relative'});
+				n = DOM.add(n, 'div', {id : ed.id + '_external', 'class' : 'mceExternalToolbar'});
+				DOM.add(n, 'a', {id : ed.id + '_external_close', href : 'javascript:;', 'class' : 'mceExternalClose'});
+				n = DOM.add(n, 'table', {id : ed.id + '_tblext', cellSpacing : 0, cellPadding : 0});
+				etb = DOM.add(n, 'tbody');
+
+				if (p.firstChild.className == 'mceOldBoxModel')
+					p.firstChild.appendChild(c);
+				else
+					p.insertBefore(c, p.firstChild);
+
+				t._addToolbars(etb, o);
+
+				ed.onMouseUp.add(function() {
+					var e = DOM.get(ed.id + '_external');
+					DOM.show(e);
+
+					DOM.hide(lastExtID);
+
+					var f = Event.add(ed.id + '_external_close', 'click', function() {
+						DOM.hide(ed.id + '_external');
+						Event.remove(ed.id + '_external_close', 'click', f);
+						return false;
+					});
+
+					DOM.show(e);
+					DOM.setStyle(e, 'top', 0 - DOM.getRect(ed.id + '_tblext').h - 1);
+
+					// Fixes IE rendering bug
+					DOM.hide(e);
+					DOM.show(e);
+					e.style.filter = '';
+
+					lastExtID = ed.id + '_external';
+
+					e = null;
+				});
+			}
+
+			if (sl == 'top')
+				t._addStatusBar(tb, o);
+
+			// Create iframe container
+			if (!s.theme_advanced_toolbar_container) {
+				n = DOM.add(tb, 'tr');
+				n = ic = DOM.add(n, 'td', {'class' : 'mceIframeContainer'});
+			}
+
+			// Create toolbar container at bottom
+			if (lo == 'bottom')
+				t._addToolbars(tb, o);
+
+			if (sl == 'bottom')
+				t._addStatusBar(tb, o);
+
+			return ic;
+		},
+
+		_rowLayout : function(s, tb, o) {
+			var t = this, ed = t.editor, dc, da, cf = ed.controlManager, n, ic, to, a;
+
+			dc = s.theme_advanced_containers_default_class || '';
+			da = s.theme_advanced_containers_default_align || 'center';
+
+			each(explode(s.theme_advanced_containers || ''), function(c, i) {
+				var v = s['theme_advanced_container_' + c] || '';
+
+				switch (c.toLowerCase()) {
+					case 'mceeditor':
+						n = DOM.add(tb, 'tr');
+						n = ic = DOM.add(n, 'td', {'class' : 'mceIframeContainer'});
+						break;
+
+					case 'mceelementpath':
+						t._addStatusBar(tb, o);
+						break;
+
+					default:
+						a = (s['theme_advanced_container_' + c + '_align'] || da).toLowerCase();
+						a = 'mce' + t._ufirst(a);
+
+						n = DOM.add(DOM.add(tb, 'tr'), 'td', {
+							'class' : 'mceToolbar ' + (s['theme_advanced_container_' + c + '_class'] || dc) + ' ' + a || da
+						});
+
+						to = cf.createToolbar("toolbar" + i);
+						t._addControls(v, to);
+						DOM.setHTML(n, to.renderHTML());
+						o.deltaHeight -= s.theme_advanced_row_height;
+				}
+			});
+
+			return ic;
+		},
+
+		_addControls : function(v, tb) {
+			var t = this, s = t.settings, di, cf = t.editor.controlManager;
+
+			if (s.theme_advanced_disable && !t._disabled) {
+				di = {};
+
+				each(explode(s.theme_advanced_disable), function(v) {
+					di[v] = 1;
+				});
+
+				t._disabled = di;
+			} else
+				di = t._disabled;
+
+			each(explode(v), function(n) {
+				var c;
+
+				if (di && di[n])
+					return;
+
+				// Compatiblity with 2.x
+				if (n == 'tablecontrols') {
+					each(["table","|","row_props","cell_props","|","row_before","row_after","delete_row","|","col_before","col_after","delete_col","|","split_cells","merge_cells"], function(n) {
+						n = t.createControl(n, cf);
+
+						if (n)
+							tb.add(n);
+					});
+
+					return;
+				}
+
+				c = t.createControl(n, cf);
+
+				if (c)
+					tb.add(c);
+			});
+		},
+
+		_addToolbars : function(c, o) {
+			var t = this, i, tb, ed = t.editor, s = t.settings, v, cf = ed.controlManager, di, n, h = [], a, toolbarGroup, toolbarsExist = false;
+
+			toolbarGroup = cf.createToolbarGroup('toolbargroup', {
+				'name': ed.getLang('advanced.toolbar'),
+				'tab_focus_toolbar':ed.getParam('theme_advanced_tab_focus_toolbar')
+			});
+
+			t.toolbarGroup = toolbarGroup;
+
+			a = s.theme_advanced_toolbar_align.toLowerCase();
+			a = 'mce' + t._ufirst(a);
+
+			n = DOM.add(DOM.add(c, 'tr', {role: 'presentation'}), 'td', {'class' : 'mceToolbar ' + a, "role":"toolbar"});
+
+			// Create toolbar and add the controls
+			for (i=1; (v = s['theme_advanced_buttons' + i]); i++) {
+				toolbarsExist = true;
+				tb = cf.createToolbar("toolbar" + i, {'class' : 'mceToolbarRow' + i});
+
+				if (s['theme_advanced_buttons' + i + '_add'])
+					v += ',' + s['theme_advanced_buttons' + i + '_add'];
+
+				if (s['theme_advanced_buttons' + i + '_add_before'])
+					v = s['theme_advanced_buttons' + i + '_add_before'] + ',' + v;
+
+				t._addControls(v, tb);
+				toolbarGroup.add(tb);
+
+				o.deltaHeight -= s.theme_advanced_row_height;
+			}
+			// Handle case when there are no toolbar buttons and ensure editor height is adjusted accordingly
+			if (!toolbarsExist)
+				o.deltaHeight -= s.theme_advanced_row_height;
+			h.push(toolbarGroup.renderHTML());
+			h.push(DOM.createHTML('a', {href : '#', accesskey : 'z', title : ed.getLang("advanced.toolbar_focus"), onfocus : 'tinyMCE.getInstanceById(\'' + ed.id + '\').focus();'}, '<!-- IE -->'));
+			DOM.setHTML(n, h.join(''));
+		},
+
+		_addStatusBar : function(tb, o) {
+			var n, t = this, ed = t.editor, s = t.settings, r, mf, me, td;
+
+			n = DOM.add(tb, 'tr');
+			n = td = DOM.add(n, 'td', {'class' : 'mceStatusbar'});
+			n = DOM.add(n, 'div', {id : ed.id + '_path_row', 'role': 'group', 'aria-labelledby': ed.id + '_path_voice'});
+			if (s.theme_advanced_path) {
+				DOM.add(n, 'span', {id: ed.id + '_path_voice'}, ed.translate('advanced.path'));
+				DOM.add(n, 'span', {}, ': ');
+			} else {
+				DOM.add(n, 'span', {}, '&#160;');
+			}
+
+
+			if (s.theme_advanced_resizing) {
+				DOM.add(td, 'a', {id : ed.id + '_resize', href : 'javascript:;', onclick : "return false;", 'class' : 'mceResize', tabIndex:"-1"});
+
+				if (s.theme_advanced_resizing_use_cookie) {
+					ed.onPostRender.add(function() {
+						var o = Cookie.getHash("TinyMCE_" + ed.id + "_size"), c = DOM.get(ed.id + '_tbl');
+
+						if (!o)
+							return;
+
+						t.resizeTo(o.cw, o.ch);
+					});
+				}
+
+				ed.onPostRender.add(function() {
+					Event.add(ed.id + '_resize', 'click', function(e) {
+						e.preventDefault();
+					});
+
+					Event.add(ed.id + '_resize', 'mousedown', function(e) {
+						var mouseMoveHandler1, mouseMoveHandler2,
+							mouseUpHandler1, mouseUpHandler2,
+							startX, startY, startWidth, startHeight, width, height, ifrElm;
+
+						function resizeOnMove(e) {
+							e.preventDefault();
+
+							width = startWidth + (e.screenX - startX);
+							height = startHeight + (e.screenY - startY);
+
+							t.resizeTo(width, height);
+						};
+
+						function endResize(e) {
+							// Stop listening
+							Event.remove(DOM.doc, 'mousemove', mouseMoveHandler1);
+							Event.remove(ed.getDoc(), 'mousemove', mouseMoveHandler2);
+							Event.remove(DOM.doc, 'mouseup', mouseUpHandler1);
+							Event.remove(ed.getDoc(), 'mouseup', mouseUpHandler2);
+
+							width = startWidth + (e.screenX - startX);
+							height = startHeight + (e.screenY - startY);
+							t.resizeTo(width, height, true);
+
+							ed.nodeChanged();
+						};
+
+						e.preventDefault();
+
+						// Get the current rect size
+						startX = e.screenX;
+						startY = e.screenY;
+						ifrElm = DOM.get(t.editor.id + '_ifr');
+						startWidth = width = ifrElm.clientWidth;
+						startHeight = height = ifrElm.clientHeight;
+
+						// Register envent handlers
+						mouseMoveHandler1 = Event.add(DOM.doc, 'mousemove', resizeOnMove);
+						mouseMoveHandler2 = Event.add(ed.getDoc(), 'mousemove', resizeOnMove);
+						mouseUpHandler1 = Event.add(DOM.doc, 'mouseup', endResize);
+						mouseUpHandler2 = Event.add(ed.getDoc(), 'mouseup', endResize);
+					});
+				});
+			}
+
+			o.deltaHeight -= 21;
+			n = tb = null;
+		},
+
+		_updateUndoStatus : function(ed) {
+			var cm = ed.controlManager, um = ed.undoManager;
+
+			cm.setDisabled('undo', !um.hasUndo() && !um.typing);
+			cm.setDisabled('redo', !um.hasRedo());
+		},
+
+		_nodeChanged : function(ed, cm, n, co, ob) {
+			var t = this, p, de = 0, v, c, s = t.settings, cl, fz, fn, fc, bc, formatNames, matches;
+
+			tinymce.each(t.stateControls, function(c) {
+				cm.setActive(c, ed.queryCommandState(t.controls[c][1]));
+			});
+
+			function getParent(name) {
+				var i, parents = ob.parents, func = name;
+
+				if (typeof(name) == 'string') {
+					func = function(node) {
+						return node.nodeName == name;
+					};
+				}
+
+				for (i = 0; i < parents.length; i++) {
+					if (func(parents[i]))
+						return parents[i];
+				}
+			};
+
+			cm.setActive('visualaid', ed.hasVisual);
+			t._updateUndoStatus(ed);
+			cm.setDisabled('outdent', !ed.queryCommandState('Outdent'));
+
+			p = getParent('A');
+			if (c = cm.get('link')) {
+				c.setDisabled((!p && co) || (p && !p.href));
+				c.setActive(!!p && (!p.name && !p.id));
+			}
+
+			if (c = cm.get('unlink')) {
+				c.setDisabled(!p && co);
+				c.setActive(!!p && !p.name && !p.id);
+			}
+
+			if (c = cm.get('anchor')) {
+				c.setActive(!co && !!p && (p.name || (p.id && !p.href)));
+			}
+
+			p = getParent('IMG');
+			if (c = cm.get('image'))
+				c.setActive(!co && !!p && n.className.indexOf('mceItem') == -1);
+
+			if (c = cm.get('styleselect')) {
+				t._importClasses();
+
+				formatNames = [];
+				each(c.items, function(item) {
+					formatNames.push(item.value);
+				});
+
+				matches = ed.formatter.matchAll(formatNames);
+				c.select(matches[0]);
+				tinymce.each(matches, function(match, index) {
+					if (index > 0) {
+						c.mark(match);
+					}
+				});
+			}
+
+			if (c = cm.get('formatselect')) {
+				p = getParent(ed.dom.isBlock);
+
+				if (p)
+					c.select(p.nodeName.toLowerCase());
+			}
+
+			// Find out current fontSize, fontFamily and fontClass
+			getParent(function(n) {
+				if (n.nodeName === 'SPAN') {
+					if (!cl && n.className)
+						cl = n.className;
+				}
+
+				if (ed.dom.is(n, s.theme_advanced_font_selector)) {
+					if (!fz && n.style.fontSize)
+						fz = n.style.fontSize;
+
+					if (!fn && n.style.fontFamily)
+						fn = n.style.fontFamily.replace(/[\"\']+/g, '').replace(/^([^,]+).*/, '$1').toLowerCase();
+
+					if (!fc && n.style.color)
+						fc = n.style.color;
+
+					if (!bc && n.style.backgroundColor)
+						bc = n.style.backgroundColor;
+				}
+
+				return false;
+			});
+
+			if (c = cm.get('fontselect')) {
+				c.select(function(v) {
+					return v.replace(/^([^,]+).*/, '$1').toLowerCase() == fn;
+				});
+			}
+
+			// Select font size
+			if (c = cm.get('fontsizeselect')) {
+				// Use computed style
+				if (s.theme_advanced_runtime_fontsize && !fz && !cl)
+					fz = ed.dom.getStyle(n, 'fontSize', true);
+
+				c.select(function(v) {
+					if (v.fontSize && v.fontSize === fz)
+						return true;
+
+					if (v['class'] && v['class'] === cl)
+						return true;
+				});
+			}
+
+			if (s.theme_advanced_show_current_color) {
+				function updateColor(controlId, color) {
+					if (c = cm.get(controlId)) {
+						if (!color)
+							color = c.settings.default_color;
+						if (color !== c.value) {
+							c.displayColor(color);
+						}
+					}
+				}
+				updateColor('forecolor', fc);
+				updateColor('backcolor', bc);
+			}
+
+			if (s.theme_advanced_show_current_color) {
+				function updateColor(controlId, color) {
+					if (c = cm.get(controlId)) {
+						if (!color)
+							color = c.settings.default_color;
+						if (color !== c.value) {
+							c.displayColor(color);
+						}
+					}
+				};
+
+				updateColor('forecolor', fc);
+				updateColor('backcolor', bc);
+			}
+
+			if (s.theme_advanced_path && s.theme_advanced_statusbar_location) {
+				p = DOM.get(ed.id + '_path') || DOM.add(ed.id + '_path_row', 'span', {id : ed.id + '_path'});
+
+				if (t.statusKeyboardNavigation) {
+					t.statusKeyboardNavigation.destroy();
+					t.statusKeyboardNavigation = null;
+				}
+
+				DOM.setHTML(p, '');
+
+				getParent(function(n) {
+					var na = n.nodeName.toLowerCase(), u, pi, ti = '';
+
+					// Ignore non element and bogus/hidden elements
+					if (n.nodeType != 1 || na === 'br' || n.getAttribute('data-mce-bogus') || DOM.hasClass(n, 'mceItemHidden') || DOM.hasClass(n, 'mceItemRemoved'))
+						return;
+
+					// Handle prefix
+					if (tinymce.isIE && n.scopeName !== 'HTML' && n.scopeName)
+						na = n.scopeName + ':' + na;
+
+					// Remove internal prefix
+					na = na.replace(/mce\:/g, '');
+
+					// Handle node name
+					switch (na) {
+						case 'b':
+							na = 'strong';
+							break;
+
+						case 'i':
+							na = 'em';
+							break;
+
+						case 'img':
+							if (v = DOM.getAttrib(n, 'src'))
+								ti += 'src: ' + v + ' ';
+
+							break;
+
+						case 'a':
+							if (v = DOM.getAttrib(n, 'name')) {
+								ti += 'name: ' + v + ' ';
+								na += '#' + v;
+							}
+
+							if (v = DOM.getAttrib(n, 'href'))
+								ti += 'href: ' + v + ' ';
+
+							break;
+
+						case 'font':
+							if (v = DOM.getAttrib(n, 'face'))
+								ti += 'font: ' + v + ' ';
+
+							if (v = DOM.getAttrib(n, 'size'))
+								ti += 'size: ' + v + ' ';
+
+							if (v = DOM.getAttrib(n, 'color'))
+								ti += 'color: ' + v + ' ';
+
+							break;
+
+						case 'span':
+							if (v = DOM.getAttrib(n, 'style'))
+								ti += 'style: ' + v + ' ';
+
+							break;
+					}
+
+					if (v = DOM.getAttrib(n, 'id'))
+						ti += 'id: ' + v + ' ';
+
+					if (v = n.className) {
+						v = v.replace(/\b\s*(webkit|mce|Apple-)\w+\s*\b/g, '');
+
+						if (v) {
+							ti += 'class: ' + v + ' ';
+
+							if (ed.dom.isBlock(n) || na == 'img' || na == 'span')
+								na += '.' + v;
+						}
+					}
+
+					na = na.replace(/(html:)/g, '');
+					na = {name : na, node : n, title : ti};
+					t.onResolveName.dispatch(t, na);
+					ti = na.title;
+					na = na.name;
+
+					//u = "javascript:tinymce.EditorManager.get('" + ed.id + "').theme._sel('" + (de++) + "');";
+					pi = DOM.create('a', {'href' : "javascript:;", role: 'button', onmousedown : "return false;", title : ti, 'class' : 'mcePath_' + (de++)}, na);
+
+					if (p.hasChildNodes()) {
+						p.insertBefore(DOM.create('span', {'aria-hidden': 'true'}, '\u00a0\u00bb '), p.firstChild);
+						p.insertBefore(pi, p.firstChild);
+					} else
+						p.appendChild(pi);
+				}, ed.getBody());
+
+				if (DOM.select('a', p).length > 0) {
+					t.statusKeyboardNavigation = new tinymce.ui.KeyboardNavigation({
+						root: ed.id + "_path_row",
+						items: DOM.select('a', p),
+						excludeFromTabOrder: true,
+						onCancel: function() {
+							ed.focus();
+						}
+					}, DOM);
+				}
+			}
+		},
+
+		// Commands gets called by execCommand
+
+		_sel : function(v) {
+			this.editor.execCommand('mceSelectNodeDepth', false, v);
+		},
+
+		_mceInsertAnchor : function(ui, v) {
+			var ed = this.editor;
+
+			ed.windowManager.open({
+				url : this.url + '/anchor.htm',
+				width : 320 + parseInt(ed.getLang('advanced.anchor_delta_width', 0)),
+				height : 90 + parseInt(ed.getLang('advanced.anchor_delta_height', 0)),
+				inline : true
+			}, {
+				theme_url : this.url
+			});
+		},
+
+		_mceCharMap : function() {
+			var ed = this.editor;
+
+			ed.windowManager.open({
+				url : this.url + '/charmap.htm',
+				width : 550 + parseInt(ed.getLang('advanced.charmap_delta_width', 0)),
+				height : 265 + parseInt(ed.getLang('advanced.charmap_delta_height', 0)),
+				inline : true
+			}, {
+				theme_url : this.url
+			});
+		},
+
+		_mceHelp : function() {
+			var ed = this.editor;
+
+			ed.windowManager.open({
+				url : this.url + '/about.htm',
+				width : 480,
+				height : 380,
+				inline : true
+			}, {
+				theme_url : this.url
+			});
+		},
+
+		_mceShortcuts : function() {
+			var ed = this.editor;
+			ed.windowManager.open({
+				url: this.url + '/shortcuts.htm',
+				width: 480,
+				height: 380,
+				inline: true
+			}, {
+				theme_url: this.url
+			});
+		},
+
+		_mceColorPicker : function(u, v) {
+			var ed = this.editor;
+
+			v = v || {};
+
+			ed.windowManager.open({
+				url : this.url + '/color_picker.htm',
+				width : 375 + parseInt(ed.getLang('advanced.colorpicker_delta_width', 0)),
+				height : 250 + parseInt(ed.getLang('advanced.colorpicker_delta_height', 0)),
+				close_previous : false,
+				inline : true
+			}, {
+				input_color : v.color,
+				func : v.func,
+				theme_url : this.url
+			});
+		},
+
+		_mceCodeEditor : function(ui, val) {
+			var ed = this.editor;
+
+			ed.windowManager.open({
+				url : this.url + '/source_editor.htm',
+				width : parseInt(ed.getParam("theme_advanced_source_editor_width", 720)),
+				height : parseInt(ed.getParam("theme_advanced_source_editor_height", 580)),
+				inline : true,
+				resizable : true,
+				maximizable : true
+			}, {
+				theme_url : this.url
+			});
+		},
+
+		_mceImage : function(ui, val) {
+			var ed = this.editor;
+
+			// Internal image object like a flash placeholder
+			if (ed.dom.getAttrib(ed.selection.getNode(), 'class', '').indexOf('mceItem') != -1)
+				return;
+
+			ed.windowManager.open({
+				url : this.url + '/image.htm',
+				width : 355 + parseInt(ed.getLang('advanced.image_delta_width', 0)),
+				height : 275 + parseInt(ed.getLang('advanced.image_delta_height', 0)),
+				inline : true
+			}, {
+				theme_url : this.url
+			});
+		},
+
+		_mceLink : function(ui, val) {
+			var ed = this.editor;
+
+			ed.windowManager.open({
+				url : this.url + '/link.htm',
+				width : 310 + parseInt(ed.getLang('advanced.link_delta_width', 0)),
+				height : 200 + parseInt(ed.getLang('advanced.link_delta_height', 0)),
+				inline : true
+			}, {
+				theme_url : this.url
+			});
+		},
+
+		_mceNewDocument : function() {
+			var ed = this.editor;
+
+			ed.windowManager.confirm('advanced.newdocument', function(s) {
+				if (s)
+					ed.execCommand('mceSetContent', false, '');
+			});
+		},
+
+		_mceForeColor : function() {
+			var t = this;
+
+			this._mceColorPicker(0, {
+				color: t.fgColor,
+				func : function(co) {
+					t.fgColor = co;
+					t.editor.execCommand('ForeColor', false, co);
+				}
+			});
+		},
+
+		_mceBackColor : function() {
+			var t = this;
+
+			this._mceColorPicker(0, {
+				color: t.bgColor,
+				func : function(co) {
+					t.bgColor = co;
+					t.editor.execCommand('HiliteColor', false, co);
+				}
+			});
+		},
+
+		_ufirst : function(s) {
+			return s.substring(0, 1).toUpperCase() + s.substring(1);
+		}
+	});
+
+	tinymce.ThemeManager.add('advanced', tinymce.themes.AdvancedTheme);
+}(tinymce));
diff --git a/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/themes/advanced/js/anchor.js b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/themes/advanced/js/anchor.js
new file mode 100644
index 0000000..a3a0186
--- /dev/null
+++ b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/themes/advanced/js/anchor.js
@@ -0,0 +1,56 @@
+tinyMCEPopup.requireLangPack();
+
+var AnchorDialog = {
+	init : function(ed) {
+		var action, elm, f = document.forms[0];
+
+		this.editor = ed;
+		elm = ed.dom.getParent(ed.selection.getNode(), 'A');
+		v = ed.dom.getAttrib(elm, 'name') || ed.dom.getAttrib(elm, 'id');
+
+		if (v) {
+			this.action = 'update';
+			f.anchorName.value = v;
+		}
+
+		f.insert.value = ed.getLang(elm ? 'update' : 'insert');
+	},
+
+	update : function() {
+		var ed = this.editor, elm, name = document.forms[0].anchorName.value, attribName;
+
+		if (!name || !/^[a-z][a-z0-9\-\_:\.]*$/i.test(name)) {
+			tinyMCEPopup.alert('advanced_dlg.anchor_invalid');
+			return;
+		}
+
+		tinyMCEPopup.restoreSelection();
+
+		if (this.action != 'update')
+			ed.selection.collapse(1);
+
+		var aRule = ed.schema.getElementRule('a');
+		if (!aRule || aRule.attributes.name) {
+			attribName = 'name';
+		} else {
+			attribName = 'id';
+		}
+
+		elm = ed.dom.getParent(ed.selection.getNode(), 'A');
+		if (elm) {
+			elm.setAttribute(attribName, name);
+			elm[attribName] = name;
+			ed.undoManager.add();
+		} else {
+			// create with zero-sized nbsp so that in Webkit where anchor is on last line by itself caret cannot be placed after it
+			var attrs =  {'class' : 'mceItemAnchor'};
+			attrs[attribName] = name;
+			ed.execCommand('mceInsertContent', 0, ed.dom.createHTML('a', attrs, '\uFEFF'));
+			ed.nodeChanged();
+		}
+
+		tinyMCEPopup.close();
+	}
+};
+
+tinyMCEPopup.onInit.add(AnchorDialog.init, AnchorDialog);
diff --git a/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/themes/advanced/js/charmap.js b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/themes/advanced/js/charmap.js
new file mode 100644
index 0000000..cbb4172
--- /dev/null
+++ b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/themes/advanced/js/charmap.js
@@ -0,0 +1,363 @@
+/**
+ * charmap.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+tinyMCEPopup.requireLangPack();
+
+var charmap = [
+	['&nbsp;',    '&#160;',  true, 'no-break space'],
+	['&amp;',     '&#38;',   true, 'ampersand'],
+	['&quot;',    '&#34;',   true, 'quotation mark'],
+// finance
+	['&cent;',    '&#162;',  true, 'cent sign'],
+	['&euro;',    '&#8364;', true, 'euro sign'],
+	['&pound;',   '&#163;',  true, 'pound sign'],
+	['&yen;',     '&#165;',  true, 'yen sign'],
+// signs
+	['&copy;',    '&#169;',  true, 'copyright sign'],
+	['&reg;',     '&#174;',  true, 'registered sign'],
+	['&trade;',   '&#8482;', true, 'trade mark sign'],
+	['&permil;',  '&#8240;', true, 'per mille sign'],
+	['&micro;',   '&#181;',  true, 'micro sign'],
+	['&middot;',  '&#183;',  true, 'middle dot'],
+	['&bull;',    '&#8226;', true, 'bullet'],
+	['&hellip;',  '&#8230;', true, 'three dot leader'],
+	['&prime;',   '&#8242;', true, 'minutes / feet'],
+	['&Prime;',   '&#8243;', true, 'seconds / inches'],
+	['&sect;',    '&#167;',  true, 'section sign'],
+	['&para;',    '&#182;',  true, 'paragraph sign'],
+	['&szlig;',   '&#223;',  true, 'sharp s / ess-zed'],
+// quotations
+	['&lsaquo;',  '&#8249;', true, 'single left-pointing angle quotation mark'],
+	['&rsaquo;',  '&#8250;', true, 'single right-pointing angle quotation mark'],
+	['&laquo;',   '&#171;',  true, 'left pointing guillemet'],
+	['&raquo;',   '&#187;',  true, 'right pointing guillemet'],
+	['&lsquo;',   '&#8216;', true, 'left single quotation mark'],
+	['&rsquo;',   '&#8217;', true, 'right single quotation mark'],
+	['&ldquo;',   '&#8220;', true, 'left double quotation mark'],
+	['&rdquo;',   '&#8221;', true, 'right double quotation mark'],
+	['&sbquo;',   '&#8218;', true, 'single low-9 quotation mark'],
+	['&bdquo;',   '&#8222;', true, 'double low-9 quotation mark'],
+	['&lt;',      '&#60;',   true, 'less-than sign'],
+	['&gt;',      '&#62;',   true, 'greater-than sign'],
+	['&le;',      '&#8804;', true, 'less-than or equal to'],
+	['&ge;',      '&#8805;', true, 'greater-than or equal to'],
+	['&ndash;',   '&#8211;', true, 'en dash'],
+	['&mdash;',   '&#8212;', true, 'em dash'],
+	['&macr;',    '&#175;',  true, 'macron'],
+	['&oline;',   '&#8254;', true, 'overline'],
+	['&curren;',  '&#164;',  true, 'currency sign'],
+	['&brvbar;',  '&#166;',  true, 'broken bar'],
+	['&uml;',     '&#168;',  true, 'diaeresis'],
+	['&iexcl;',   '&#161;',  true, 'inverted exclamation mark'],
+	['&iquest;',  '&#191;',  true, 'turned question mark'],
+	['&circ;',    '&#710;',  true, 'circumflex accent'],
+	['&tilde;',   '&#732;',  true, 'small tilde'],
+	['&deg;',     '&#176;',  true, 'degree sign'],
+	['&minus;',   '&#8722;', true, 'minus sign'],
+	['&plusmn;',  '&#177;',  true, 'plus-minus sign'],
+	['&divide;',  '&#247;',  true, 'division sign'],
+	['&frasl;',   '&#8260;', true, 'fraction slash'],
+	['&times;',   '&#215;',  true, 'multiplication sign'],
+	['&sup1;',    '&#185;',  true, 'superscript one'],
+	['&sup2;',    '&#178;',  true, 'superscript two'],
+	['&sup3;',    '&#179;',  true, 'superscript three'],
+	['&frac14;',  '&#188;',  true, 'fraction one quarter'],
+	['&frac12;',  '&#189;',  true, 'fraction one half'],
+	['&frac34;',  '&#190;',  true, 'fraction three quarters'],
+// math / logical
+	['&fnof;',    '&#402;',  true, 'function / florin'],
+	['&int;',     '&#8747;', true, 'integral'],
+	['&sum;',     '&#8721;', true, 'n-ary sumation'],
+	['&infin;',   '&#8734;', true, 'infinity'],
+	['&radic;',   '&#8730;', true, 'square root'],
+	['&sim;',     '&#8764;', false,'similar to'],
+	['&cong;',    '&#8773;', false,'approximately equal to'],
+	['&asymp;',   '&#8776;', true, 'almost equal to'],
+	['&ne;',      '&#8800;', true, 'not equal to'],
+	['&equiv;',   '&#8801;', true, 'identical to'],
+	['&isin;',    '&#8712;', false,'element of'],
+	['&notin;',   '&#8713;', false,'not an element of'],
+	['&ni;',      '&#8715;', false,'contains as member'],
+	['&prod;',    '&#8719;', true, 'n-ary product'],
+	['&and;',     '&#8743;', false,'logical and'],
+	['&or;',      '&#8744;', false,'logical or'],
+	['&not;',     '&#172;',  true, 'not sign'],
+	['&cap;',     '&#8745;', true, 'intersection'],
+	['&cup;',     '&#8746;', false,'union'],
+	['&part;',    '&#8706;', true, 'partial differential'],
+	['&forall;',  '&#8704;', false,'for all'],
+	['&exist;',   '&#8707;', false,'there exists'],
+	['&empty;',   '&#8709;', false,'diameter'],
+	['&nabla;',   '&#8711;', false,'backward difference'],
+	['&lowast;',  '&#8727;', false,'asterisk operator'],
+	['&prop;',    '&#8733;', false,'proportional to'],
+	['&ang;',     '&#8736;', false,'angle'],
+// undefined
+	['&acute;',   '&#180;',  true, 'acute accent'],
+	['&cedil;',   '&#184;',  true, 'cedilla'],
+	['&ordf;',    '&#170;',  true, 'feminine ordinal indicator'],
+	['&ordm;',    '&#186;',  true, 'masculine ordinal indicator'],
+	['&dagger;',  '&#8224;', true, 'dagger'],
+	['&Dagger;',  '&#8225;', true, 'double dagger'],
+// alphabetical special chars
+	['&Agrave;',  '&#192;',  true, 'A - grave'],
+	['&Aacute;',  '&#193;',  true, 'A - acute'],
+	['&Acirc;',   '&#194;',  true, 'A - circumflex'],
+	['&Atilde;',  '&#195;',  true, 'A - tilde'],
+	['&Auml;',    '&#196;',  true, 'A - diaeresis'],
+	['&Aring;',   '&#197;',  true, 'A - ring above'],
+	['&AElig;',   '&#198;',  true, 'ligature AE'],
+	['&Ccedil;',  '&#199;',  true, 'C - cedilla'],
+	['&Egrave;',  '&#200;',  true, 'E - grave'],
+	['&Eacute;',  '&#201;',  true, 'E - acute'],
+	['&Ecirc;',   '&#202;',  true, 'E - circumflex'],
+	['&Euml;',    '&#203;',  true, 'E - diaeresis'],
+	['&Igrave;',  '&#204;',  true, 'I - grave'],
+	['&Iacute;',  '&#205;',  true, 'I - acute'],
+	['&Icirc;',   '&#206;',  true, 'I - circumflex'],
+	['&Iuml;',    '&#207;',  true, 'I - diaeresis'],
+	['&ETH;',     '&#208;',  true, 'ETH'],
+	['&Ntilde;',  '&#209;',  true, 'N - tilde'],
+	['&Ograve;',  '&#210;',  true, 'O - grave'],
+	['&Oacute;',  '&#211;',  true, 'O - acute'],
+	['&Ocirc;',   '&#212;',  true, 'O - circumflex'],
+	['&Otilde;',  '&#213;',  true, 'O - tilde'],
+	['&Ouml;',    '&#214;',  true, 'O - diaeresis'],
+	['&Oslash;',  '&#216;',  true, 'O - slash'],
+	['&OElig;',   '&#338;',  true, 'ligature OE'],
+	['&Scaron;',  '&#352;',  true, 'S - caron'],
+	['&Ugrave;',  '&#217;',  true, 'U - grave'],
+	['&Uacute;',  '&#218;',  true, 'U - acute'],
+	['&Ucirc;',   '&#219;',  true, 'U - circumflex'],
+	['&Uuml;',    '&#220;',  true, 'U - diaeresis'],
+	['&Yacute;',  '&#221;',  true, 'Y - acute'],
+	['&Yuml;',    '&#376;',  true, 'Y - diaeresis'],
+	['&THORN;',   '&#222;',  true, 'THORN'],
+	['&agrave;',  '&#224;',  true, 'a - grave'],
+	['&aacute;',  '&#225;',  true, 'a - acute'],
+	['&acirc;',   '&#226;',  true, 'a - circumflex'],
+	['&atilde;',  '&#227;',  true, 'a - tilde'],
+	['&auml;',    '&#228;',  true, 'a - diaeresis'],
+	['&aring;',   '&#229;',  true, 'a - ring above'],
+	['&aelig;',   '&#230;',  true, 'ligature ae'],
+	['&ccedil;',  '&#231;',  true, 'c - cedilla'],
+	['&egrave;',  '&#232;',  true, 'e - grave'],
+	['&eacute;',  '&#233;',  true, 'e - acute'],
+	['&ecirc;',   '&#234;',  true, 'e - circumflex'],
+	['&euml;',    '&#235;',  true, 'e - diaeresis'],
+	['&igrave;',  '&#236;',  true, 'i - grave'],
+	['&iacute;',  '&#237;',  true, 'i - acute'],
+	['&icirc;',   '&#238;',  true, 'i - circumflex'],
+	['&iuml;',    '&#239;',  true, 'i - diaeresis'],
+	['&eth;',     '&#240;',  true, 'eth'],
+	['&ntilde;',  '&#241;',  true, 'n - tilde'],
+	['&ograve;',  '&#242;',  true, 'o - grave'],
+	['&oacute;',  '&#243;',  true, 'o - acute'],
+	['&ocirc;',   '&#244;',  true, 'o - circumflex'],
+	['&otilde;',  '&#245;',  true, 'o - tilde'],
+	['&ouml;',    '&#246;',  true, 'o - diaeresis'],
+	['&oslash;',  '&#248;',  true, 'o slash'],
+	['&oelig;',   '&#339;',  true, 'ligature oe'],
+	['&scaron;',  '&#353;',  true, 's - caron'],
+	['&ugrave;',  '&#249;',  true, 'u - grave'],
+	['&uacute;',  '&#250;',  true, 'u - acute'],
+	['&ucirc;',   '&#251;',  true, 'u - circumflex'],
+	['&uuml;',    '&#252;',  true, 'u - diaeresis'],
+	['&yacute;',  '&#253;',  true, 'y - acute'],
+	['&thorn;',   '&#254;',  true, 'thorn'],
+	['&yuml;',    '&#255;',  true, 'y - diaeresis'],
+	['&Alpha;',   '&#913;',  true, 'Alpha'],
+	['&Beta;',    '&#914;',  true, 'Beta'],
+	['&Gamma;',   '&#915;',  true, 'Gamma'],
+	['&Delta;',   '&#916;',  true, 'Delta'],
+	['&Epsilon;', '&#917;',  true, 'Epsilon'],
+	['&Zeta;',    '&#918;',  true, 'Zeta'],
+	['&Eta;',     '&#919;',  true, 'Eta'],
+	['&Theta;',   '&#920;',  true, 'Theta'],
+	['&Iota;',    '&#921;',  true, 'Iota'],
+	['&Kappa;',   '&#922;',  true, 'Kappa'],
+	['&Lambda;',  '&#923;',  true, 'Lambda'],
+	['&Mu;',      '&#924;',  true, 'Mu'],
+	['&Nu;',      '&#925;',  true, 'Nu'],
+	['&Xi;',      '&#926;',  true, 'Xi'],
+	['&Omicron;', '&#927;',  true, 'Omicron'],
+	['&Pi;',      '&#928;',  true, 'Pi'],
+	['&Rho;',     '&#929;',  true, 'Rho'],
+	['&Sigma;',   '&#931;',  true, 'Sigma'],
+	['&Tau;',     '&#932;',  true, 'Tau'],
+	['&Upsilon;', '&#933;',  true, 'Upsilon'],
+	['&Phi;',     '&#934;',  true, 'Phi'],
+	['&Chi;',     '&#935;',  true, 'Chi'],
+	['&Psi;',     '&#936;',  true, 'Psi'],
+	['&Omega;',   '&#937;',  true, 'Omega'],
+	['&alpha;',   '&#945;',  true, 'alpha'],
+	['&beta;',    '&#946;',  true, 'beta'],
+	['&gamma;',   '&#947;',  true, 'gamma'],
+	['&delta;',   '&#948;',  true, 'delta'],
+	['&epsilon;', '&#949;',  true, 'epsilon'],
+	['&zeta;',    '&#950;',  true, 'zeta'],
+	['&eta;',     '&#951;',  true, 'eta'],
+	['&theta;',   '&#952;',  true, 'theta'],
+	['&iota;',    '&#953;',  true, 'iota'],
+	['&kappa;',   '&#954;',  true, 'kappa'],
+	['&lambda;',  '&#955;',  true, 'lambda'],
+	['&mu;',      '&#956;',  true, 'mu'],
+	['&nu;',      '&#957;',  true, 'nu'],
+	['&xi;',      '&#958;',  true, 'xi'],
+	['&omicron;', '&#959;',  true, 'omicron'],
+	['&pi;',      '&#960;',  true, 'pi'],
+	['&rho;',     '&#961;',  true, 'rho'],
+	['&sigmaf;',  '&#962;',  true, 'final sigma'],
+	['&sigma;',   '&#963;',  true, 'sigma'],
+	['&tau;',     '&#964;',  true, 'tau'],
+	['&upsilon;', '&#965;',  true, 'upsilon'],
+	['&phi;',     '&#966;',  true, 'phi'],
+	['&chi;',     '&#967;',  true, 'chi'],
+	['&psi;',     '&#968;',  true, 'psi'],
+	['&omega;',   '&#969;',  true, 'omega'],
+// symbols
+	['&alefsym;', '&#8501;', false,'alef symbol'],
+	['&piv;',     '&#982;',  false,'pi symbol'],
+	['&real;',    '&#8476;', false,'real part symbol'],
+	['&thetasym;','&#977;',  false,'theta symbol'],
+	['&upsih;',   '&#978;',  false,'upsilon - hook symbol'],
+	['&weierp;',  '&#8472;', false,'Weierstrass p'],
+	['&image;',   '&#8465;', false,'imaginary part'],
+// arrows
+	['&larr;',    '&#8592;', true, 'leftwards arrow'],
+	['&uarr;',    '&#8593;', true, 'upwards arrow'],
+	['&rarr;',    '&#8594;', true, 'rightwards arrow'],
+	['&darr;',    '&#8595;', true, 'downwards arrow'],
+	['&harr;',    '&#8596;', true, 'left right arrow'],
+	['&crarr;',   '&#8629;', false,'carriage return'],
+	['&lArr;',    '&#8656;', false,'leftwards double arrow'],
+	['&uArr;',    '&#8657;', false,'upwards double arrow'],
+	['&rArr;',    '&#8658;', false,'rightwards double arrow'],
+	['&dArr;',    '&#8659;', false,'downwards double arrow'],
+	['&hArr;',    '&#8660;', false,'left right double arrow'],
+	['&there4;',  '&#8756;', false,'therefore'],
+	['&sub;',     '&#8834;', false,'subset of'],
+	['&sup;',     '&#8835;', false,'superset of'],
+	['&nsub;',    '&#8836;', false,'not a subset of'],
+	['&sube;',    '&#8838;', false,'subset of or equal to'],
+	['&supe;',    '&#8839;', false,'superset of or equal to'],
+	['&oplus;',   '&#8853;', false,'circled plus'],
+	['&otimes;',  '&#8855;', false,'circled times'],
+	['&perp;',    '&#8869;', false,'perpendicular'],
+	['&sdot;',    '&#8901;', false,'dot operator'],
+	['&lceil;',   '&#8968;', false,'left ceiling'],
+	['&rceil;',   '&#8969;', false,'right ceiling'],
+	['&lfloor;',  '&#8970;', false,'left floor'],
+	['&rfloor;',  '&#8971;', false,'right floor'],
+	['&lang;',    '&#9001;', false,'left-pointing angle bracket'],
+	['&rang;',    '&#9002;', false,'right-pointing angle bracket'],
+	['&loz;',     '&#9674;', true, 'lozenge'],
+	['&spades;',  '&#9824;', true, 'black spade suit'],
+	['&clubs;',   '&#9827;', true, 'black club suit'],
+	['&hearts;',  '&#9829;', true, 'black heart suit'],
+	['&diams;',   '&#9830;', true, 'black diamond suit'],
+	['&ensp;',    '&#8194;', false,'en space'],
+	['&emsp;',    '&#8195;', false,'em space'],
+	['&thinsp;',  '&#8201;', false,'thin space'],
+	['&zwnj;',    '&#8204;', false,'zero width non-joiner'],
+	['&zwj;',     '&#8205;', false,'zero width joiner'],
+	['&lrm;',     '&#8206;', false,'left-to-right mark'],
+	['&rlm;',     '&#8207;', false,'right-to-left mark'],
+	['&shy;',     '&#173;',  false,'soft hyphen']
+];
+
+tinyMCEPopup.onInit.add(function() {
+	tinyMCEPopup.dom.setHTML('charmapView', renderCharMapHTML());
+	addKeyboardNavigation();
+});
+
+function addKeyboardNavigation(){
+	var tableElm, cells, settings;
+
+	cells = tinyMCEPopup.dom.select("a.charmaplink", "charmapgroup");
+
+	settings ={
+		root: "charmapgroup",
+		items: cells
+	};
+	cells[0].tabindex=0;
+	tinyMCEPopup.dom.addClass(cells[0], "mceFocus");
+	if (tinymce.isGecko) {
+		cells[0].focus();		
+	} else {
+		setTimeout(function(){
+			cells[0].focus();
+		}, 100);
+	}
+	tinyMCEPopup.editor.windowManager.createInstance('tinymce.ui.KeyboardNavigation', settings, tinyMCEPopup.dom);
+}
+
+function renderCharMapHTML() {
+	var charsPerRow = 20, tdWidth=20, tdHeight=20, i;
+	var html = '<div id="charmapgroup" aria-labelledby="charmap_label" tabindex="0" role="listbox">'+
+	'<table role="presentation" border="0" cellspacing="1" cellpadding="0" width="' + (tdWidth*charsPerRow) + 
+	'"><tr height="' + tdHeight + '">';
+	var cols=-1;
+
+	for (i=0; i<charmap.length; i++) {
+		var previewCharFn;
+
+		if (charmap[i][2]==true) {
+			cols++;
+			previewCharFn = 'previewChar(\'' + charmap[i][1].substring(1,charmap[i][1].length) + '\',\'' + charmap[i][0].substring(1,charmap[i][0].length) + '\',\'' + charmap[i][3] + '\');';
+			html += ''
+				+ '<td class="charmap">'
+				+ '<a class="charmaplink" role="button" onmouseover="'+previewCharFn+'" onfocus="'+previewCharFn+'" href="javascript:void(0)" onclick="insertChar(\'' + charmap[i][1].substring(2,charmap[i][1].length-1) + '\');" onclick="return false;" onmousedown="return false;" title="' + charmap[i][3] + ' '+ tinyMCEPopup.editor.translate("advanced_dlg.charmap_usage")+'">'
+				+ charmap[i][1]
+				+ '</a></td>';
+			if ((cols+1) % charsPerRow == 0)
+				html += '</tr><tr height="' + tdHeight + '">';
+		}
+	 }
+
+	if (cols % charsPerRow > 0) {
+		var padd = charsPerRow - (cols % charsPerRow);
+		for (var i=0; i<padd-1; i++)
+			html += '<td width="' + tdWidth + '" height="' + tdHeight + '" class="charmap">&nbsp;</td>';
+	}
+
+	html += '</tr></table></div>';
+	html = html.replace(/<tr height="20"><\/tr>/g, '');
+
+	return html;
+}
+
+function insertChar(chr) {
+	tinyMCEPopup.execCommand('mceInsertContent', false, '&#' + chr + ';');
+
+	// Refocus in window
+	if (tinyMCEPopup.isWindow)
+		window.focus();
+
+	tinyMCEPopup.editor.focus();
+	tinyMCEPopup.close();
+}
+
+function previewChar(codeA, codeB, codeN) {
+	var elmA = document.getElementById('codeA');
+	var elmB = document.getElementById('codeB');
+	var elmV = document.getElementById('codeV');
+	var elmN = document.getElementById('codeN');
+
+	if (codeA=='#160;') {
+		elmV.innerHTML = '__';
+	} else {
+		elmV.innerHTML = '&' + codeA;
+	}
+
+	elmB.innerHTML = '&amp;' + codeA;
+	elmA.innerHTML = '&amp;' + codeB;
+	elmN.innerHTML = codeN;
+}
diff --git a/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/themes/advanced/js/color_picker.js b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/themes/advanced/js/color_picker.js
new file mode 100644
index 0000000..cc891c1
--- /dev/null
+++ b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/themes/advanced/js/color_picker.js
@@ -0,0 +1,345 @@
+tinyMCEPopup.requireLangPack();
+
+var detail = 50, strhex = "0123456789abcdef", i, isMouseDown = false, isMouseOver = false;
+
+var colors = [
+	"#000000","#000033","#000066","#000099","#0000cc","#0000ff","#330000","#330033",
+	"#330066","#330099","#3300cc","#3300ff","#660000","#660033","#660066","#660099",
+	"#6600cc","#6600ff","#990000","#990033","#990066","#990099","#9900cc","#9900ff",
+	"#cc0000","#cc0033","#cc0066","#cc0099","#cc00cc","#cc00ff","#ff0000","#ff0033",
+	"#ff0066","#ff0099","#ff00cc","#ff00ff","#003300","#003333","#003366","#003399",
+	"#0033cc","#0033ff","#333300","#333333","#333366","#333399","#3333cc","#3333ff",
+	"#663300","#663333","#663366","#663399","#6633cc","#6633ff","#993300","#993333",
+	"#993366","#993399","#9933cc","#9933ff","#cc3300","#cc3333","#cc3366","#cc3399",
+	"#cc33cc","#cc33ff","#ff3300","#ff3333","#ff3366","#ff3399","#ff33cc","#ff33ff",
+	"#006600","#006633","#006666","#006699","#0066cc","#0066ff","#336600","#336633",
+	"#336666","#336699","#3366cc","#3366ff","#666600","#666633","#666666","#666699",
+	"#6666cc","#6666ff","#996600","#996633","#996666","#996699","#9966cc","#9966ff",
+	"#cc6600","#cc6633","#cc6666","#cc6699","#cc66cc","#cc66ff","#ff6600","#ff6633",
+	"#ff6666","#ff6699","#ff66cc","#ff66ff","#009900","#009933","#009966","#009999",
+	"#0099cc","#0099ff","#339900","#339933","#339966","#339999","#3399cc","#3399ff",
+	"#669900","#669933","#669966","#669999","#6699cc","#6699ff","#999900","#999933",
+	"#999966","#999999","#9999cc","#9999ff","#cc9900","#cc9933","#cc9966","#cc9999",
+	"#cc99cc","#cc99ff","#ff9900","#ff9933","#ff9966","#ff9999","#ff99cc","#ff99ff",
+	"#00cc00","#00cc33","#00cc66","#00cc99","#00cccc","#00ccff","#33cc00","#33cc33",
+	"#33cc66","#33cc99","#33cccc","#33ccff","#66cc00","#66cc33","#66cc66","#66cc99",
+	"#66cccc","#66ccff","#99cc00","#99cc33","#99cc66","#99cc99","#99cccc","#99ccff",
+	"#cccc00","#cccc33","#cccc66","#cccc99","#cccccc","#ccccff","#ffcc00","#ffcc33",
+	"#ffcc66","#ffcc99","#ffcccc","#ffccff","#00ff00","#00ff33","#00ff66","#00ff99",
+	"#00ffcc","#00ffff","#33ff00","#33ff33","#33ff66","#33ff99","#33ffcc","#33ffff",
+	"#66ff00","#66ff33","#66ff66","#66ff99","#66ffcc","#66ffff","#99ff00","#99ff33",
+	"#99ff66","#99ff99","#99ffcc","#99ffff","#ccff00","#ccff33","#ccff66","#ccff99",
+	"#ccffcc","#ccffff","#ffff00","#ffff33","#ffff66","#ffff99","#ffffcc","#ffffff"
+];
+
+var named = {
+	'#F0F8FF':'Alice Blue','#FAEBD7':'Antique White','#00FFFF':'Aqua','#7FFFD4':'Aquamarine','#F0FFFF':'Azure','#F5F5DC':'Beige',
+	'#FFE4C4':'Bisque','#000000':'Black','#FFEBCD':'Blanched Almond','#0000FF':'Blue','#8A2BE2':'Blue Violet','#A52A2A':'Brown',
+	'#DEB887':'Burly Wood','#5F9EA0':'Cadet Blue','#7FFF00':'Chartreuse','#D2691E':'Chocolate','#FF7F50':'Coral','#6495ED':'Cornflower Blue',
+	'#FFF8DC':'Cornsilk','#DC143C':'Crimson','#00FFFF':'Cyan','#00008B':'Dark Blue','#008B8B':'Dark Cyan','#B8860B':'Dark Golden Rod',
+	'#A9A9A9':'Dark Gray','#A9A9A9':'Dark Grey','#006400':'Dark Green','#BDB76B':'Dark Khaki','#8B008B':'Dark Magenta','#556B2F':'Dark Olive Green',
+	'#FF8C00':'Darkorange','#9932CC':'Dark Orchid','#8B0000':'Dark Red','#E9967A':'Dark Salmon','#8FBC8F':'Dark Sea Green','#483D8B':'Dark Slate Blue',
+	'#2F4F4F':'Dark Slate Gray','#2F4F4F':'Dark Slate Grey','#00CED1':'Dark Turquoise','#9400D3':'Dark Violet','#FF1493':'Deep Pink','#00BFFF':'Deep Sky Blue',
+	'#696969':'Dim Gray','#696969':'Dim Grey','#1E90FF':'Dodger Blue','#B22222':'Fire Brick','#FFFAF0':'Floral White','#228B22':'Forest Green',
+	'#FF00FF':'Fuchsia','#DCDCDC':'Gainsboro','#F8F8FF':'Ghost White','#FFD700':'Gold','#DAA520':'Golden Rod','#808080':'Gray','#808080':'Grey',
+	'#008000':'Green','#ADFF2F':'Green Yellow','#F0FFF0':'Honey Dew','#FF69B4':'Hot Pink','#CD5C5C':'Indian Red','#4B0082':'Indigo','#FFFFF0':'Ivory',
+	'#F0E68C':'Khaki','#E6E6FA':'Lavender','#FFF0F5':'Lavender Blush','#7CFC00':'Lawn Green','#FFFACD':'Lemon Chiffon','#ADD8E6':'Light Blue',
+	'#F08080':'Light Coral','#E0FFFF':'Light Cyan','#FAFAD2':'Light Golden Rod Yellow','#D3D3D3':'Light Gray','#D3D3D3':'Light Grey','#90EE90':'Light Green',
+	'#FFB6C1':'Light Pink','#FFA07A':'Light Salmon','#20B2AA':'Light Sea Green','#87CEFA':'Light Sky Blue','#778899':'Light Slate Gray','#778899':'Light Slate Grey',
+	'#B0C4DE':'Light Steel Blue','#FFFFE0':'Light Yellow','#00FF00':'Lime','#32CD32':'Lime Green','#FAF0E6':'Linen','#FF00FF':'Magenta','#800000':'Maroon',
+	'#66CDAA':'Medium Aqua Marine','#0000CD':'Medium Blue','#BA55D3':'Medium Orchid','#9370D8':'Medium Purple','#3CB371':'Medium Sea Green','#7B68EE':'Medium Slate Blue',
+	'#00FA9A':'Medium Spring Green','#48D1CC':'Medium Turquoise','#C71585':'Medium Violet Red','#191970':'Midnight Blue','#F5FFFA':'Mint Cream','#FFE4E1':'Misty Rose','#FFE4B5':'Moccasin',
+	'#FFDEAD':'Navajo White','#000080':'Navy','#FDF5E6':'Old Lace','#808000':'Olive','#6B8E23':'Olive Drab','#FFA500':'Orange','#FF4500':'Orange Red','#DA70D6':'Orchid',
+	'#EEE8AA':'Pale Golden Rod','#98FB98':'Pale Green','#AFEEEE':'Pale Turquoise','#D87093':'Pale Violet Red','#FFEFD5':'Papaya Whip','#FFDAB9':'Peach Puff',
+	'#CD853F':'Peru','#FFC0CB':'Pink','#DDA0DD':'Plum','#B0E0E6':'Powder Blue','#800080':'Purple','#FF0000':'Red','#BC8F8F':'Rosy Brown','#4169E1':'Royal Blue',
+	'#8B4513':'Saddle Brown','#FA8072':'Salmon','#F4A460':'Sandy Brown','#2E8B57':'Sea Green','#FFF5EE':'Sea Shell','#A0522D':'Sienna','#C0C0C0':'Silver',
+	'#87CEEB':'Sky Blue','#6A5ACD':'Slate Blue','#708090':'Slate Gray','#708090':'Slate Grey','#FFFAFA':'Snow','#00FF7F':'Spring Green',
+	'#4682B4':'Steel Blue','#D2B48C':'Tan','#008080':'Teal','#D8BFD8':'Thistle','#FF6347':'Tomato','#40E0D0':'Turquoise','#EE82EE':'Violet',
+	'#F5DEB3':'Wheat','#FFFFFF':'White','#F5F5F5':'White Smoke','#FFFF00':'Yellow','#9ACD32':'Yellow Green'
+};
+
+var namedLookup = {};
+
+function init() {
+	var inputColor = convertRGBToHex(tinyMCEPopup.getWindowArg('input_color')), key, value;
+
+	tinyMCEPopup.resizeToInnerSize();
+
+	generatePicker();
+	generateWebColors();
+	generateNamedColors();
+
+	if (inputColor) {
+		changeFinalColor(inputColor);
+
+		col = convertHexToRGB(inputColor);
+
+		if (col)
+			updateLight(col.r, col.g, col.b);
+	}
+
+	for (key in named) {
+		value = named[key];
+		namedLookup[value.replace(/\s+/, '').toLowerCase()] = key.replace(/#/, '').toLowerCase();
+	}
+}
+
+function toHexColor(color) {
+	var matches, red, green, blue, toInt = parseInt;
+
+	function hex(value) {
+		value = parseInt(value).toString(16);
+
+		return value.length > 1 ? value : '0' + value; // Padd with leading zero
+	};
+
+	color = tinymce.trim(color);
+	color = color.replace(/^[#]/, '').toLowerCase();  // remove leading '#'
+	color = namedLookup[color] || color;
+
+	matches = /^rgb\((\d{1,3}),(\d{1,3}),(\d{1,3})\)$/.exec(color);
+
+	if (matches) {
+		red   = toInt(matches[1]);
+		green = toInt(matches[2]);
+		blue  = toInt(matches[3]);
+	} else {
+		matches = /^([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})$/.exec(color);
+
+		if (matches) {
+			red   = toInt(matches[1], 16);
+			green = toInt(matches[2], 16);
+			blue  = toInt(matches[3], 16);
+		} else {
+			matches = /^([0-9a-f])([0-9a-f])([0-9a-f])$/.exec(color);
+
+			if (matches) {
+				red   = toInt(matches[1] + matches[1], 16);
+				green = toInt(matches[2] + matches[2], 16);
+				blue  = toInt(matches[3] + matches[3], 16);
+			} else {
+				return '';
+			}
+		}
+	}
+
+	return '#' + hex(red) + hex(green) + hex(blue);
+}
+
+function insertAction() {
+	var color = document.getElementById("color").value, f = tinyMCEPopup.getWindowArg('func');
+
+	var hexColor = toHexColor(color);
+
+	if (hexColor === '') {
+		var text = tinyMCEPopup.editor.getLang('advanced_dlg.invalid_color_value');
+		tinyMCEPopup.alert(text + ': ' + color);
+	}
+	else {
+		tinyMCEPopup.restoreSelection();
+
+		if (f)
+			f(hexColor);
+
+		tinyMCEPopup.close();
+	}
+}
+
+function showColor(color, name) {
+	if (name)
+		document.getElementById("colorname").innerHTML = name;
+
+	document.getElementById("preview").style.backgroundColor = color;
+	document.getElementById("color").value = color.toUpperCase();
+}
+
+function convertRGBToHex(col) {
+	var re = new RegExp("rgb\\s*\\(\\s*([0-9]+).*,\\s*([0-9]+).*,\\s*([0-9]+).*\\)", "gi");
+
+	if (!col)
+		return col;
+
+	var rgb = col.replace(re, "$1,$2,$3").split(',');
+	if (rgb.length == 3) {
+		r = parseInt(rgb[0]).toString(16);
+		g = parseInt(rgb[1]).toString(16);
+		b = parseInt(rgb[2]).toString(16);
+
+		r = r.length == 1 ? '0' + r : r;
+		g = g.length == 1 ? '0' + g : g;
+		b = b.length == 1 ? '0' + b : b;
+
+		return "#" + r + g + b;
+	}
+
+	return col;
+}
+
+function convertHexToRGB(col) {
+	if (col.indexOf('#') != -1) {
+		col = col.replace(new RegExp('[^0-9A-F]', 'gi'), '');
+
+		r = parseInt(col.substring(0, 2), 16);
+		g = parseInt(col.substring(2, 4), 16);
+		b = parseInt(col.substring(4, 6), 16);
+
+		return {r : r, g : g, b : b};
+	}
+
+	return null;
+}
+
+function generatePicker() {
+	var el = document.getElementById('light'), h = '', i;
+
+	for (i = 0; i < detail; i++){
+		h += '<div id="gs'+i+'" style="background-color:#000000; width:15px; height:3px; border-style:none; border-width:0px;"'
+		+ ' onclick="changeFinalColor(this.style.backgroundColor)"'
+		+ ' onmousedown="isMouseDown = true; return false;"'
+		+ ' onmouseup="isMouseDown = false;"'
+		+ ' onmousemove="if (isMouseDown && isMouseOver) changeFinalColor(this.style.backgroundColor); return false;"'
+		+ ' onmouseover="isMouseOver = true;"'
+		+ ' onmouseout="isMouseOver = false;"'
+		+ '></div>';
+	}
+
+	el.innerHTML = h;
+}
+
+function generateWebColors() {
+	var el = document.getElementById('webcolors'), h = '', i;
+
+	if (el.className == 'generated')
+		return;
+
+	// TODO: VoiceOver doesn't seem to support legend as a label referenced by labelledby.
+	h += '<div role="listbox" aria-labelledby="webcolors_title" tabindex="0"><table role="presentation" border="0" cellspacing="1" cellpadding="0">'
+		+ '<tr>';
+
+	for (i=0; i<colors.length; i++) {
+		h += '<td bgcolor="' + colors[i] + '" width="10" height="10">'
+			+ '<a href="javascript:insertAction();" role="option" tabindex="-1" aria-labelledby="web_colors_' + i + '" onfocus="showColor(\'' + colors[i] + '\');" onmouseover="showColor(\'' + colors[i] + '\');" style="display:block;width:10px;height:10px;overflow:hidden;">';
+		if (tinyMCEPopup.editor.forcedHighContrastMode) {
+			h += '<canvas class="mceColorSwatch" height="10" width="10" data-color="' + colors[i] + '"></canvas>';
+		}
+		h += '<span class="mceVoiceLabel" style="display:none;" id="web_colors_' + i + '">' + colors[i].toUpperCase() + '</span>';
+		h += '</a></td>';
+		if ((i+1) % 18 == 0)
+			h += '</tr><tr>';
+	}
+
+	h += '</table></div>';
+
+	el.innerHTML = h;
+	el.className = 'generated';
+
+	paintCanvas(el);
+	enableKeyboardNavigation(el.firstChild);
+}
+
+function paintCanvas(el) {
+	tinyMCEPopup.getWin().tinymce.each(tinyMCEPopup.dom.select('canvas.mceColorSwatch', el), function(canvas) {
+		var context;
+		if (canvas.getContext && (context = canvas.getContext("2d"))) {
+			context.fillStyle = canvas.getAttribute('data-color');
+			context.fillRect(0, 0, 10, 10);
+		}
+	});
+}
+function generateNamedColors() {
+	var el = document.getElementById('namedcolors'), h = '', n, v, i = 0;
+
+	if (el.className == 'generated')
+		return;
+
+	for (n in named) {
+		v = named[n];
+		h += '<a href="javascript:insertAction();" role="option" tabindex="-1" aria-labelledby="named_colors_' + i + '" onfocus="showColor(\'' + n + '\',\'' + v + '\');" onmouseover="showColor(\'' + n + '\',\'' + v + '\');" style="background-color: ' + n + '">';
+		if (tinyMCEPopup.editor.forcedHighContrastMode) {
+			h += '<canvas class="mceColorSwatch" height="10" width="10" data-color="' + colors[i] + '"></canvas>';
+		}
+		h += '<span class="mceVoiceLabel" style="display:none;" id="named_colors_' + i + '">' + v + '</span>';
+		h += '</a>';
+		i++;
+	}
+
+	el.innerHTML = h;
+	el.className = 'generated';
+
+	paintCanvas(el);
+	enableKeyboardNavigation(el);
+}
+
+function enableKeyboardNavigation(el) {
+	tinyMCEPopup.editor.windowManager.createInstance('tinymce.ui.KeyboardNavigation', {
+		root: el,
+		items: tinyMCEPopup.dom.select('a', el)
+	}, tinyMCEPopup.dom);
+}
+
+function dechex(n) {
+	return strhex.charAt(Math.floor(n / 16)) + strhex.charAt(n % 16);
+}
+
+function computeColor(e) {
+	var x, y, partWidth, partDetail, imHeight, r, g, b, coef, i, finalCoef, finalR, finalG, finalB, pos = tinyMCEPopup.dom.getPos(e.target);
+
+	x = e.offsetX ? e.offsetX : (e.target ? e.clientX - pos.x : 0);
+	y = e.offsetY ? e.offsetY : (e.target ? e.clientY - pos.y : 0);
+
+	partWidth = document.getElementById('colors').width / 6;
+	partDetail = detail / 2;
+	imHeight = document.getElementById('colors').height;
+
+	r = (x >= 0)*(x < partWidth)*255 + (x >= partWidth)*(x < 2*partWidth)*(2*255 - x * 255 / partWidth) + (x >= 4*partWidth)*(x < 5*partWidth)*(-4*255 + x * 255 / partWidth) + (x >= 5*partWidth)*(x < 6*partWidth)*255;
+	g = (x >= 0)*(x < partWidth)*(x * 255 / partWidth) + (x >= partWidth)*(x < 3*partWidth)*255	+ (x >= 3*partWidth)*(x < 4*partWidth)*(4*255 - x * 255 / partWidth);
+	b = (x >= 2*partWidth)*(x < 3*partWidth)*(-2*255 + x * 255 / partWidth) + (x >= 3*partWidth)*(x < 5*partWidth)*255 + (x >= 5*partWidth)*(x < 6*partWidth)*(6*255 - x * 255 / partWidth);
+
+	coef = (imHeight - y) / imHeight;
+	r = 128 + (r - 128) * coef;
+	g = 128 + (g - 128) * coef;
+	b = 128 + (b - 128) * coef;
+
+	changeFinalColor('#' + dechex(r) + dechex(g) + dechex(b));
+	updateLight(r, g, b);
+}
+
+function updateLight(r, g, b) {
+	var i, partDetail = detail / 2, finalCoef, finalR, finalG, finalB, color;
+
+	for (i=0; i<detail; i++) {
+		if ((i>=0) && (i<partDetail)) {
+			finalCoef = i / partDetail;
+			finalR = dechex(255 - (255 - r) * finalCoef);
+			finalG = dechex(255 - (255 - g) * finalCoef);
+			finalB = dechex(255 - (255 - b) * finalCoef);
+		} else {
+			finalCoef = 2 - i / partDetail;
+			finalR = dechex(r * finalCoef);
+			finalG = dechex(g * finalCoef);
+			finalB = dechex(b * finalCoef);
+		}
+
+		color = finalR + finalG + finalB;
+
+		setCol('gs' + i, '#'+color);
+	}
+}
+
+function changeFinalColor(color) {
+	if (color.indexOf('#') == -1)
+		color = convertRGBToHex(color);
+
+	setCol('preview', color);
+	document.getElementById('color').value = color;
+}
+
+function setCol(e, c) {
+	try {
+		document.getElementById(e).style.backgroundColor = c;
+	} catch (ex) {
+		// Ignore IE warning
+	}
+}
+
+tinyMCEPopup.onInit.add(init);
diff --git a/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/themes/advanced/js/image.js b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/themes/advanced/js/image.js
new file mode 100644
index 0000000..3f93e2d
--- /dev/null
+++ b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/themes/advanced/js/image.js
@@ -0,0 +1,253 @@
+var ImageDialog = {
+	preInit : function() {
+		var url;
+
+		tinyMCEPopup.requireLangPack();
+
+		if (url = tinyMCEPopup.getParam("external_image_list_url"))
+			document.write('<script language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');
+	},
+
+	init : function() {
+		var f = document.forms[0], ed = tinyMCEPopup.editor;
+
+		// Setup browse button
+		document.getElementById('srcbrowsercontainer').innerHTML = getBrowserHTML('srcbrowser','src','image','theme_advanced_image');
+		if (isVisible('srcbrowser'))
+			document.getElementById('src').style.width = '180px';
+
+		e = ed.selection.getNode();
+
+		this.fillFileList('image_list', tinyMCEPopup.getParam('external_image_list', 'tinyMCEImageList'));
+
+		if (e.nodeName == 'IMG') {
+			f.src.value = ed.dom.getAttrib(e, 'src');
+			f.alt.value = ed.dom.getAttrib(e, 'alt');
+			f.border.value = this.getAttrib(e, 'border');
+			f.vspace.value = this.getAttrib(e, 'vspace');
+			f.hspace.value = this.getAttrib(e, 'hspace');
+			f.width.value = ed.dom.getAttrib(e, 'width');
+			f.height.value = ed.dom.getAttrib(e, 'height');
+			f.insert.value = ed.getLang('update');
+			this.styleVal = ed.dom.getAttrib(e, 'style');
+			selectByValue(f, 'image_list', f.src.value);
+			selectByValue(f, 'align', this.getAttrib(e, 'align'));
+			this.updateStyle();
+		}
+	},
+
+	fillFileList : function(id, l) {
+		var dom = tinyMCEPopup.dom, lst = dom.get(id), v, cl;
+
+		l = typeof(l) === 'function' ? l() : window[l];
+
+		if (l && l.length > 0) {
+			lst.options[lst.options.length] = new Option('', '');
+
+			tinymce.each(l, function(o) {
+				lst.options[lst.options.length] = new Option(o[0], o[1]);
+			});
+		} else
+			dom.remove(dom.getParent(id, 'tr'));
+	},
+
+	update : function() {
+		var f = document.forms[0], nl = f.elements, ed = tinyMCEPopup.editor, args = {}, el;
+
+		tinyMCEPopup.restoreSelection();
+
+		if (f.src.value === '') {
+			if (ed.selection.getNode().nodeName == 'IMG') {
+				ed.dom.remove(ed.selection.getNode());
+				ed.execCommand('mceRepaint');
+			}
+
+			tinyMCEPopup.close();
+			return;
+		}
+
+		if (!ed.settings.inline_styles) {
+			args = tinymce.extend(args, {
+				vspace : nl.vspace.value,
+				hspace : nl.hspace.value,
+				border : nl.border.value,
+				align : getSelectValue(f, 'align')
+			});
+		} else
+			args.style = this.styleVal;
+
+		tinymce.extend(args, {
+			src : f.src.value.replace(/ /g, '%20'),
+			alt : f.alt.value,
+			width : f.width.value,
+			height : f.height.value
+		});
+
+		el = ed.selection.getNode();
+
+		if (el && el.nodeName == 'IMG') {
+			ed.dom.setAttribs(el, args);
+			tinyMCEPopup.editor.execCommand('mceRepaint');
+			tinyMCEPopup.editor.focus();
+		} else {
+			tinymce.each(args, function(value, name) {
+				if (value === "") {
+					delete args[name];
+				}
+			});
+
+			ed.execCommand('mceInsertContent', false, tinyMCEPopup.editor.dom.createHTML('img', args), {skip_undo : 1});
+			ed.undoManager.add();
+		}
+
+		tinyMCEPopup.close();
+	},
+
+	updateStyle : function() {
+		var dom = tinyMCEPopup.dom, st = {}, v, f = document.forms[0];
+
+		if (tinyMCEPopup.editor.settings.inline_styles) {
+			tinymce.each(tinyMCEPopup.dom.parseStyle(this.styleVal), function(value, key) {
+				st[key] = value;
+			});
+
+			// Handle align
+			v = getSelectValue(f, 'align');
+			if (v) {
+				if (v == 'left' || v == 'right') {
+					st['float'] = v;
+					delete st['vertical-align'];
+				} else {
+					st['vertical-align'] = v;
+					delete st['float'];
+				}
+			} else {
+				delete st['float'];
+				delete st['vertical-align'];
+			}
+
+			// Handle border
+			v = f.border.value;
+			if (v || v == '0') {
+				if (v == '0')
+					st['border'] = '0';
+				else
+					st['border'] = v + 'px solid black';
+			} else
+				delete st['border'];
+
+			// Handle hspace
+			v = f.hspace.value;
+			if (v) {
+				delete st['margin'];
+				st['margin-left'] = v + 'px';
+				st['margin-right'] = v + 'px';
+			} else {
+				delete st['margin-left'];
+				delete st['margin-right'];
+			}
+
+			// Handle vspace
+			v = f.vspace.value;
+			if (v) {
+				delete st['margin'];
+				st['margin-top'] = v + 'px';
+				st['margin-bottom'] = v + 'px';
+			} else {
+				delete st['margin-top'];
+				delete st['margin-bottom'];
+			}
+
+			// Merge
+			st = tinyMCEPopup.dom.parseStyle(dom.serializeStyle(st), 'img');
+			this.styleVal = dom.serializeStyle(st, 'img');
+		}
+	},
+
+	getAttrib : function(e, at) {
+		var ed = tinyMCEPopup.editor, dom = ed.dom, v, v2;
+
+		if (ed.settings.inline_styles) {
+			switch (at) {
+				case 'align':
+					if (v = dom.getStyle(e, 'float'))
+						return v;
+
+					if (v = dom.getStyle(e, 'vertical-align'))
+						return v;
+
+					break;
+
+				case 'hspace':
+					v = dom.getStyle(e, 'margin-left')
+					v2 = dom.getStyle(e, 'margin-right');
+					if (v && v == v2)
+						return parseInt(v.replace(/[^0-9]/g, ''));
+
+					break;
+
+				case 'vspace':
+					v = dom.getStyle(e, 'margin-top')
+					v2 = dom.getStyle(e, 'margin-bottom');
+					if (v && v == v2)
+						return parseInt(v.replace(/[^0-9]/g, ''));
+
+					break;
+
+				case 'border':
+					v = 0;
+
+					tinymce.each(['top', 'right', 'bottom', 'left'], function(sv) {
+						sv = dom.getStyle(e, 'border-' + sv + '-width');
+
+						// False or not the same as prev
+						if (!sv || (sv != v && v !== 0)) {
+							v = 0;
+							return false;
+						}
+
+						if (sv)
+							v = sv;
+					});
+
+					if (v)
+						return parseInt(v.replace(/[^0-9]/g, ''));
+
+					break;
+			}
+		}
+
+		if (v = dom.getAttrib(e, at))
+			return v;
+
+		return '';
+	},
+
+	resetImageData : function() {
+		var f = document.forms[0];
+
+		f.width.value = f.height.value = "";	
+	},
+
+	updateImageData : function() {
+		var f = document.forms[0], t = ImageDialog;
+
+		if (f.width.value == "")
+			f.width.value = t.preloadImg.width;
+
+		if (f.height.value == "")
+			f.height.value = t.preloadImg.height;
+	},
+
+	getImageData : function() {
+		var f = document.forms[0];
+
+		this.preloadImg = new Image();
+		this.preloadImg.onload = this.updateImageData;
+		this.preloadImg.onerror = this.resetImageData;
+		this.preloadImg.src = tinyMCEPopup.editor.documentBaseURI.toAbsolute(f.src.value);
+	}
+};
+
+ImageDialog.preInit();
+tinyMCEPopup.onInit.add(ImageDialog.init, ImageDialog);
diff --git a/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/themes/advanced/js/link.js b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/themes/advanced/js/link.js
new file mode 100644
index 0000000..b08b2ba
--- /dev/null
+++ b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/themes/advanced/js/link.js
@@ -0,0 +1,159 @@
+tinyMCEPopup.requireLangPack();
+
+var LinkDialog = {
+	preInit : function() {
+		var url;
+
+		if (url = tinyMCEPopup.getParam("external_link_list_url"))
+			document.write('<script language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');
+	},
+
+	init : function() {
+		var f = document.forms[0], ed = tinyMCEPopup.editor;
+
+		// Setup browse button
+		document.getElementById('hrefbrowsercontainer').innerHTML = getBrowserHTML('hrefbrowser', 'href', 'file', 'theme_advanced_link');
+		if (isVisible('hrefbrowser'))
+			document.getElementById('href').style.width = '180px';
+
+		this.fillClassList('class_list');
+		this.fillFileList('link_list', 'tinyMCELinkList');
+		this.fillTargetList('target_list');
+
+		if (e = ed.dom.getParent(ed.selection.getNode(), 'A')) {
+			f.href.value = ed.dom.getAttrib(e, 'href');
+			f.linktitle.value = ed.dom.getAttrib(e, 'title');
+			f.insert.value = ed.getLang('update');
+			selectByValue(f, 'link_list', f.href.value);
+			selectByValue(f, 'target_list', ed.dom.getAttrib(e, 'target'));
+			selectByValue(f, 'class_list', ed.dom.getAttrib(e, 'class'));
+		}
+	},
+
+	update : function() {
+		var f = document.forms[0], ed = tinyMCEPopup.editor, e, b, href = f.href.value.replace(/ /g, '%20');
+
+		tinyMCEPopup.restoreSelection();
+		e = ed.dom.getParent(ed.selection.getNode(), 'A');
+
+		// Remove element if there is no href
+		if (!f.href.value) {
+			if (e) {
+				b = ed.selection.getBookmark();
+				ed.dom.remove(e, 1);
+				ed.selection.moveToBookmark(b);
+				tinyMCEPopup.execCommand("mceEndUndoLevel");
+				tinyMCEPopup.close();
+				return;
+			}
+		}
+
+		// Create new anchor elements
+		if (e == null) {
+			ed.getDoc().execCommand("unlink", false, null);
+			tinyMCEPopup.execCommand("mceInsertLink", false, "#mce_temp_url#", {skip_undo : 1});
+
+			tinymce.each(ed.dom.select("a"), function(n) {
+				if (ed.dom.getAttrib(n, 'href') == '#mce_temp_url#') {
+					e = n;
+
+					ed.dom.setAttribs(e, {
+						href : href,
+						title : f.linktitle.value,
+						target : f.target_list ? getSelectValue(f, "target_list") : null,
+						'class' : f.class_list ? getSelectValue(f, "class_list") : null
+					});
+				}
+			});
+		} else {
+			ed.dom.setAttribs(e, {
+				href : href,
+				title : f.linktitle.value
+			});
+	
+			if (f.target_list) {
+				ed.dom.setAttrib(e, 'target', getSelectValue(f, "target_list"));
+			}
+
+			if (f.class_list) {
+				ed.dom.setAttrib(e, 'class', getSelectValue(f, "class_list"));
+			}
+		}
+
+		// Don't move caret if selection was image
+		if (e.childNodes.length != 1 || e.firstChild.nodeName != 'IMG') {
+			ed.focus();
+			ed.selection.select(e);
+			ed.selection.collapse(0);
+			tinyMCEPopup.storeSelection();
+		}
+
+		tinyMCEPopup.execCommand("mceEndUndoLevel");
+		tinyMCEPopup.close();
+	},
+
+	checkPrefix : function(n) {
+		if (n.value && Validator.isEmail(n) && !/^\s*mailto:/i.test(n.value) && confirm(tinyMCEPopup.getLang('advanced_dlg.link_is_email')))
+			n.value = 'mailto:' + n.value;
+
+		if (/^\s*www\./i.test(n.value) && confirm(tinyMCEPopup.getLang('advanced_dlg.link_is_external')))
+			n.value = 'http://' + n.value;
+	},
+
+	fillFileList : function(id, l) {
+		var dom = tinyMCEPopup.dom, lst = dom.get(id), v, cl;
+
+		l = window[l];
+
+		if (l && l.length > 0) {
+			lst.options[lst.options.length] = new Option('', '');
+
+			tinymce.each(l, function(o) {
+				lst.options[lst.options.length] = new Option(o[0], o[1]);
+			});
+		} else
+			dom.remove(dom.getParent(id, 'tr'));
+	},
+
+	fillClassList : function(id) {
+		var dom = tinyMCEPopup.dom, lst = dom.get(id), v, cl;
+
+		if (v = tinyMCEPopup.getParam('theme_advanced_styles')) {
+			cl = [];
+
+			tinymce.each(v.split(';'), function(v) {
+				var p = v.split('=');
+
+				cl.push({'title' : p[0], 'class' : p[1]});
+			});
+		} else
+			cl = tinyMCEPopup.editor.dom.getClasses();
+
+		if (cl.length > 0) {
+			lst.options[lst.options.length] = new Option(tinyMCEPopup.getLang('not_set'), '');
+
+			tinymce.each(cl, function(o) {
+				lst.options[lst.options.length] = new Option(o.title || o['class'], o['class']);
+			});
+		} else
+			dom.remove(dom.getParent(id, 'tr'));
+	},
+
+	fillTargetList : function(id) {
+		var dom = tinyMCEPopup.dom, lst = dom.get(id), v;
+
+		lst.options[lst.options.length] = new Option(tinyMCEPopup.getLang('not_set'), '');
+		lst.options[lst.options.length] = new Option(tinyMCEPopup.getLang('advanced_dlg.link_target_same'), '_self');
+		lst.options[lst.options.length] = new Option(tinyMCEPopup.getLang('advanced_dlg.link_target_blank'), '_blank');
+
+		if (v = tinyMCEPopup.getParam('theme_advanced_link_targets')) {
+			tinymce.each(v.split(','), function(v) {
+				v = v.split('=');
+				lst.options[lst.options.length] = new Option(v[0], v[1]);
+			});
+		}
+	}
+};
+
+LinkDialog.preInit();
+tinyMCEPopup.onInit.add(LinkDialog.init, LinkDialog);
diff --git a/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/themes/simple/editor_template_src.js b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/themes/simple/editor_template_src.js
new file mode 100644
index 0000000..35c19a6
--- /dev/null
+++ b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/themes/simple/editor_template_src.js
@@ -0,0 +1,84 @@
+/**
+ * editor_template_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	var DOM = tinymce.DOM;
+
+	// Tell it to load theme specific language pack(s)
+	tinymce.ThemeManager.requireLangPack('simple');
+
+	tinymce.create('tinymce.themes.SimpleTheme', {
+		init : function(ed, url) {
+			var t = this, states = ['Bold', 'Italic', 'Underline', 'Strikethrough', 'InsertUnorderedList', 'InsertOrderedList'], s = ed.settings;
+
+			t.editor = ed;
+			ed.contentCSS.push(url + "/skins/" + s.skin + "/content.css");
+
+			ed.onInit.add(function() {
+				ed.onNodeChange.add(function(ed, cm) {
+					tinymce.each(states, function(c) {
+						cm.get(c.toLowerCase()).setActive(ed.queryCommandState(c));
+					});
+				});
+			});
+
+			DOM.loadCSS((s.editor_css ? ed.documentBaseURI.toAbsolute(s.editor_css) : '') || url + "/skins/" + s.skin + "/ui.css");
+		},
+
+		renderUI : function(o) {
+			var t = this, n = o.targetNode, ic, tb, ed = t.editor, cf = ed.controlManager, sc;
+
+			n = DOM.insertAfter(DOM.create('span', {id : ed.id + '_container', 'class' : 'mceEditor ' + ed.settings.skin + 'SimpleSkin'}), n);
+			n = sc = DOM.add(n, 'table', {cellPadding : 0, cellSpacing : 0, 'class' : 'mceLayout'});
+			n = tb = DOM.add(n, 'tbody');
+
+			// Create iframe container
+			n = DOM.add(tb, 'tr');
+			n = ic = DOM.add(DOM.add(n, 'td'), 'div', {'class' : 'mceIframeContainer'});
+
+			// Create toolbar container
+			n = DOM.add(DOM.add(tb, 'tr', {'class' : 'last'}), 'td', {'class' : 'mceToolbar mceLast', align : 'center'});
+
+			// Create toolbar
+			tb = t.toolbar = cf.createToolbar("tools1");
+			tb.add(cf.createButton('bold', {title : 'simple.bold_desc', cmd : 'Bold'}));
+			tb.add(cf.createButton('italic', {title : 'simple.italic_desc', cmd : 'Italic'}));
+			tb.add(cf.createButton('underline', {title : 'simple.underline_desc', cmd : 'Underline'}));
+			tb.add(cf.createButton('strikethrough', {title : 'simple.striketrough_desc', cmd : 'Strikethrough'}));
+			tb.add(cf.createSeparator());
+			tb.add(cf.createButton('undo', {title : 'simple.undo_desc', cmd : 'Undo'}));
+			tb.add(cf.createButton('redo', {title : 'simple.redo_desc', cmd : 'Redo'}));
+			tb.add(cf.createSeparator());
+			tb.add(cf.createButton('cleanup', {title : 'simple.cleanup_desc', cmd : 'mceCleanup'}));
+			tb.add(cf.createSeparator());
+			tb.add(cf.createButton('insertunorderedlist', {title : 'simple.bullist_desc', cmd : 'InsertUnorderedList'}));
+			tb.add(cf.createButton('insertorderedlist', {title : 'simple.numlist_desc', cmd : 'InsertOrderedList'}));
+			tb.renderTo(n);
+
+			return {
+				iframeContainer : ic,
+				editorContainer : ed.id + '_container',
+				sizeContainer : sc,
+				deltaHeight : -20
+			};
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Simple theme',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			}
+		}
+	});
+
+	tinymce.ThemeManager.add('simple', tinymce.themes.SimpleTheme);
+})();
\ No newline at end of file
diff --git a/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/tiny_mce_src.js b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/tiny_mce_src.js
new file mode 100644
index 0000000..3635061
--- /dev/null
+++ b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/tiny_mce_src.js
@@ -0,0 +1,17942 @@
+// FILE IS GENERATED BY COMBINING THE SOURCES IN THE "classes" DIRECTORY SO DON'T MODIFY THIS FILE DIRECTLY
+(function(win) {
+	var whiteSpaceRe = /^\s*|\s*$/g,
+		undef, isRegExpBroken = 'B'.replace(/A(.)|B/, '$1') === '$1';
+
+	var tinymce = {
+		majorVersion : '3',
+
+		minorVersion : '5.11',
+
+		releaseDate : '2014-05-08',
+
+		_init : function() {
+			var t = this, d = document, na = navigator, ua = na.userAgent, i, nl, n, base, p, v;
+
+			t.isIE11 = ua.indexOf('Trident/') != -1 && (ua.indexOf('rv:') != -1 || na.appName.indexOf('Netscape') != -1);
+
+			t.isOpera = win.opera && opera.buildNumber;
+
+			t.isWebKit = /WebKit/.test(ua);
+
+			t.isIE = !t.isWebKit && !t.isOpera && (/MSIE/gi).test(ua) && (/Explorer/gi).test(na.appName) || t.isIE11;
+
+			t.isIE6 = t.isIE && /MSIE [56]/.test(ua);
+
+			t.isIE7 = t.isIE && /MSIE [7]/.test(ua);
+
+			t.isIE8 = t.isIE && /MSIE [8]/.test(ua);
+
+			t.isIE9 = t.isIE && /MSIE [9]/.test(ua);
+
+			t.isGecko = !t.isWebKit && !t.isIE11 && /Gecko/.test(ua);
+
+			t.isMac = ua.indexOf('Mac') != -1;
+
+			t.isAir = /adobeair/i.test(ua);
+
+			t.isIDevice = /(iPad|iPhone)/.test(ua);
+			
+			t.isIOS5 = t.isIDevice && ua.match(/AppleWebKit\/(\d*)/)[1]>=534;
+
+			// TinyMCE .NET webcontrol might be setting the values for TinyMCE
+			if (win.tinyMCEPreInit) {
+				t.suffix = tinyMCEPreInit.suffix;
+				t.baseURL = tinyMCEPreInit.base;
+				t.query = tinyMCEPreInit.query;
+				return;
+			}
+
+			// Get suffix and base
+			t.suffix = '';
+
+			// If base element found, add that infront of baseURL
+			nl = d.getElementsByTagName('base');
+			for (i=0; i<nl.length; i++) {
+				v = nl[i].href;
+				if (v) {
+					// Host only value like http://site.com or http://site.com:8008
+					if (/^https?:\/\/[^\/]+$/.test(v))
+						v += '/';
+
+					base = v ? v.match(/.*\//)[0] : ''; // Get only directory
+				}
+			}
+
+			function getBase(n) {
+				if (n.src && /tiny_mce(|_gzip|_jquery|_prototype|_full)(_dev|_src)?.js/.test(n.src)) {
+					if (/_(src|dev)\.js/g.test(n.src))
+						t.suffix = '_src';
+
+					if ((p = n.src.indexOf('?')) != -1)
+						t.query = n.src.substring(p + 1);
+
+					t.baseURL = n.src.substring(0, n.src.lastIndexOf('/'));
+
+					// If path to script is relative and a base href was found add that one infront
+					// the src property will always be an absolute one on non IE browsers and IE 8
+					// so this logic will basically only be executed on older IE versions
+					if (base && t.baseURL.indexOf('://') == -1 && t.baseURL.indexOf('/') !== 0)
+						t.baseURL = base + t.baseURL;
+
+					return t.baseURL;
+				}
+
+				return null;
+			};
+
+			// Check document
+			nl = d.getElementsByTagName('script');
+			for (i=0; i<nl.length; i++) {
+				if (getBase(nl[i]))
+					return;
+			}
+
+			// Check head
+			n = d.getElementsByTagName('head')[0];
+			if (n) {
+				nl = n.getElementsByTagName('script');
+				for (i=0; i<nl.length; i++) {
+					if (getBase(nl[i]))
+						return;
+				}
+			}
+
+			return;
+		},
+
+		is : function(o, t) {
+			if (!t)
+				return o !== undef;
+
+			if (t == 'array' && tinymce.isArray(o))
+				return true;
+
+			return typeof(o) == t;
+		},
+
+		isArray: Array.isArray || function(obj) {
+			return Object.prototype.toString.call(obj) === "[object Array]";
+		},
+
+		makeMap : function(items, delim, map) {
+			var i;
+
+			items = items || [];
+			delim = delim || ',';
+
+			if (typeof(items) == "string")
+				items = items.split(delim);
+
+			map = map || {};
+
+			i = items.length;
+			while (i--)
+				map[items[i]] = {};
+
+			return map;
+		},
+
+		each : function(o, cb, s) {
+			var n, l;
+
+			if (!o)
+				return 0;
+
+			s = s || o;
+
+			if (o.length !== undef) {
+				// Indexed arrays, needed for Safari
+				for (n=0, l = o.length; n < l; n++) {
+					if (cb.call(s, o[n], n, o) === false)
+						return 0;
+				}
+			} else {
+				// Hashtables
+				for (n in o) {
+					if (o.hasOwnProperty(n)) {
+						if (cb.call(s, o[n], n, o) === false)
+							return 0;
+					}
+				}
+			}
+
+			return 1;
+		},
+
+
+		trim : function(s) {
+			return (s ? '' + s : '').replace(whiteSpaceRe, '');
+		},
+
+		create : function(s, p, root) {
+			var t = this, sp, ns, cn, scn, c, de = 0;
+
+			// Parse : <prefix> <class>:<super class>
+			s = /^((static) )?([\w.]+)(:([\w.]+))?/.exec(s);
+			cn = s[3].match(/(^|\.)(\w+)$/i)[2]; // Class name
+
+			// Create namespace for new class
+			ns = t.createNS(s[3].replace(/\.\w+$/, ''), root);
+
+			// Class already exists
+			if (ns[cn])
+				return;
+
+			// Make pure static class
+			if (s[2] == 'static') {
+				ns[cn] = p;
+
+				if (this.onCreate)
+					this.onCreate(s[2], s[3], ns[cn]);
+
+				return;
+			}
+
+			// Create default constructor
+			if (!p[cn]) {
+				p[cn] = function() {};
+				de = 1;
+			}
+
+			// Add constructor and methods
+			ns[cn] = p[cn];
+			t.extend(ns[cn].prototype, p);
+
+			// Extend
+			if (s[5]) {
+				sp = t.resolve(s[5]).prototype;
+				scn = s[5].match(/\.(\w+)$/i)[1]; // Class name
+
+				// Extend constructor
+				c = ns[cn];
+				if (de) {
+					// Add passthrough constructor
+					ns[cn] = function() {
+						return sp[scn].apply(this, arguments);
+					};
+				} else {
+					// Add inherit constructor
+					ns[cn] = function() {
+						this.parent = sp[scn];
+						return c.apply(this, arguments);
+					};
+				}
+				ns[cn].prototype[cn] = ns[cn];
+
+				// Add super methods
+				t.each(sp, function(f, n) {
+					ns[cn].prototype[n] = sp[n];
+				});
+
+				// Add overridden methods
+				t.each(p, function(f, n) {
+					// Extend methods if needed
+					if (sp[n]) {
+						ns[cn].prototype[n] = function() {
+							this.parent = sp[n];
+							return f.apply(this, arguments);
+						};
+					} else {
+						if (n != cn)
+							ns[cn].prototype[n] = f;
+					}
+				});
+			}
+
+			// Add static methods
+			t.each(p['static'], function(f, n) {
+				ns[cn][n] = f;
+			});
+
+			if (this.onCreate)
+				this.onCreate(s[2], s[3], ns[cn].prototype);
+		},
+
+		walk : function(o, f, n, s) {
+			s = s || this;
+
+			if (o) {
+				if (n)
+					o = o[n];
+
+				tinymce.each(o, function(o, i) {
+					if (f.call(s, o, i, n) === false)
+						return false;
+
+					tinymce.walk(o, f, n, s);
+				});
+			}
+		},
+
+		createNS : function(n, o) {
+			var i, v;
+
+			o = o || win;
+
+			n = n.split('.');
+			for (i=0; i<n.length; i++) {
+				v = n[i];
+
+				if (!o[v])
+					o[v] = {};
+
+				o = o[v];
+			}
+
+			return o;
+		},
+
+		resolve : function(n, o) {
+			var i, l;
+
+			o = o || win;
+
+			n = n.split('.');
+			for (i = 0, l = n.length; i < l; i++) {
+				o = o[n[i]];
+
+				if (!o)
+					break;
+			}
+
+			return o;
+		},
+
+		addUnload : function(f, s) {
+			var t = this, unload;
+
+			unload = function() {
+				var li = t.unloads, o, n;
+
+				if (li) {
+					// Call unload handlers
+					for (n in li) {
+						o = li[n];
+
+						if (o && o.func)
+							o.func.call(o.scope, 1); // Send in one arg to distinct unload and user destroy
+					}
+
+					// Detach unload function
+					if (win.detachEvent) {
+						win.detachEvent('onbeforeunload', fakeUnload);
+						win.detachEvent('onunload', unload);
+					} else if (win.removeEventListener)
+						win.removeEventListener('unload', unload, false);
+
+					// Destroy references
+					t.unloads = o = li = w = unload = 0;
+
+					// Run garbarge collector on IE
+					if (win.CollectGarbage)
+						CollectGarbage();
+				}
+			};
+
+			function fakeUnload() {
+				var d = document;
+
+				function stop() {
+					// Prevent memory leak
+					d.detachEvent('onstop', stop);
+
+					// Call unload handler
+					if (unload)
+						unload();
+
+					d = 0;
+				};
+
+				// Is there things still loading, then do some magic
+				if (d.readyState == 'interactive') {
+					// Fire unload when the currently loading page is stopped
+					if (d)
+						d.attachEvent('onstop', stop);
+
+					// Remove onstop listener after a while to prevent the unload function
+					// to execute if the user presses cancel in an onbeforeunload
+					// confirm dialog and then presses the browser stop button
+					win.setTimeout(function() {
+						if (d)
+							d.detachEvent('onstop', stop);
+					}, 0);
+				}
+			};
+
+			f = {func : f, scope : s || this};
+
+			if (!t.unloads) {
+				// Attach unload handler
+				if (win.attachEvent) {
+					win.attachEvent('onunload', unload);
+					win.attachEvent('onbeforeunload', fakeUnload);
+				} else if (win.addEventListener)
+					win.addEventListener('unload', unload, false);
+
+				// Setup initial unload handler array
+				t.unloads = [f];
+			} else
+				t.unloads.push(f);
+
+			return f;
+		},
+
+		removeUnload : function(f) {
+			var u = this.unloads, r = null;
+
+			tinymce.each(u, function(o, i) {
+				if (o && o.func == f) {
+					u.splice(i, 1);
+					r = f;
+					return false;
+				}
+			});
+
+			return r;
+		},
+
+		explode : function(s, d) {
+			if (!s || tinymce.is(s, 'array')) {
+				return s;
+			}
+
+			return tinymce.map(s.split(d || ','), tinymce.trim);
+		},
+
+		_addVer : function(u) {
+			var v;
+
+			if (!this.query)
+				return u;
+
+			v = (u.indexOf('?') == -1 ? '?' : '&') + this.query;
+
+			if (u.indexOf('#') == -1)
+				return u + v;
+
+			return u.replace('#', v + '#');
+		},
+
+		// Fix function for IE 9 where regexps isn't working correctly
+		// Todo: remove me once MS fixes the bug
+		_replace : function(find, replace, str) {
+			// On IE9 we have to fake $x replacement
+			if (isRegExpBroken) {
+				return str.replace(find, function() {
+					var val = replace, args = arguments, i;
+
+					for (i = 0; i < args.length - 2; i++) {
+						if (args[i] === undef) {
+							val = val.replace(new RegExp('\\$' + i, 'g'), '');
+						} else {
+							val = val.replace(new RegExp('\\$' + i, 'g'), args[i]);
+						}
+					}
+
+					return val;
+				});
+			}
+
+			return str.replace(find, replace);
+		}
+
+		};
+
+	// Initialize the API
+	tinymce._init();
+
+	// Expose tinymce namespace to the global namespace (window)
+	win.tinymce = win.tinyMCE = tinymce;
+
+	// Describe the different namespaces
+
+	})(window);
+
+
+(function($, tinymce) {
+	var is = tinymce.is, attrRegExp = /^(href|src|style)$/i, undef;
+
+	// jQuery is undefined
+	if (!$ && window.console) {
+		return console.log("Load jQuery first!");
+	}
+
+	// Stick jQuery into the tinymce namespace
+	tinymce.$ = $;
+
+	// Setup adapter
+	tinymce.adapter = {
+		patchEditor : function(editor) {
+			var fn = $.fn;
+
+			// Adapt the css function to make sure that the data-mce-style
+			// attribute gets updated with the new style information
+			function css(name, value) {
+				var self = this;
+
+				// Remove data-mce-style when set operation occurs
+				if (value)
+					self.removeAttr('data-mce-style');
+
+				return fn.css.apply(self, arguments);
+			};
+
+			// Apapt the attr function to make sure that it uses the data-mce- prefixed variants
+			function attr(name, value) {
+				var self = this;
+
+				// Update/retrive data-mce- attribute variants
+				if (attrRegExp.test(name)) {
+					if (value !== undef) {
+						// Use TinyMCE behavior when setting the specifc attributes
+						self.each(function(i, node) {
+							editor.dom.setAttrib(node, name, value);
+						});
+
+						return self;
+					} else
+						return self.attr('data-mce-' + name);
+				}
+
+				// Default behavior
+				return fn.attr.apply(self, arguments);
+			};
+
+			// Patch various jQuery functions to handle tinymce specific attribute and content behavior
+			// we don't patch the jQuery.fn directly since it will most likely break compatibility
+			// with other jQuery logic on the page. Only instances created by TinyMCE should be patched.
+			function patch(jq) {
+				// Patch some functions, only patch the object once
+				if (jq.css !== css) {
+					// Patch css/attr to use the data-mce- prefixed attribute variants
+					jq.css = css;
+					jq.attr = attr;
+
+					jq.tinymce = editor;
+
+					// Each pushed jQuery instance needs to be patched
+					// as well for example when traversing the DOM
+					jq.pushStack = function() {
+						return patch(fn.pushStack.apply(this, arguments));
+					};
+				}
+
+				return jq;
+			};
+
+			// Add a $ function on each editor instance this one is scoped for the editor document object
+			// this way you can do chaining like this tinymce.get(0).$('p').append('text').css('color', 'red');
+			editor.$ = function(selector, scope) {
+				var doc = editor.getDoc();
+
+				return patch($(selector || doc, doc || scope));
+			};
+		}
+	};
+
+	// Patch in core NS functions
+	tinymce.extend = $.extend;
+	tinymce.extend(tinymce, {
+		map : $.map,
+		grep : function(a, f) {return $.grep(a, f || function(){return 1;});},
+		inArray : function(a, v) {return $.inArray(v, a || []);}
+
+		/* Didn't iterate stylesheets
+		each : function(o, cb, s) {
+			if (!o)
+				return 0;
+
+			var r = 1;
+
+			$.each(o, function(nr, el){
+				if (cb.call(s, el, nr, o) === false) {
+					r = 0;
+					return false;
+				}
+			});
+
+			return r;
+		}*/
+	});
+
+	// Patch in functions in various clases
+	// Add a "#ifndefjquery" statement around each core API function you add below
+	var patches = {
+		'tinymce.dom.DOMUtils' : {
+			/*
+			addClass : function(e, c) {
+				if (is(e, 'array') && is(e[0], 'string'))
+					e = e.join(',#');
+				return (e && $(is(e, 'string') ? '#' + e : e)
+					.addClass(c)
+					.attr('class')) || false;
+			},
+
+			hasClass : function(n, c) {
+				return $(is(n, 'string') ? '#' + n : n).hasClass(c);
+			},
+
+			removeClass : function(e, c) {
+				if (!e)
+					return false;
+
+				var r = [];
+
+				$(is(e, 'string') ? '#' + e : e)
+					.removeClass(c)
+					.each(function(){
+						r.push(this.className);
+					});
+
+				return r.length == 1 ? r[0] : r;
+			},
+			*/
+
+			select : function(pattern, scope) {
+				var t = this;
+
+				return $.find(pattern, t.get(scope) || t.get(t.settings.root_element) || t.doc, []);
+			},
+
+			is : function(n, patt) {
+				// Simple all selector, jQuery 1.8 and above returns true for text nodes, different from previous versions
+				if (n.nodeType !== 1 && patt === '*') {
+					return false;
+				}
+
+				return $(this.get(n)).is(patt);
+			}
+
+			/*
+			show : function(e) {
+				if (is(e, 'array') && is(e[0], 'string'))
+					e = e.join(',#');
+
+				$(is(e, 'string') ? '#' + e : e).css('display', 'block');
+			},
+
+			hide : function(e) {
+				if (is(e, 'array') && is(e[0], 'string'))
+					e = e.join(',#');
+
+				$(is(e, 'string') ? '#' + e : e).css('display', 'none');
+			},
+
+			isHidden : function(e) {
+				return $(is(e, 'string') ? '#' + e : e).is(':hidden');
+			},
+
+			insertAfter : function(n, e) {
+				return $(is(e, 'string') ? '#' + e : e).after(n);
+			},
+
+			replace : function(o, n, k) {
+				n = $(is(n, 'string') ? '#' + n : n);
+
+				if (k)
+					n.children().appendTo(o);
+
+				n.replaceWith(o);
+			},
+
+			setStyle : function(n, na, v) {
+				if (is(n, 'array') && is(n[0], 'string'))
+					n = n.join(',#');
+
+				$(is(n, 'string') ? '#' + n : n).css(na, v);
+			},
+
+			getStyle : function(n, na, c) {
+				return $(is(n, 'string') ? '#' + n : n).css(na);
+			},
+
+			setStyles : function(e, o) {
+				if (is(e, 'array') && is(e[0], 'string'))
+					e = e.join(',#');
+				$(is(e, 'string') ? '#' + e : e).css(o);
+			},
+
+			setAttrib : function(e, n, v) {
+				var t = this, s = t.settings;
+
+				if (is(e, 'array') && is(e[0], 'string'))
+					e = e.join(',#');
+
+				e = $(is(e, 'string') ? '#' + e : e);
+
+				switch (n) {
+					case "style":
+						e.each(function(i, v){
+							if (s.keep_values)
+								$(v).attr('data-mce-style', v);
+
+							v.style.cssText = v;
+						});
+						break;
+
+					case "class":
+						e.each(function(){
+							this.className = v;
+						});
+						break;
+
+					case "src":
+					case "href":
+						e.each(function(i, v){
+							if (s.keep_values) {
+								if (s.url_converter)
+									v = s.url_converter.call(s.url_converter_scope || t, v, n, v);
+
+								t.setAttrib(v, 'data-mce-' + n, v);
+							}
+						});
+
+						break;
+				}
+
+				if (v !== null && v.length !== 0)
+					e.attr(n, '' + v);
+				else
+					e.removeAttr(n);
+			},
+
+			setAttribs : function(e, o) {
+				var t = this;
+
+				$.each(o, function(n, v){
+					t.setAttrib(e,n,v);
+				});
+			}
+			*/
+		}
+
+/*
+		'tinymce.dom.Event' : {
+			add : function (o, n, f, s) {
+				var lo, cb;
+
+				cb = function(e) {
+					e.target = e.target || this;
+					f.call(s || this, e);
+				};
+
+				if (is(o, 'array') && is(o[0], 'string'))
+					o = o.join(',#');
+				o = $(is(o, 'string') ? '#' + o : o);
+				if (n == 'init') {
+					o.ready(cb, s);
+				} else {
+					if (s) {
+						o.bind(n, s, cb);
+					} else {
+						o.bind(n, cb);
+					}
+				}
+
+				lo = this._jqLookup || (this._jqLookup = []);
+				lo.push({func : f, cfunc : cb});
+
+				return cb;
+			},
+
+			remove : function(o, n, f) {
+				// Find cfunc
+				$(this._jqLookup).each(function() {
+					if (this.func === f)
+						f = this.cfunc;
+				});
+
+				if (is(o, 'array') && is(o[0], 'string'))
+					o = o.join(',#');
+
+				$(is(o, 'string') ? '#' + o : o).unbind(n,f);
+
+				return true;
+			}
+		}
+*/
+	};
+
+	// Patch functions after a class is created
+	tinymce.onCreate = function(ty, c, p) {
+		tinymce.extend(p, patches[c]);
+	};
+})(window.jQuery, tinymce);
+
+
+
+tinymce.create('tinymce.util.Dispatcher', {
+	scope : null,
+	listeners : null,
+	inDispatch: false,
+
+	Dispatcher : function(scope) {
+		this.scope = scope || this;
+		this.listeners = [];
+	},
+
+	add : function(callback, scope) {
+		this.listeners.push({cb : callback, scope : scope || this.scope});
+
+		return callback;
+	},
+
+	addToTop : function(callback, scope) {
+		var self = this, listener = {cb : callback, scope : scope || self.scope};
+
+		// Create new listeners if addToTop is executed in a dispatch loop
+		if (self.inDispatch) {
+			self.listeners = [listener].concat(self.listeners);
+		} else {
+			self.listeners.unshift(listener);
+		}
+
+		return callback;
+	},
+
+	remove : function(callback) {
+		var listeners = this.listeners, output = null;
+
+		tinymce.each(listeners, function(listener, i) {
+			if (callback == listener.cb) {
+				output = listener;
+				listeners.splice(i, 1);
+				return false;
+			}
+		});
+
+		return output;
+	},
+
+	dispatch : function() {
+		var self = this, returnValue, args = arguments, i, listeners = self.listeners, listener;
+
+		self.inDispatch = true;
+		
+		// Needs to be a real loop since the listener count might change while looping
+		// And this is also more efficient
+		for (i = 0; i < listeners.length; i++) {
+			listener = listeners[i];
+			returnValue = listener.cb.apply(listener.scope, args.length > 0 ? args : [listener.scope]);
+
+			if (returnValue === false)
+				break;
+		}
+
+		self.inDispatch = false;
+
+		return returnValue;
+	}
+
+	});
+
+(function() {
+	var each = tinymce.each;
+
+	tinymce.create('tinymce.util.URI', {
+		URI : function(u, s) {
+			var t = this, o, a, b, base_url;
+
+			// Trim whitespace
+			u = tinymce.trim(u);
+
+			// Default settings
+			s = t.settings = s || {};
+
+			// Strange app protocol that isn't http/https or local anchor
+			// For example: mailto,skype,tel etc.
+			if (/^([\w\-]+):([^\/]{2})/i.test(u) || /^\s*#/.test(u)) {
+				t.source = u;
+				return;
+			}
+
+			// Absolute path with no host, fake host and protocol
+			if (u.indexOf('/') === 0 && u.indexOf('//') !== 0)
+				u = (s.base_uri ? s.base_uri.protocol || 'http' : 'http') + '://mce_host' + u;
+
+			// Relative path http:// or protocol relative //path
+			if (!/^[\w\-]*:?\/\//.test(u)) {
+				base_url = s.base_uri ? s.base_uri.path : new tinymce.util.URI(location.href).directory;
+				u = ((s.base_uri && s.base_uri.protocol) || 'http') + '://mce_host' + t.toAbsPath(base_url, u);
+			}
+
+			// Parse URL (Credits goes to Steave, http://blog.stevenlevithan.com/archives/parseuri)
+			u = u.replace(/@@/g, '(mce_at)'); // Zope 3 workaround, they use @@something
+			u = /^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@\/]*):?([^:@\/]*))?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/.exec(u);
+			each(["source","protocol","authority","userInfo","user","password","host","port","relative","path","directory","file","query","anchor"], function(v, i) {
+				var s = u[i];
+
+				// Zope 3 workaround, they use @@something
+				if (s)
+					s = s.replace(/\(mce_at\)/g, '@@');
+
+				t[v] = s;
+			});
+
+			b = s.base_uri;
+			if (b) {
+				if (!t.protocol)
+					t.protocol = b.protocol;
+
+				if (!t.userInfo)
+					t.userInfo = b.userInfo;
+
+				if (!t.port && t.host === 'mce_host')
+					t.port = b.port;
+
+				if (!t.host || t.host === 'mce_host')
+					t.host = b.host;
+
+				t.source = '';
+			}
+
+			//t.path = t.path || '/';
+		},
+
+		setPath : function(p) {
+			var t = this;
+
+			p = /^(.*?)\/?(\w+)?$/.exec(p);
+
+			// Update path parts
+			t.path = p[0];
+			t.directory = p[1];
+			t.file = p[2];
+
+			// Rebuild source
+			t.source = '';
+			t.getURI();
+		},
+
+		toRelative : function(u) {
+			var t = this, o;
+
+			if (u === "./")
+				return u;
+
+			u = new tinymce.util.URI(u, {base_uri : t});
+
+			// Not on same domain/port or protocol
+			if ((u.host != 'mce_host' && t.host != u.host && u.host) || t.port != u.port || t.protocol != u.protocol)
+				return u.getURI();
+
+			var tu = t.getURI(), uu = u.getURI();
+			
+			// Allow usage of the base_uri when relative_urls = true
+			if(tu == uu || (tu.charAt(tu.length - 1) == "/" && tu.substr(0, tu.length - 1) == uu))
+				return tu;
+
+			o = t.toRelPath(t.path, u.path);
+
+			// Add query
+			if (u.query)
+				o += '?' + u.query;
+
+			// Add anchor
+			if (u.anchor)
+				o += '#' + u.anchor;
+
+			return o;
+		},
+	
+		toAbsolute : function(u, nh) {
+			u = new tinymce.util.URI(u, {base_uri : this});
+
+			return u.getURI(this.host == u.host && this.protocol == u.protocol ? nh : 0);
+		},
+
+		toRelPath : function(base, path) {
+			var items, bp = 0, out = '', i, l;
+
+			// Split the paths
+			base = base.substring(0, base.lastIndexOf('/'));
+			base = base.split('/');
+			items = path.split('/');
+
+			if (base.length >= items.length) {
+				for (i = 0, l = base.length; i < l; i++) {
+					if (i >= items.length || base[i] != items[i]) {
+						bp = i + 1;
+						break;
+					}
+				}
+			}
+
+			if (base.length < items.length) {
+				for (i = 0, l = items.length; i < l; i++) {
+					if (i >= base.length || base[i] != items[i]) {
+						bp = i + 1;
+						break;
+					}
+				}
+			}
+
+			if (bp === 1)
+				return path;
+
+			for (i = 0, l = base.length - (bp - 1); i < l; i++)
+				out += "../";
+
+			for (i = bp - 1, l = items.length; i < l; i++) {
+				if (i != bp - 1)
+					out += "/" + items[i];
+				else
+					out += items[i];
+			}
+
+			return out;
+		},
+
+		toAbsPath : function(base, path) {
+			var i, nb = 0, o = [], tr, outPath;
+
+			// Split paths
+			tr = /\/$/.test(path) ? '/' : '';
+			base = base.split('/');
+			path = path.split('/');
+
+			// Remove empty chunks
+			each(base, function(k) {
+				if (k)
+					o.push(k);
+			});
+
+			base = o;
+
+			// Merge relURLParts chunks
+			for (i = path.length - 1, o = []; i >= 0; i--) {
+				// Ignore empty or .
+				if (path[i].length === 0 || path[i] === ".")
+					continue;
+
+				// Is parent
+				if (path[i] === '..') {
+					nb++;
+					continue;
+				}
+
+				// Move up
+				if (nb > 0) {
+					nb--;
+					continue;
+				}
+
+				o.push(path[i]);
+			}
+
+			i = base.length - nb;
+
+			// If /a/b/c or /
+			if (i <= 0)
+				outPath = o.reverse().join('/');
+			else
+				outPath = base.slice(0, i).join('/') + '/' + o.reverse().join('/');
+
+			// Add front / if it's needed
+			if (outPath.indexOf('/') !== 0)
+				outPath = '/' + outPath;
+
+			// Add traling / if it's needed
+			if (tr && outPath.lastIndexOf('/') !== outPath.length - 1)
+				outPath += tr;
+
+			return outPath;
+		},
+
+		getURI : function(nh) {
+			var s, t = this;
+
+			// Rebuild source
+			if (!t.source || nh) {
+				s = '';
+
+				if (!nh) {
+					if (t.protocol)
+						s += t.protocol + '://';
+
+					if (t.userInfo)
+						s += t.userInfo + '@';
+
+					if (t.host)
+						s += t.host;
+
+					if (t.port)
+						s += ':' + t.port;
+				}
+
+				if (t.path)
+					s += t.path;
+
+				if (t.query)
+					s += '?' + t.query;
+
+				if (t.anchor)
+					s += '#' + t.anchor;
+
+				t.source = s;
+			}
+
+			return t.source;
+		}
+	});
+})();
+
+(function() {
+	var each = tinymce.each;
+
+	tinymce.create('static tinymce.util.Cookie', {
+		getHash : function(n) {
+			var v = this.get(n), h;
+
+			if (v) {
+				each(v.split('&'), function(v) {
+					v = v.split('=');
+					h = h || {};
+					h[unescape(v[0])] = unescape(v[1]);
+				});
+			}
+
+			return h;
+		},
+
+		setHash : function(n, v, e, p, d, s) {
+			var o = '';
+
+			each(v, function(v, k) {
+				o += (!o ? '' : '&') + escape(k) + '=' + escape(v);
+			});
+
+			this.set(n, o, e, p, d, s);
+		},
+
+		get : function(n) {
+			var c = document.cookie, e, p = n + "=", b;
+
+			// Strict mode
+			if (!c)
+				return;
+
+			b = c.indexOf("; " + p);
+
+			if (b == -1) {
+				b = c.indexOf(p);
+
+				if (b !== 0)
+					return null;
+			} else
+				b += 2;
+
+			e = c.indexOf(";", b);
+
+			if (e == -1)
+				e = c.length;
+
+			return unescape(c.substring(b + p.length, e));
+		},
+
+		set : function(n, v, e, p, d, s) {
+			document.cookie = n + "=" + escape(v) +
+				((e) ? "; expires=" + e.toGMTString() : "") +
+				((p) ? "; path=" + escape(p) : "") +
+				((d) ? "; domain=" + d : "") +
+				((s) ? "; secure" : "");
+		},
+
+		remove : function(name, path, domain) {
+			var date = new Date();
+
+			date.setTime(date.getTime() - 1000);
+
+			this.set(name, '', date, path, domain);
+		}
+	});
+})();
+
+(function() {
+	function serialize(o, quote) {
+		var i, v, t, name;
+
+		quote = quote || '"';
+
+		if (o == null)
+			return 'null';
+
+		t = typeof o;
+
+		if (t == 'string') {
+			v = '\bb\tt\nn\ff\rr\""\'\'\\\\';
+
+			return quote + o.replace(/([\u0080-\uFFFF\x00-\x1f\"\'\\])/g, function(a, b) {
+				// Make sure single quotes never get encoded inside double quotes for JSON compatibility
+				if (quote === '"' && a === "'")
+					return a;
+
+				i = v.indexOf(b);
+
+				if (i + 1)
+					return '\\' + v.charAt(i + 1);
+
+				a = b.charCodeAt().toString(16);
+
+				return '\\u' + '0000'.substring(a.length) + a;
+			}) + quote;
+		}
+
+		if (t == 'object') {
+			if (o.hasOwnProperty && Object.prototype.toString.call(o) === '[object Array]') {
+					for (i=0, v = '['; i<o.length; i++)
+						v += (i > 0 ? ',' : '') + serialize(o[i], quote);
+
+					return v + ']';
+				}
+
+				v = '{';
+
+				for (name in o) {
+					if (o.hasOwnProperty(name)) {
+						v += typeof o[name] != 'function' ? (v.length > 1 ? ',' + quote : quote) + name + quote +':' + serialize(o[name], quote) : '';
+					}
+				}
+
+				return v + '}';
+		}
+
+		return '' + o;
+	};
+
+	tinymce.util.JSON = {
+		serialize: serialize,
+
+		parse: function(s) {
+			try {
+				return eval('(' + s + ')');
+			} catch (ex) {
+				// Ignore
+			}
+		}
+
+		};
+})();
+
+tinymce.create('static tinymce.util.XHR', {
+	send : function(o) {
+		var x, t, w = window, c = 0;
+
+		function ready() {
+			if (!o.async || x.readyState == 4 || c++ > 10000) {
+				if (o.success && c < 10000 && x.status == 200)
+					o.success.call(o.success_scope, '' + x.responseText, x, o);
+				else if (o.error)
+					o.error.call(o.error_scope, c > 10000 ? 'TIMED_OUT' : 'GENERAL', x, o);
+
+				x = null;
+			} else
+				w.setTimeout(ready, 10);
+		};
+
+		// Default settings
+		o.scope = o.scope || this;
+		o.success_scope = o.success_scope || o.scope;
+		o.error_scope = o.error_scope || o.scope;
+		o.async = o.async === false ? false : true;
+		o.data = o.data || '';
+
+		function get(s) {
+			x = 0;
+
+			try {
+				x = new ActiveXObject(s);
+			} catch (ex) {
+			}
+
+			return x;
+		};
+
+		x = w.XMLHttpRequest ? new XMLHttpRequest() : get('Microsoft.XMLHTTP') || get('Msxml2.XMLHTTP');
+
+		if (x) {
+			if (x.overrideMimeType)
+				x.overrideMimeType(o.content_type);
+
+			x.open(o.type || (o.data ? 'POST' : 'GET'), o.url, o.async);
+
+			if (o.content_type)
+				x.setRequestHeader('Content-Type', o.content_type);
+
+			x.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
+
+			x.send(o.data);
+
+			// Syncronous request
+			if (!o.async)
+				return ready();
+
+			// Wait for response, onReadyStateChange can not be used since it leaks memory in IE
+			t = w.setTimeout(ready, 10);
+		}
+	}
+});
+
+(function() {
+	var extend = tinymce.extend, JSON = tinymce.util.JSON, XHR = tinymce.util.XHR;
+
+	tinymce.create('tinymce.util.JSONRequest', {
+		JSONRequest : function(s) {
+			this.settings = extend({
+			}, s);
+			this.count = 0;
+		},
+
+		send : function(o) {
+			var ecb = o.error, scb = o.success;
+
+			o = extend(this.settings, o);
+
+			o.success = function(c, x) {
+				c = JSON.parse(c);
+
+				if (typeof(c) == 'undefined') {
+					c = {
+						error : 'JSON Parse error.'
+					};
+				}
+
+				if (c.error)
+					ecb.call(o.error_scope || o.scope, c.error, x);
+				else
+					scb.call(o.success_scope || o.scope, c.result);
+			};
+
+			o.error = function(ty, x) {
+				if (ecb)
+					ecb.call(o.error_scope || o.scope, ty, x);
+			};
+
+			o.data = JSON.serialize({
+				id : o.id || 'c' + (this.count++),
+				method : o.method,
+				params : o.params
+			});
+
+			// JSON content type for Ruby on rails. Bug: #1883287
+			o.content_type = 'application/json';
+
+			XHR.send(o);
+		},
+
+		'static' : {
+			sendRPC : function(o) {
+				return new tinymce.util.JSONRequest().send(o);
+			}
+		}
+	});
+}());
+(function(tinymce){
+	tinymce.VK = {
+		BACKSPACE: 8,
+		DELETE: 46,
+		DOWN: 40,
+		ENTER: 13,
+		LEFT: 37,
+		RIGHT: 39,
+		SPACEBAR: 32,
+		TAB: 9,
+		UP: 38,
+
+		modifierPressed: function (e) {
+			return e.shiftKey || e.ctrlKey || e.altKey;
+		},
+
+		metaKeyPressed: function(e) {
+			// Check if ctrl or meta key is pressed also check if alt is false for Polish users
+			return tinymce.isMac ? e.metaKey : e.ctrlKey && !e.altKey;
+		}
+	};
+})(tinymce);
+
+tinymce.util.Quirks = function(editor) {
+	var VK = tinymce.VK, BACKSPACE = VK.BACKSPACE, DELETE = VK.DELETE, dom = editor.dom, selection = editor.selection,
+		settings = editor.settings, parser = editor.parser, serializer = editor.serializer, each = tinymce.each;
+
+	function setEditorCommandState(cmd, state) {
+		try {
+			editor.getDoc().execCommand(cmd, false, state);
+		} catch (ex) {
+			// Ignore
+		}
+	}
+
+	function getDocumentMode() {
+		var documentMode = editor.getDoc().documentMode;
+
+		return documentMode ? documentMode : 6;
+	};
+
+	function isDefaultPrevented(e) {
+		return e.isDefaultPrevented();
+	};
+
+	function cleanupStylesWhenDeleting() {
+		function removeMergedFormatSpans(isDelete) {
+			var rng, blockElm, wrapperElm, bookmark, container, offset, elm;
+
+			function isAtStartOrEndOfElm() {
+				if (container.nodeType == 3) {
+					if (isDelete && offset == container.length) {
+						return true;
+					}
+
+					if (!isDelete && offset === 0) {
+						return true;
+					}
+				}
+			}
+
+			rng = selection.getRng();
+			var tmpRng = [rng.startContainer, rng.startOffset, rng.endContainer, rng.endOffset];
+
+			if (!rng.collapsed) {
+				isDelete = true;
+			}
+
+			container = rng[(isDelete ? 'start' : 'end') + 'Container'];
+			offset = rng[(isDelete ? 'start' : 'end') + 'Offset'];
+
+			if (container.nodeType == 3) {
+				blockElm = dom.getParent(rng.startContainer, dom.isBlock);
+
+				// On delete clone the root span of the next block element
+				if (isDelete) {
+					blockElm = dom.getNext(blockElm, dom.isBlock);
+				}
+
+				if (blockElm && (isAtStartOrEndOfElm() || !rng.collapsed)) {
+					// Wrap children of block in a EM and let WebKit stick is
+					// runtime styles junk into that EM
+					wrapperElm = dom.create('em', {'id': '__mceDel'});
+
+					each(tinymce.grep(blockElm.childNodes), function(node) {
+						wrapperElm.appendChild(node);
+					});
+
+					blockElm.appendChild(wrapperElm);
+				}
+			}
+
+			// Do the backspace/delete action
+			rng = dom.createRng();
+			rng.setStart(tmpRng[0], tmpRng[1]);
+			rng.setEnd(tmpRng[2], tmpRng[3]);
+			selection.setRng(rng);
+			editor.getDoc().execCommand(isDelete ? 'ForwardDelete' : 'Delete', false, null);
+
+			// Remove temp wrapper element
+			if (wrapperElm) {
+				bookmark = selection.getBookmark();
+
+				while (elm = dom.get('__mceDel')) {
+					dom.remove(elm, true);
+				}
+
+				selection.moveToBookmark(bookmark);
+			}
+		}
+
+		editor.onKeyDown.add(function(editor, e) {
+			var isDelete;
+
+			isDelete = e.keyCode == DELETE;
+			if (!isDefaultPrevented(e) && (isDelete || e.keyCode == BACKSPACE) && !VK.modifierPressed(e)) {
+				e.preventDefault();
+				removeMergedFormatSpans(isDelete);
+			}
+		});
+
+		editor.addCommand('Delete', function() {removeMergedFormatSpans();});
+	};
+	
+	function emptyEditorWhenDeleting() {
+		function serializeRng(rng) {
+			var body = dom.create("body");
+			var contents = rng.cloneContents();
+			body.appendChild(contents);
+			return selection.serializer.serialize(body, {format: 'html'});
+		}
+
+		function allContentsSelected(rng) {
+			var selection = serializeRng(rng);
+
+			var allRng = dom.createRng();
+			allRng.selectNode(editor.getBody());
+
+			var allSelection = serializeRng(allRng);
+			return selection === allSelection;
+		}
+
+		editor.onKeyDown.add(function(editor, e) {
+			var keyCode = e.keyCode, isCollapsed;
+
+			// Empty the editor if it's needed for example backspace at <p><b>|</b></p>
+			if (!isDefaultPrevented(e) && (keyCode == DELETE || keyCode == BACKSPACE)) {
+				isCollapsed = editor.selection.isCollapsed();
+
+				// Selection is collapsed but the editor isn't empty
+				if (isCollapsed && !dom.isEmpty(editor.getBody())) {
+					return;
+				}
+
+				// IE deletes all contents correctly when everything is selected
+				if (tinymce.isIE && !isCollapsed) {
+					return;
+				}
+
+				// Selection isn't collapsed but not all the contents is selected
+				if (!isCollapsed && !allContentsSelected(editor.selection.getRng())) {
+					return;
+				}
+
+				// Manually empty the editor
+				editor.setContent('');
+				editor.selection.setCursorLocation(editor.getBody(), 0);
+				editor.nodeChanged();
+			}
+		});
+	};
+
+	function selectAll() {
+		editor.onKeyDown.add(function(editor, e) {
+			if (!isDefaultPrevented(e) && e.keyCode == 65 && VK.metaKeyPressed(e)) {
+				e.preventDefault();
+				editor.execCommand('SelectAll');
+			}
+		});
+	};
+
+	function inputMethodFocus() {
+		if (!editor.settings.content_editable) {
+			// Case 1 IME doesn't initialize if you focus the document
+			dom.bind(editor.getDoc(), 'focusin', function(e) {
+				selection.setRng(selection.getRng());
+			});
+
+			// Case 2 IME doesn't initialize if you click the documentElement it also doesn't properly fire the focusin event
+			dom.bind(editor.getDoc(), 'mousedown', function(e) {
+				if (e.target == editor.getDoc().documentElement) {
+					editor.getWin().focus();
+					selection.setRng(selection.getRng());
+				}
+			});
+		}
+	};
+
+	function removeHrOnBackspace() {
+		editor.onKeyDown.add(function(editor, e) {
+			if (!isDefaultPrevented(e) && e.keyCode === BACKSPACE) {
+				if (selection.isCollapsed() && selection.getRng(true).startOffset === 0) {
+					var node = selection.getNode();
+					var previousSibling = node.previousSibling;
+
+					if (previousSibling && previousSibling.nodeName && previousSibling.nodeName.toLowerCase() === "hr") {
+						dom.remove(previousSibling);
+						tinymce.dom.Event.cancel(e);
+					}
+				}
+			}
+		})
+	}
+
+	function focusBody() {
+		// Fix for a focus bug in FF 3.x where the body element
+		// wouldn't get proper focus if the user clicked on the HTML element
+		if (!Range.prototype.getClientRects) { // Detect getClientRects got introduced in FF 4
+			editor.onMouseDown.add(function(editor, e) {
+				if (!isDefaultPrevented(e) && e.target.nodeName === "HTML") {
+					var body = editor.getBody();
+
+					// Blur the body it's focused but not correctly focused
+					body.blur();
+
+					// Refocus the body after a little while
+					setTimeout(function() {
+						body.focus();
+					}, 0);
+				}
+			});
+		}
+	};
+
+	function selectControlElements() {
+		editor.onClick.add(function(editor, e) {
+			e = e.target;
+
+			// Workaround for bug, http://bugs.webkit.org/show_bug.cgi?id=12250
+			// WebKit can't even do simple things like selecting an image
+			// Needs tobe the setBaseAndExtend or it will fail to select floated images
+			if (/^(IMG|HR)$/.test(e.nodeName)) {
+				selection.getSel().setBaseAndExtent(e, 0, e, 1);
+			}
+
+			if (e.nodeName == 'A' && dom.hasClass(e, 'mceItemAnchor')) {
+				selection.select(e);
+			}
+
+			editor.nodeChanged();
+		});
+	};
+
+	function removeStylesWhenDeletingAccrossBlockElements() {
+		function getAttributeApplyFunction() {
+			var template = dom.getAttribs(selection.getStart().cloneNode(false));
+
+			return function() {
+				var target = selection.getStart();
+
+				if (target !== editor.getBody()) {
+					dom.setAttrib(target, "style", null);
+
+					each(template, function(attr) {
+						target.setAttributeNode(attr.cloneNode(true));
+					});
+				}
+			};
+		}
+
+		function isSelectionAcrossElements() {
+			return !selection.isCollapsed() && dom.getParent(selection.getStart(), dom.isBlock) != dom.getParent(selection.getEnd(), dom.isBlock);
+		}
+
+		function blockEvent(editor, e) {
+			e.preventDefault();
+			return false;
+		}
+
+		editor.onKeyPress.add(function(editor, e) {
+			var applyAttributes;
+
+			if (!isDefaultPrevented(e) && (e.keyCode == 8 || e.keyCode == 46) && isSelectionAcrossElements()) {
+				applyAttributes = getAttributeApplyFunction();
+				editor.getDoc().execCommand('delete', false, null);
+				applyAttributes();
+				e.preventDefault();
+				return false;
+			}
+		});
+
+		dom.bind(editor.getDoc(), 'cut', function(e) {
+			var applyAttributes;
+
+			if (!isDefaultPrevented(e) && isSelectionAcrossElements()) {
+				applyAttributes = getAttributeApplyFunction();
+				editor.onKeyUp.addToTop(blockEvent);
+
+				setTimeout(function() {
+					applyAttributes();
+					editor.onKeyUp.remove(blockEvent);
+				}, 0);
+			}
+		});
+	}
+
+	function selectionChangeNodeChanged() {
+		var lastRng, selectionTimer;
+
+		dom.bind(editor.getDoc(), 'selectionchange', function() {
+			if (selectionTimer) {
+				clearTimeout(selectionTimer);
+				selectionTimer = 0;
+			}
+
+			selectionTimer = window.setTimeout(function() {
+				var rng = selection.getRng();
+
+				// Compare the ranges to see if it was a real change or not
+				if (!lastRng || !tinymce.dom.RangeUtils.compareRanges(rng, lastRng)) {
+					editor.nodeChanged();
+					lastRng = rng;
+				}
+			}, 50);
+		});
+	}
+
+	function ensureBodyHasRoleApplication() {
+		document.body.setAttribute("role", "application");
+	}
+
+	function disableBackspaceIntoATable() {
+		editor.onKeyDown.add(function(editor, e) {
+			if (!isDefaultPrevented(e) && e.keyCode === BACKSPACE) {
+				if (selection.isCollapsed() && selection.getRng(true).startOffset === 0) {
+					var previousSibling = selection.getNode().previousSibling;
+					if (previousSibling && previousSibling.nodeName && previousSibling.nodeName.toLowerCase() === "table") {
+						return tinymce.dom.Event.cancel(e);
+					}
+				}
+			}
+		})
+	}
+
+	function addNewLinesBeforeBrInPre() {
+		// IE8+ rendering mode does the right thing with BR in PRE
+		if (getDocumentMode() > 7) {
+			return;
+		}
+
+		 // Enable display: none in area and add a specific class that hides all BR elements in PRE to
+		 // avoid the caret from getting stuck at the BR elements while pressing the right arrow key
+		setEditorCommandState('RespectVisibilityInDesign', true);
+		editor.contentStyles.push('.mceHideBrInPre pre br {display: none}');
+		dom.addClass(editor.getBody(), 'mceHideBrInPre');
+
+		// Adds a \n before all BR elements in PRE to get them visual
+		parser.addNodeFilter('pre', function(nodes, name) {
+			var i = nodes.length, brNodes, j, brElm, sibling;
+
+			while (i--) {
+				brNodes = nodes[i].getAll('br');
+				j = brNodes.length;
+				while (j--) {
+					brElm = brNodes[j];
+
+					// Add \n before BR in PRE elements on older IE:s so the new lines get rendered
+					sibling = brElm.prev;
+					if (sibling && sibling.type === 3 && sibling.value.charAt(sibling.value - 1) != '\n') {
+						sibling.value += '\n';
+					} else {
+						brElm.parent.insert(new tinymce.html.Node('#text', 3), brElm, true).value = '\n';
+					}
+				}
+			}
+		});
+
+		// Removes any \n before BR elements in PRE since other browsers and in contentEditable=false mode they will be visible
+		serializer.addNodeFilter('pre', function(nodes, name) {
+			var i = nodes.length, brNodes, j, brElm, sibling;
+
+			while (i--) {
+				brNodes = nodes[i].getAll('br');
+				j = brNodes.length;
+				while (j--) {
+					brElm = brNodes[j];
+					sibling = brElm.prev;
+					if (sibling && sibling.type == 3) {
+						sibling.value = sibling.value.replace(/\r?\n$/, '');
+					}
+				}
+			}
+		});
+	}
+
+	function removePreSerializedStylesWhenSelectingControls() {
+		dom.bind(editor.getBody(), 'mouseup', function(e) {
+			var value, node = selection.getNode();
+
+			// Moved styles to attributes on IMG eements
+			if (node.nodeName == 'IMG') {
+				// Convert style width to width attribute
+				if (value = dom.getStyle(node, 'width')) {
+					dom.setAttrib(node, 'width', value.replace(/[^0-9%]+/g, ''));
+					dom.setStyle(node, 'width', '');
+				}
+
+				// Convert style height to height attribute
+				if (value = dom.getStyle(node, 'height')) {
+					dom.setAttrib(node, 'height', value.replace(/[^0-9%]+/g, ''));
+					dom.setStyle(node, 'height', '');
+				}
+			}
+		});
+	}
+
+	function keepInlineElementOnDeleteBackspace() {
+		editor.onKeyDown.add(function(editor, e) {
+			var isDelete, rng, container, offset, brElm, sibling, collapsed;
+
+			isDelete = e.keyCode == DELETE;
+			if (!isDefaultPrevented(e) && (isDelete || e.keyCode == BACKSPACE) && !VK.modifierPressed(e)) {
+				rng = selection.getRng();
+				container = rng.startContainer;
+				offset = rng.startOffset;
+				collapsed = rng.collapsed;
+
+				// Override delete if the start container is a text node and is at the beginning of text or
+				// just before/after the last character to be deleted in collapsed mode
+				if (container.nodeType == 3 && container.nodeValue.length > 0 && ((offset === 0 && !collapsed) || (collapsed && offset === (isDelete ? 0 : 1)))) {
+					// Edge case when deleting <p><b><img> |x</b></p>
+					sibling = container.previousSibling;
+					if (sibling && sibling.nodeName == "IMG") {
+						return;
+					}
+
+					nonEmptyElements = editor.schema.getNonEmptyElements();
+
+					// Prevent default logic since it's broken
+					e.preventDefault();
+
+					// Insert a BR before the text node this will prevent the containing element from being deleted/converted
+					brElm = dom.create('br', {id: '__tmp'});
+					container.parentNode.insertBefore(brElm, container);
+
+					// Do the browser delete
+					editor.getDoc().execCommand(isDelete ? 'ForwardDelete' : 'Delete', false, null);
+
+					// Check if the previous sibling is empty after deleting for example: <p><b></b>|</p>
+					container = selection.getRng().startContainer;
+					sibling = container.previousSibling;
+					if (sibling && sibling.nodeType == 1 && !dom.isBlock(sibling) && dom.isEmpty(sibling) && !nonEmptyElements[sibling.nodeName.toLowerCase()]) {
+						dom.remove(sibling);
+					}
+
+					// Remove the temp element we inserted
+					dom.remove('__tmp');
+				}
+			}
+		});
+	}
+
+	function removeBlockQuoteOnBackSpace() {
+		// Add block quote deletion handler
+		editor.onKeyDown.add(function(editor, e) {
+			var rng, container, offset, root, parent;
+
+			if (isDefaultPrevented(e) || e.keyCode != VK.BACKSPACE) {
+				return;
+			}
+
+			rng = selection.getRng();
+			container = rng.startContainer;
+			offset = rng.startOffset;
+			root = dom.getRoot();
+			parent = container;
+
+			if (!rng.collapsed || offset !== 0) {
+				return;
+			}
+
+			while (parent && parent.parentNode && parent.parentNode.firstChild == parent && parent.parentNode != root) {
+				parent = parent.parentNode;
+			}
+
+			// Is the cursor at the beginning of a blockquote?
+			if (parent.tagName === 'BLOCKQUOTE') {
+				// Remove the blockquote
+				editor.formatter.toggle('blockquote', null, parent);
+
+				// Move the caret to the beginning of container
+				rng = dom.createRng();
+				rng.setStart(container, 0);
+				rng.setEnd(container, 0);
+				selection.setRng(rng);
+			}
+		});
+	};
+
+	function setGeckoEditingOptions() {
+		function setOpts() {
+			editor._refreshContentEditable();
+
+			setEditorCommandState("StyleWithCSS", false);
+			setEditorCommandState("enableInlineTableEditing", false);
+
+			if (!settings.object_resizing) {
+				setEditorCommandState("enableObjectResizing", false);
+			}
+		};
+
+		if (!settings.readonly) {
+			editor.onBeforeExecCommand.add(setOpts);
+			editor.onMouseDown.add(setOpts);
+		}
+	};
+
+	function addBrAfterLastLinks() {
+		function fixLinks(editor, o) {
+			each(dom.select('a'), function(node) {
+				var parentNode = node.parentNode, root = dom.getRoot();
+
+				if (parentNode.lastChild === node) {
+					while (parentNode && !dom.isBlock(parentNode)) {
+						if (parentNode.parentNode.lastChild !== parentNode || parentNode === root) {
+							return;
+						}
+
+						parentNode = parentNode.parentNode;
+					}
+
+					dom.add(parentNode, 'br', {'data-mce-bogus' : 1});
+				}
+			});
+		};
+
+		editor.onExecCommand.add(function(editor, cmd) {
+			if (cmd === 'CreateLink') {
+				fixLinks(editor);
+			}
+		});
+
+		editor.onSetContent.add(selection.onSetContent.add(fixLinks));
+	};
+
+	function setDefaultBlockType() {
+		if (settings.forced_root_block) {
+			editor.onInit.add(function() {
+				setEditorCommandState('DefaultParagraphSeparator', settings.forced_root_block);
+			});
+		}
+	}
+
+	function removeGhostSelection() {
+		function repaint(sender, args) {
+			if (!sender || !args.initial) {
+				editor.execCommand('mceRepaint');
+			}
+		};
+
+		editor.onUndo.add(repaint);
+		editor.onRedo.add(repaint);
+		editor.onSetContent.add(repaint);
+	};
+
+	function deleteControlItemOnBackSpace() {
+		editor.onKeyDown.add(function(editor, e) {
+			var rng;
+
+			if (!isDefaultPrevented(e) && e.keyCode == BACKSPACE) {
+				rng = editor.getDoc().selection.createRange();
+				if (rng && rng.item) {
+					e.preventDefault();
+					editor.undoManager.beforeChange();
+					dom.remove(rng.item(0));
+					editor.undoManager.add();
+				}
+			}
+		});
+	};
+
+	function renderEmptyBlocksFix() {
+		var emptyBlocksCSS;
+
+		// IE10+
+		if (getDocumentMode() >= 10) {
+			emptyBlocksCSS = '';
+			each('p div h1 h2 h3 h4 h5 h6'.split(' '), function(name, i) {
+				emptyBlocksCSS += (i > 0 ? ',' : '') + name + ':empty';
+			});
+
+			editor.contentStyles.push(emptyBlocksCSS + '{padding-right: 1px !important}');
+		}
+	};
+
+	function fakeImageResize() {
+		var selectedElmX, selectedElmY, selectedElm, selectedElmGhost, selectedHandle, startX, startY, startW, startH, ratio,
+			resizeHandles, width, height, rootDocument = document, editableDoc = editor.getDoc();
+
+		if (!settings.object_resizing || settings.webkit_fake_resize === false) {
+			return;
+		}
+
+		// Try disabling object resizing if WebKit implements resizing in the future
+		setEditorCommandState("enableObjectResizing", false);
+
+		// Details about each resize handle how to scale etc
+		resizeHandles = {
+			// Name: x multiplier, y multiplier, delta size x, delta size y
+			n: [.5, 0, 0, -1],
+			e: [1, .5, 1, 0],
+			s: [.5, 1, 0, 1],
+			w: [0, .5, -1, 0],
+			nw: [0, 0, -1, -1],
+			ne: [1, 0, 1, -1],
+			se: [1, 1, 1, 1],
+			sw : [0, 1, -1, 1]
+		};
+
+		function resizeElement(e) {
+			var deltaX, deltaY;
+
+			// Calc new width/height
+			deltaX = e.screenX - startX;
+			deltaY = e.screenY - startY;
+
+			// Calc new size
+			width = deltaX * selectedHandle[2] + startW;
+			height = deltaY * selectedHandle[3] + startH;
+
+			// Never scale down lower than 5 pixels
+			width = width < 5 ? 5 : width;
+			height = height < 5 ? 5 : height;
+
+			// Constrain proportions when modifier key is pressed or if the nw, ne, sw, se corners are moved on an image
+			if (VK.modifierPressed(e) || (selectedElm.nodeName == "IMG" && selectedHandle[2] * selectedHandle[3] !== 0)) {
+				width = Math.round(height / ratio);
+				height = Math.round(width * ratio);
+			}
+
+			// Update ghost size
+			dom.setStyles(selectedElmGhost, {
+				width: width,
+				height: height
+			});
+
+			// Update ghost X position if needed
+			if (selectedHandle[2] < 0 && selectedElmGhost.clientWidth <= width) {
+				dom.setStyle(selectedElmGhost, 'left', selectedElmX + (startW - width));
+			}
+
+			// Update ghost Y position if needed
+			if (selectedHandle[3] < 0 && selectedElmGhost.clientHeight <= height) {
+				dom.setStyle(selectedElmGhost, 'top', selectedElmY + (startH - height));
+			}
+		}
+
+		function endResize() {
+			function setSizeProp(name, value) {
+				if (value) {
+					// Resize by using style or attribute
+					if (selectedElm.style[name] || !editor.schema.isValid(selectedElm.nodeName.toLowerCase(), name)) {
+						dom.setStyle(selectedElm, name, value);
+					} else {
+						dom.setAttrib(selectedElm, name, value);
+					}
+				}
+			}
+
+			// Set width/height properties
+			setSizeProp('width', width);
+			setSizeProp('height', height);
+
+			dom.unbind(editableDoc, 'mousemove', resizeElement);
+			dom.unbind(editableDoc, 'mouseup', endResize);
+
+			if (rootDocument != editableDoc) {
+				dom.unbind(rootDocument, 'mousemove', resizeElement);
+				dom.unbind(rootDocument, 'mouseup', endResize);
+			}
+
+			// Remove ghost and update resize handle positions
+			dom.remove(selectedElmGhost);
+			showResizeRect(selectedElm);
+		}
+
+		function showResizeRect(targetElm) {
+			var position, targetWidth, targetHeight;
+
+			hideResizeRect();
+
+			// Get position and size of target
+			position = dom.getPos(targetElm);
+			selectedElmX = position.x;
+			selectedElmY = position.y;
+			targetWidth = targetElm.offsetWidth;
+			targetHeight = targetElm.offsetHeight;
+
+			// Reset width/height if user selects a new image/table
+			if (selectedElm != targetElm) {
+				selectedElm = targetElm;
+				width = height = 0;
+			}
+
+			each(resizeHandles, function(handle, name) {
+				var handleElm;
+
+				// Get existing or render resize handle
+				handleElm = dom.get('mceResizeHandle' + name);
+				if (!handleElm) {
+					handleElm = dom.add(editableDoc.documentElement, 'div', {
+						id: 'mceResizeHandle' + name,
+						'class': 'mceResizeHandle',
+						style: 'cursor:' + name + '-resize; margin:0; padding:0'
+					});
+
+					dom.bind(handleElm, 'mousedown', function(e) {
+						e.preventDefault();
+
+						endResize();
+
+						startX = e.screenX;
+						startY = e.screenY;
+						startW = selectedElm.clientWidth;
+						startH = selectedElm.clientHeight;
+						ratio = startH / startW;
+						selectedHandle = handle;
+
+						selectedElmGhost = selectedElm.cloneNode(true);
+						dom.addClass(selectedElmGhost, 'mceClonedResizable');
+						dom.setStyles(selectedElmGhost, {
+							left: selectedElmX,
+							top: selectedElmY,
+							margin: 0
+						});
+
+						editableDoc.documentElement.appendChild(selectedElmGhost);
+
+						dom.bind(editableDoc, 'mousemove', resizeElement);
+						dom.bind(editableDoc, 'mouseup', endResize);
+
+						if (rootDocument != editableDoc) {
+							dom.bind(rootDocument, 'mousemove', resizeElement);
+							dom.bind(rootDocument, 'mouseup', endResize);
+						}
+					});
+				} else {
+					dom.show(handleElm);
+				}
+
+				// Position element
+				dom.setStyles(handleElm, {
+					left: (targetWidth * handle[0] + selectedElmX) - (handleElm.offsetWidth / 2),
+					top: (targetHeight * handle[1] + selectedElmY) - (handleElm.offsetHeight / 2)
+				});
+			});
+
+			// Only add resize rectangle on WebKit and only on images
+			if (!tinymce.isOpera && selectedElm.nodeName == "IMG") {
+				selectedElm.setAttribute('data-mce-selected', '1');
+			}
+		}
+
+		function hideResizeRect() {
+			if (selectedElm) {
+				selectedElm.removeAttribute('data-mce-selected');
+			}
+
+			for (var name in resizeHandles) {
+				dom.hide('mceResizeHandle' + name);
+			}
+		}
+
+		// Add CSS for resize handles, cloned element and selected
+		editor.contentStyles.push(
+			'.mceResizeHandle {' +
+				'position: absolute;' +
+				'border: 1px solid black;' +
+				'background: #FFF;' +
+				'width: 5px;' +
+				'height: 5px;' +
+				'z-index: 10000' +
+			'}' +
+			'.mceResizeHandle:hover {' +
+				'background: #000' +
+			'}' +
+			'img[data-mce-selected] {' +
+				'outline: 1px solid black' +
+			'}' +
+			'img.mceClonedResizable, table.mceClonedResizable {' +
+				'position: absolute;' +
+				'outline: 1px dashed black;' +
+				'opacity: .5;' +
+				'z-index: 10000' +
+			'}'
+		);
+
+		function updateResizeRect() {
+			var controlElm = dom.getParent(selection.getNode(), 'table,img');
+
+			// Remove data-mce-selected from all elements since they might have been copied using Ctrl+c/v
+			each(dom.select('img[data-mce-selected]'), function(img) {
+				img.removeAttribute('data-mce-selected');
+			});
+
+			if (controlElm) {
+				showResizeRect(controlElm);
+			} else {
+				hideResizeRect();
+			}
+		}
+
+		// Show/hide resize rect when image is selected
+		editor.onNodeChange.add(updateResizeRect);
+
+		// Fixes WebKit quirk where it returns IMG on getNode if caret is after last image in container
+		dom.bind(editableDoc, 'selectionchange', updateResizeRect);
+
+		// Remove the internal attribute when serializing the DOM
+		editor.serializer.addAttributeFilter('data-mce-selected', function(nodes, name) {
+			var i = nodes.length;
+
+			while (i--) {
+				nodes[i].attr(name, null);
+			}
+		});
+	}
+
+	function keepNoScriptContents() {
+		if (getDocumentMode() < 9) {
+			parser.addNodeFilter('noscript', function(nodes) {
+				var i = nodes.length, node, textNode;
+
+				while (i--) {
+					node = nodes[i];
+					textNode = node.firstChild;
+
+					if (textNode) {
+						node.attr('data-mce-innertext', textNode.value);
+					}
+				}
+			});
+
+			serializer.addNodeFilter('noscript', function(nodes) {
+				var i = nodes.length, node, textNode, value;
+
+				while (i--) {
+					node = nodes[i];
+					textNode = nodes[i].firstChild;
+
+					if (textNode) {
+						textNode.value = tinymce.html.Entities.decode(textNode.value);
+					} else {
+						// Old IE can't retain noscript value so an attribute is used to store it
+						value = node.attributes.map['data-mce-innertext'];
+						if (value) {
+							node.attr('data-mce-innertext', null);
+							textNode = new tinymce.html.Node('#text', 3);
+							textNode.value = value;
+							textNode.raw = true;
+							node.append(textNode);
+						}
+					}
+				}
+			});
+		}
+	}
+
+	function bodyHeight() {
+		editor.contentStyles.push('body {min-height: 100px}');
+		editor.onClick.add(function(ed, e) {
+			if (e.target.nodeName == 'HTML') {
+				editor.execCommand('SelectAll');
+				editor.selection.collapse(true);
+				editor.nodeChanged();
+			}
+		});
+	}
+
+	function fixControlSelection() {
+		editor.onInit.add(function() {
+			var selectedRng;
+
+			editor.getBody().addEventListener('mscontrolselect', function(e) {
+				setTimeout(function() {
+					if (editor.selection.getNode() != e.target) {
+						selectedRng = editor.selection.getRng();
+						selection.fakeRng = editor.dom.createRng();
+						selection.fakeRng.setStartBefore(e.target);
+						selection.fakeRng.setEndAfter(e.target);
+					}
+				}, 0);
+			}, false);
+
+			editor.getDoc().addEventListener('selectionchange', function(e) {
+				if (selectedRng && !tinymce.dom.RangeUtils.compareRanges(editor.selection.getRng(), selectedRng)) {
+					selection.fakeRng = selectedRng = null;
+				}
+			}, false);
+		});
+	}
+
+	// All browsers
+	disableBackspaceIntoATable();
+	removeBlockQuoteOnBackSpace();
+	emptyEditorWhenDeleting();
+
+	// WebKit
+	if (tinymce.isWebKit) {
+		keepInlineElementOnDeleteBackspace();
+		cleanupStylesWhenDeleting();
+		inputMethodFocus();
+		selectControlElements();
+		setDefaultBlockType();
+
+		// iOS
+		if (tinymce.isIDevice) {
+			selectionChangeNodeChanged();
+		} else {
+			fakeImageResize();
+			selectAll();
+		}
+	}
+
+	// IE
+	if (tinymce.isIE && !tinymce.isIE11) {
+		removeHrOnBackspace();
+		ensureBodyHasRoleApplication();
+		addNewLinesBeforeBrInPre();
+		removePreSerializedStylesWhenSelectingControls();
+		deleteControlItemOnBackSpace();
+		renderEmptyBlocksFix();
+		keepNoScriptContents();
+	}
+
+	// IE 11+
+	if (tinymce.isIE11) {
+		bodyHeight();
+		fixControlSelection();
+	}
+
+	// Gecko
+	if (tinymce.isGecko && !tinymce.isIE11) {
+		removeHrOnBackspace();
+		focusBody();
+		removeStylesWhenDeletingAccrossBlockElements();
+		setGeckoEditingOptions();
+		addBrAfterLastLinks();
+		removeGhostSelection();
+	}
+
+	// Opera
+	if (tinymce.isOpera) {
+		fakeImageResize();
+	}
+};
+(function(tinymce) {
+	var namedEntities, baseEntities, reverseEntities,
+		attrsCharsRegExp = /[&<>\"\u007E-\uD7FF\uE000-\uFFEF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,
+		textCharsRegExp = /[<>&\u007E-\uD7FF\uE000-\uFFEF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,
+		rawCharsRegExp = /[<>&\"\']/g,
+		entityRegExp = /&(#x|#)?([\w]+);/g,
+		asciiMap = {
+				128 : "\u20AC", 130 : "\u201A", 131 : "\u0192", 132 : "\u201E", 133 : "\u2026", 134 : "\u2020",
+				135 : "\u2021", 136 : "\u02C6", 137 : "\u2030", 138 : "\u0160", 139 : "\u2039", 140 : "\u0152",
+				142 : "\u017D", 145 : "\u2018", 146 : "\u2019", 147 : "\u201C", 148 : "\u201D", 149 : "\u2022",
+				150 : "\u2013", 151 : "\u2014", 152 : "\u02DC", 153 : "\u2122", 154 : "\u0161", 155 : "\u203A",
+				156 : "\u0153", 158 : "\u017E", 159 : "\u0178"
+		};
+
+	// Raw entities
+	baseEntities = {
+		'\"' : '&quot;', // Needs to be escaped since the YUI compressor would otherwise break the code
+		"'" : '&#39;',
+		'<' : '&lt;',
+		'>' : '&gt;',
+		'&' : '&amp;'
+	};
+
+	// Reverse lookup table for raw entities
+	reverseEntities = {
+		'&lt;' : '<',
+		'&gt;' : '>',
+		'&amp;' : '&',
+		'&quot;' : '"',
+		'&apos;' : "'"
+	};
+
+	// Decodes text by using the browser
+	function nativeDecode(text) {
+		var elm;
+
+		elm = document.createElement("div");
+		elm.innerHTML = text;
+
+		return elm.textContent || elm.innerText || text;
+	};
+
+	// Build a two way lookup table for the entities
+	function buildEntitiesLookup(items, radix) {
+		var i, chr, entity, lookup = {};
+
+		if (items) {
+			items = items.split(',');
+			radix = radix || 10;
+
+			// Build entities lookup table
+			for (i = 0; i < items.length; i += 2) {
+				chr = String.fromCharCode(parseInt(items[i], radix));
+
+				// Only add non base entities
+				if (!baseEntities[chr]) {
+					entity = '&' + items[i + 1] + ';';
+					lookup[chr] = entity;
+					lookup[entity] = chr;
+				}
+			}
+
+			return lookup;
+		}
+	};
+
+	// Unpack entities lookup where the numbers are in radix 32 to reduce the size
+	namedEntities = buildEntitiesLookup(
+		'50,nbsp,51,iexcl,52,cent,53,pound,54,curren,55,yen,56,brvbar,57,sect,58,uml,59,copy,' +
+		'5a,ordf,5b,laquo,5c,not,5d,shy,5e,reg,5f,macr,5g,deg,5h,plusmn,5i,sup2,5j,sup3,5k,acute,' +
+		'5l,micro,5m,para,5n,middot,5o,cedil,5p,sup1,5q,ordm,5r,raquo,5s,frac14,5t,frac12,5u,frac34,' +
+		'5v,iquest,60,Agrave,61,Aacute,62,Acirc,63,Atilde,64,Auml,65,Aring,66,AElig,67,Ccedil,' +
+		'68,Egrave,69,Eacute,6a,Ecirc,6b,Euml,6c,Igrave,6d,Iacute,6e,Icirc,6f,Iuml,6g,ETH,6h,Ntilde,' +
+		'6i,Ograve,6j,Oacute,6k,Ocirc,6l,Otilde,6m,Ouml,6n,times,6o,Oslash,6p,Ugrave,6q,Uacute,' +
+		'6r,Ucirc,6s,Uuml,6t,Yacute,6u,THORN,6v,szlig,70,agrave,71,aacute,72,acirc,73,atilde,74,auml,' +
+		'75,aring,76,aelig,77,ccedil,78,egrave,79,eacute,7a,ecirc,7b,euml,7c,igrave,7d,iacute,7e,icirc,' +
+		'7f,iuml,7g,eth,7h,ntilde,7i,ograve,7j,oacute,7k,ocirc,7l,otilde,7m,ouml,7n,divide,7o,oslash,' +
+		'7p,ugrave,7q,uacute,7r,ucirc,7s,uuml,7t,yacute,7u,thorn,7v,yuml,ci,fnof,sh,Alpha,si,Beta,' +
+		'sj,Gamma,sk,Delta,sl,Epsilon,sm,Zeta,sn,Eta,so,Theta,sp,Iota,sq,Kappa,sr,Lambda,ss,Mu,' +
+		'st,Nu,su,Xi,sv,Omicron,t0,Pi,t1,Rho,t3,Sigma,t4,Tau,t5,Upsilon,t6,Phi,t7,Chi,t8,Psi,' +
+		't9,Omega,th,alpha,ti,beta,tj,gamma,tk,delta,tl,epsilon,tm,zeta,tn,eta,to,theta,tp,iota,' +
+		'tq,kappa,tr,lambda,ts,mu,tt,nu,tu,xi,tv,omicron,u0,pi,u1,rho,u2,sigmaf,u3,sigma,u4,tau,' +
+		'u5,upsilon,u6,phi,u7,chi,u8,psi,u9,omega,uh,thetasym,ui,upsih,um,piv,812,bull,816,hellip,' +
+		'81i,prime,81j,Prime,81u,oline,824,frasl,88o,weierp,88h,image,88s,real,892,trade,89l,alefsym,' +
+		'8cg,larr,8ch,uarr,8ci,rarr,8cj,darr,8ck,harr,8dl,crarr,8eg,lArr,8eh,uArr,8ei,rArr,8ej,dArr,' +
+		'8ek,hArr,8g0,forall,8g2,part,8g3,exist,8g5,empty,8g7,nabla,8g8,isin,8g9,notin,8gb,ni,8gf,prod,' +
+		'8gh,sum,8gi,minus,8gn,lowast,8gq,radic,8gt,prop,8gu,infin,8h0,ang,8h7,and,8h8,or,8h9,cap,8ha,cup,' +
+		'8hb,int,8hk,there4,8hs,sim,8i5,cong,8i8,asymp,8j0,ne,8j1,equiv,8j4,le,8j5,ge,8k2,sub,8k3,sup,8k4,' +
+		'nsub,8k6,sube,8k7,supe,8kl,oplus,8kn,otimes,8l5,perp,8m5,sdot,8o8,lceil,8o9,rceil,8oa,lfloor,8ob,' +
+		'rfloor,8p9,lang,8pa,rang,9ea,loz,9j0,spades,9j3,clubs,9j5,hearts,9j6,diams,ai,OElig,aj,oelig,b0,' +
+		'Scaron,b1,scaron,bo,Yuml,m6,circ,ms,tilde,802,ensp,803,emsp,809,thinsp,80c,zwnj,80d,zwj,80e,lrm,' +
+		'80f,rlm,80j,ndash,80k,mdash,80o,lsquo,80p,rsquo,80q,sbquo,80s,ldquo,80t,rdquo,80u,bdquo,810,dagger,' +
+		'811,Dagger,81g,permil,81p,lsaquo,81q,rsaquo,85c,euro', 32);
+
+	tinymce.html = tinymce.html || {};
+
+	tinymce.html.Entities = {
+		encodeRaw : function(text, attr) {
+			return text.replace(attr ? attrsCharsRegExp : textCharsRegExp, function(chr) {
+				return baseEntities[chr] || chr;
+			});
+		},
+
+		encodeAllRaw : function(text) {
+			return ('' + text).replace(rawCharsRegExp, function(chr) {
+				return baseEntities[chr] || chr;
+			});
+		},
+
+		encodeNumeric : function(text, attr) {
+			return text.replace(attr ? attrsCharsRegExp : textCharsRegExp, function(chr) {
+				// Multi byte sequence convert it to a single entity
+				if (chr.length > 1)
+					return '&#' + (((chr.charCodeAt(0) - 0xD800) * 0x400) + (chr.charCodeAt(1) - 0xDC00) + 0x10000) + ';';
+
+				return baseEntities[chr] || '&#' + chr.charCodeAt(0) + ';';
+			});
+		},
+
+		encodeNamed : function(text, attr, entities) {
+			entities = entities || namedEntities;
+
+			return text.replace(attr ? attrsCharsRegExp : textCharsRegExp, function(chr) {
+				return baseEntities[chr] || entities[chr] || chr;
+			});
+		},
+
+		getEncodeFunc : function(name, entities) {
+			var Entities = tinymce.html.Entities;
+
+			entities = buildEntitiesLookup(entities) || namedEntities;
+
+			function encodeNamedAndNumeric(text, attr) {
+				return text.replace(attr ? attrsCharsRegExp : textCharsRegExp, function(chr) {
+					return baseEntities[chr] || entities[chr] || '&#' + chr.charCodeAt(0) + ';' || chr;
+				});
+			};
+
+			function encodeCustomNamed(text, attr) {
+				return Entities.encodeNamed(text, attr, entities);
+			};
+
+			// Replace + with , to be compatible with previous TinyMCE versions
+			name = tinymce.makeMap(name.replace(/\+/g, ','));
+
+			// Named and numeric encoder
+			if (name.named && name.numeric)
+				return encodeNamedAndNumeric;
+
+			// Named encoder
+			if (name.named) {
+				// Custom names
+				if (entities)
+					return encodeCustomNamed;
+
+				return Entities.encodeNamed;
+			}
+
+			// Numeric
+			if (name.numeric)
+				return Entities.encodeNumeric;
+
+			// Raw encoder
+			return Entities.encodeRaw;
+		},
+
+		decode : function(text) {
+			return text.replace(entityRegExp, function(all, numeric, value) {
+				if (numeric) {
+					value = parseInt(value, numeric.length === 2 ? 16 : 10);
+
+					// Support upper UTF
+					if (value > 0xFFFF) {
+						value -= 0x10000;
+
+						return String.fromCharCode(0xD800 + (value >> 10), 0xDC00 + (value & 0x3FF));
+					} else
+						return asciiMap[value] || String.fromCharCode(value);
+				}
+
+				return reverseEntities[all] || namedEntities[all] || nativeDecode(all);
+			});
+		}
+	};
+})(tinymce);
+
+tinymce.html.Styles = function(settings, schema) {
+	var rgbRegExp = /rgb\s*\(\s*([0-9]+)\s*,\s*([0-9]+)\s*,\s*([0-9]+)\s*\)/gi,
+		urlOrStrRegExp = /(?:url(?:(?:\(\s*\"([^\"]+)\"\s*\))|(?:\(\s*\'([^\']+)\'\s*\))|(?:\(\s*([^)\s]+)\s*\))))|(?:\'([^\']+)\')|(?:\"([^\"]+)\")/gi,
+		styleRegExp = /\s*([^:]+):\s*([^;]+);?/g,
+		trimRightRegExp = /\s+$/,
+		urlColorRegExp = /rgb/,
+		undef, i, encodingLookup = {}, encodingItems;
+
+	settings = settings || {};
+
+	encodingItems = '\\" \\\' \\; \\: ; : \uFEFF'.split(' ');
+	for (i = 0; i < encodingItems.length; i++) {
+		encodingLookup[encodingItems[i]] = '\uFEFF' + i;
+		encodingLookup['\uFEFF' + i] = encodingItems[i];
+	}
+
+	function toHex(match, r, g, b) {
+		function hex(val) {
+			val = parseInt(val).toString(16);
+
+			return val.length > 1 ? val : '0' + val; // 0 -> 00
+		};
+
+		return '#' + hex(r) + hex(g) + hex(b);
+	};
+
+	return {
+		toHex : function(color) {
+			return color.replace(rgbRegExp, toHex);
+		},
+
+		parse : function(css) {
+			var styles = {}, matches, name, value, isEncoded, urlConverter = settings.url_converter, urlConverterScope = settings.url_converter_scope || this;
+
+			function compress(prefix, suffix) {
+				var top, right, bottom, left;
+
+				// IE 11 will produce a border-image: none when getting the style attribute from <p style="border: 1px solid red"></p>
+				// So lets asume it shouldn't be there
+				if (styles['border-image'] === 'none') {
+					delete styles['border-image'];
+				}
+
+				// Get values and check it it needs compressing
+				top = styles[prefix + '-top' + suffix];
+				if (!top)
+					return;
+
+				right = styles[prefix + '-right' + suffix];
+				if (top != right)
+					return;
+
+				bottom = styles[prefix + '-bottom' + suffix];
+				if (right != bottom)
+					return;
+
+				left = styles[prefix + '-left' + suffix];
+				if (bottom != left)
+					return;
+
+				// Compress
+				styles[prefix + suffix] = left;
+				delete styles[prefix + '-top' + suffix];
+				delete styles[prefix + '-right' + suffix];
+				delete styles[prefix + '-bottom' + suffix];
+				delete styles[prefix + '-left' + suffix];
+			};
+
+			function canCompress(key) {
+				var value = styles[key], i;
+
+				if (!value || value.indexOf(' ') < 0)
+					return;
+
+				value = value.split(' ');
+				i = value.length;
+				while (i--) {
+					if (value[i] !== value[0])
+						return false;
+				}
+
+				styles[key] = value[0];
+
+				return true;
+			};
+
+			function compress2(target, a, b, c) {
+				if (!canCompress(a))
+					return;
+
+				if (!canCompress(b))
+					return;
+
+				if (!canCompress(c))
+					return;
+
+				// Compress
+				styles[target] = styles[a] + ' ' + styles[b] + ' ' + styles[c];
+				delete styles[a];
+				delete styles[b];
+				delete styles[c];
+			};
+
+			// Encodes the specified string by replacing all \" \' ; : with _<num>
+			function encode(str) {
+				isEncoded = true;
+
+				return encodingLookup[str];
+			};
+
+			// Decodes the specified string by replacing all _<num> with it's original value \" \' etc
+			// It will also decode the \" \' if keep_slashes is set to fale or omitted
+			function decode(str, keep_slashes) {
+				if (isEncoded) {
+					str = str.replace(/\uFEFF[0-9]/g, function(str) {
+						return encodingLookup[str];
+					});
+				}
+
+				if (!keep_slashes)
+					str = str.replace(/\\([\'\";:])/g, "$1");
+
+				return str;
+			};
+
+			function processUrl(match, url, url2, url3, str, str2) {
+				str = str || str2;
+
+				if (str) {
+					str = decode(str);
+
+					// Force strings into single quote format
+					return "'" + str.replace(/\'/g, "\\'") + "'";
+				}
+
+				url = decode(url || url2 || url3);
+
+				// Convert the URL to relative/absolute depending on config
+				if (urlConverter)
+					url = urlConverter.call(urlConverterScope, url, 'style');
+
+				// Output new URL format
+				return "url('" + url.replace(/\'/g, "\\'") + "')";
+			};
+
+			if (css) {
+				// Encode \" \' % and ; and : inside strings so they don't interfere with the style parsing
+				css = css.replace(/\\[\"\';:\uFEFF]/g, encode).replace(/\"[^\"]+\"|\'[^\']+\'/g, function(str) {
+					return str.replace(/[;:]/g, encode);
+				});
+
+				// Parse styles
+				while (matches = styleRegExp.exec(css)) {
+					name = matches[1].replace(trimRightRegExp, '').toLowerCase();
+					value = matches[2].replace(trimRightRegExp, '');
+
+					if (name && value.length > 0) {
+						// Opera will produce 700 instead of bold in their style values
+						if (name === 'font-weight' && value === '700')
+							value = 'bold';
+						else if (name === 'color' || name === 'background-color') // Lowercase colors like RED
+							value = value.toLowerCase();		
+
+						// Convert RGB colors to HEX
+						value = value.replace(rgbRegExp, toHex);
+
+						// Convert URLs and force them into url('value') format
+						value = value.replace(urlOrStrRegExp, processUrl);
+						styles[name] = isEncoded ? decode(value, true) : value;
+					}
+
+					styleRegExp.lastIndex = matches.index + matches[0].length;
+				}
+
+				// Compress the styles to reduce it's size for example IE will expand styles
+				compress("border", "");
+				compress("border", "-width");
+				compress("border", "-color");
+				compress("border", "-style");
+				compress("padding", "");
+				compress("margin", "");
+				compress2('border', 'border-width', 'border-style', 'border-color');
+
+				// Remove pointless border, IE produces these
+				if (styles.border === 'medium none')
+					delete styles.border;
+			}
+
+			return styles;
+		},
+
+		serialize : function(styles, element_name) {
+			var css = '', name, value;
+
+			function serializeStyles(name) {
+				var styleList, i, l, value;
+
+				styleList = schema.styles[name];
+				if (styleList) {
+					for (i = 0, l = styleList.length; i < l; i++) {
+						name = styleList[i];
+						value = styles[name];
+
+						if (value !== undef && value.length > 0)
+							css += (css.length > 0 ? ' ' : '') + name + ': ' + value + ';';
+					}
+				}
+			};
+
+			// Serialize styles according to schema
+			if (element_name && schema && schema.styles) {
+				// Serialize global styles and element specific styles
+				serializeStyles('*');
+				serializeStyles(element_name);
+			} else {
+				// Output the styles in the order they are inside the object
+				for (name in styles) {
+					value = styles[name];
+
+					if (value !== undef && value.length > 0)
+						css += (css.length > 0 ? ' ' : '') + name + ': ' + value + ';';
+				}
+			}
+
+			return css;
+		}
+	};
+};
+
+(function(tinymce) {
+	var mapCache = {}, makeMap = tinymce.makeMap, each = tinymce.each;
+
+	function split(str, delim) {
+		return str.split(delim || ',');
+	};
+
+	function unpack(lookup, data) {
+		var key, elements = {};
+
+		function replace(value) {
+			return value.replace(/[A-Z]+/g, function(key) {
+				return replace(lookup[key]);
+			});
+		};
+
+		// Unpack lookup
+		for (key in lookup) {
+			if (lookup.hasOwnProperty(key))
+				lookup[key] = replace(lookup[key]);
+		}
+
+		// Unpack and parse data into object map
+		replace(data).replace(/#/g, '#text').replace(/(\w+)\[([^\]]+)\]\[([^\]]*)\]/g, function(str, name, attributes, children) {
+			attributes = split(attributes, '|');
+
+			elements[name] = {
+				attributes : makeMap(attributes),
+				attributesOrder : attributes,
+				children : makeMap(children, '|', {'#comment' : {}})
+			}
+		});
+
+		return elements;
+	};
+
+	function getHTML5() {
+		var html5 = mapCache.html5;
+
+		if (!html5) {
+			html5 = mapCache.html5 = unpack({
+					A : 'id|accesskey|class|dir|draggable|item|hidden|itemprop|role|spellcheck|style|subject|title|onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup',
+					B : '#|a|abbr|area|audio|b|bdo|br|button|canvas|cite|code|command|datalist|del|dfn|em|embed|i|iframe|img|input|ins|kbd|keygen|label|link|map|mark|meta|' +
+						'meter|noscript|object|output|progress|q|ruby|samp|script|select|small|span|strong|sub|sup|svg|textarea|time|var|video|wbr',
+					C : '#|a|abbr|area|address|article|aside|audio|b|bdo|blockquote|br|button|canvas|cite|code|command|datalist|del|details|dfn|dialog|div|dl|em|embed|fieldset|' +
+						'figure|footer|form|h1|h2|h3|h4|h5|h6|header|hgroup|hr|i|iframe|img|input|ins|kbd|keygen|label|link|map|mark|menu|meta|meter|nav|noscript|ol|object|output|' +
+						'p|pre|progress|q|ruby|samp|script|section|select|small|span|strong|style|sub|sup|svg|table|textarea|time|ul|var|video'
+				}, 'html[A|manifest][body|head]' +
+					'head[A][base|command|link|meta|noscript|script|style|title]' +
+					'title[A][#]' +
+					'base[A|href|target][]' +
+					'link[A|href|rel|media|type|sizes][]' +
+					'meta[A|http-equiv|name|content|charset][]' +
+					'style[A|type|media|scoped][#]' +
+					'script[A|charset|type|src|defer|async][#]' +
+					'noscript[A][C]' +
+					'body[A][C]' +
+					'section[A][C]' +
+					'nav[A][C]' +
+					'article[A][C]' +
+					'aside[A][C]' +
+					'h1[A][B]' +
+					'h2[A][B]' +
+					'h3[A][B]' +
+					'h4[A][B]' +
+					'h5[A][B]' +
+					'h6[A][B]' +
+					'hgroup[A][h1|h2|h3|h4|h5|h6]' +
+					'header[A][C]' +
+					'footer[A][C]' +
+					'address[A][C]' +
+					'p[A][B]' +
+					'br[A][]' +
+					'pre[A][B]' +
+					'dialog[A][dd|dt]' +
+					'blockquote[A|cite][C]' +
+					'ol[A|start|reversed][li]' +
+					'ul[A][li]' +
+					'li[A|value][C]' +
+					'dl[A][dd|dt]' +
+					'dt[A][B]' +
+					'dd[A][C]' +
+					'a[A|href|target|ping|rel|media|type][B]' +
+					'em[A][B]' +
+					'strong[A][B]' +
+					'small[A][B]' +
+					'cite[A][B]' +
+					'q[A|cite][B]' +
+					'dfn[A][B]' +
+					'abbr[A][B]' +
+					'code[A][B]' +
+					'var[A][B]' +
+					'samp[A][B]' +
+					'kbd[A][B]' +
+					'sub[A][B]' +
+					'sup[A][B]' +
+					'i[A][B]' +
+					'b[A][B]' +
+					'mark[A][B]' +
+					'progress[A|value|max][B]' +
+					'meter[A|value|min|max|low|high|optimum][B]' +
+					'time[A|datetime][B]' +
+					'ruby[A][B|rt|rp]' +
+					'rt[A][B]' +
+					'rp[A][B]' +
+					'bdo[A][B]' +
+					'span[A][B]' +
+					'ins[A|cite|datetime][B]' +
+					'del[A|cite|datetime][B]' +
+					'figure[A][C|legend|figcaption]' +
+					'figcaption[A][C]' +
+					'img[A|alt|src|height|width|usemap|ismap][]' +
+					'iframe[A|name|src|height|width|sandbox|seamless][]' +
+					'embed[A|src|height|width|type][]' +
+					'object[A|data|type|height|width|usemap|name|form|classid][param]' +
+					'param[A|name|value][]' +
+					'details[A|open][C|legend]' +
+					'command[A|type|label|icon|disabled|checked|radiogroup][]' +
+					'menu[A|type|label][C|li]' +
+					'legend[A][C|B]' +
+					'div[A][C]' +
+					'source[A|src|type|media][]' +
+					'audio[A|src|autobuffer|autoplay|loop|controls][source]' +
+					'video[A|src|autobuffer|autoplay|loop|controls|width|height|poster][source]' +
+					'hr[A][]' +
+					'form[A|accept-charset|action|autocomplete|enctype|method|name|novalidate|target][C]' +
+					'fieldset[A|disabled|form|name][C|legend]' +
+					'label[A|form|for][B]' +
+					'input[A|type|accept|alt|autocomplete|autofocus|checked|disabled|form|formaction|formenctype|formmethod|formnovalidate|formtarget|height|list|max|maxlength|min|' +
+						'multiple|pattern|placeholder|readonly|required|size|src|step|width|files|value|name][]' +
+					'button[A|autofocus|disabled|form|formaction|formenctype|formmethod|formnovalidate|formtarget|name|value|type][B]' +
+					'select[A|autofocus|disabled|form|multiple|name|size][option|optgroup]' +
+					'datalist[A][B|option]' +
+					'optgroup[A|disabled|label][option]' +
+					'option[A|disabled|selected|label|value][]' +
+					'textarea[A|autofocus|disabled|form|maxlength|name|placeholder|readonly|required|rows|cols|wrap][]' +
+					'keygen[A|autofocus|challenge|disabled|form|keytype|name][]' +
+					'output[A|for|form|name][B]' +
+					'canvas[A|width|height][]' +
+					'map[A|name][B|C]' +
+					'area[A|shape|coords|href|alt|target|media|rel|ping|type][]' +
+					'mathml[A][]' +
+					'svg[A][]' +
+					'table[A|border][caption|colgroup|thead|tfoot|tbody|tr]' +
+					'caption[A][C]' +
+					'colgroup[A|span][col]' +
+					'col[A|span][]' +
+					'thead[A][tr]' +
+					'tfoot[A][tr]' +
+					'tbody[A][tr]' +
+					'tr[A][th|td]' +
+					'th[A|headers|rowspan|colspan|scope][B]' +
+					'td[A|headers|rowspan|colspan][C]' +
+					'wbr[A][]'
+			);
+		}
+
+		return html5;
+	};
+
+	function getHTML4() {
+		var html4 = mapCache.html4;
+
+		if (!html4) {
+			// This is the XHTML 1.0 transitional elements with it's attributes and children packed to reduce it's size
+			html4 = mapCache.html4 = unpack({
+				Z : 'H|K|N|O|P',
+				Y : 'X|form|R|Q',
+				ZG : 'E|span|width|align|char|charoff|valign',
+				X : 'p|T|div|U|W|isindex|fieldset|table',
+				ZF : 'E|align|char|charoff|valign',
+				W : 'pre|hr|blockquote|address|center|noframes',
+				ZE : 'abbr|axis|headers|scope|rowspan|colspan|align|char|charoff|valign|nowrap|bgcolor|width|height',
+				ZD : '[E][S]',
+				U : 'ul|ol|dl|menu|dir',
+				ZC : 'p|Y|div|U|W|table|br|span|bdo|object|applet|img|map|K|N|Q',
+				T : 'h1|h2|h3|h4|h5|h6',
+				ZB : 'X|S|Q',
+				S : 'R|P',
+				ZA : 'a|G|J|M|O|P',
+				R : 'a|H|K|N|O',
+				Q : 'noscript|P',
+				P : 'ins|del|script',
+				O : 'input|select|textarea|label|button',
+				N : 'M|L',
+				M : 'em|strong|dfn|code|q|samp|kbd|var|cite|abbr|acronym',
+				L : 'sub|sup',
+				K : 'J|I',
+				J : 'tt|i|b|u|s|strike',
+				I : 'big|small|font|basefont',
+				H : 'G|F',
+				G : 'br|span|bdo',
+				F : 'object|applet|img|map|iframe',
+				E : 'A|B|C',
+				D : 'accesskey|tabindex|onfocus|onblur',
+				C : 'onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup',
+				B : 'lang|xml:lang|dir',
+				A : 'id|class|style|title'
+			}, 'script[id|charset|type|language|src|defer|xml:space][]' + 
+				'style[B|id|type|media|title|xml:space][]' + 
+				'object[E|declare|classid|codebase|data|type|codetype|archive|standby|width|height|usemap|name|tabindex|align|border|hspace|vspace][#|param|Y]' + 
+				'param[id|name|value|valuetype|type][]' + 
+				'p[E|align][#|S]' + 
+				'a[E|D|charset|type|name|href|hreflang|rel|rev|shape|coords|target][#|Z]' + 
+				'br[A|clear][]' + 
+				'span[E][#|S]' + 
+				'bdo[A|C|B][#|S]' + 
+				'applet[A|codebase|archive|code|object|alt|name|width|height|align|hspace|vspace][#|param|Y]' + 
+				'h1[E|align][#|S]' + 
+				'img[E|src|alt|name|longdesc|width|height|usemap|ismap|align|border|hspace|vspace][]' + 
+				'map[B|C|A|name][X|form|Q|area]' + 
+				'h2[E|align][#|S]' + 
+				'iframe[A|longdesc|name|src|frameborder|marginwidth|marginheight|scrolling|align|width|height][#|Y]' + 
+				'h3[E|align][#|S]' + 
+				'tt[E][#|S]' + 
+				'i[E][#|S]' + 
+				'b[E][#|S]' + 
+				'u[E][#|S]' + 
+				's[E][#|S]' + 
+				'strike[E][#|S]' + 
+				'big[E][#|S]' + 
+				'small[E][#|S]' + 
+				'font[A|B|size|color|face][#|S]' + 
+				'basefont[id|size|color|face][]' + 
+				'em[E][#|S]' + 
+				'strong[E][#|S]' + 
+				'dfn[E][#|S]' + 
+				'code[E][#|S]' + 
+				'q[E|cite][#|S]' + 
+				'samp[E][#|S]' + 
+				'kbd[E][#|S]' + 
+				'var[E][#|S]' + 
+				'cite[E][#|S]' + 
+				'abbr[E][#|S]' + 
+				'acronym[E][#|S]' + 
+				'sub[E][#|S]' + 
+				'sup[E][#|S]' + 
+				'input[E|D|type|name|value|checked|disabled|readonly|size|maxlength|src|alt|usemap|onselect|onchange|accept|align][]' + 
+				'select[E|name|size|multiple|disabled|tabindex|onfocus|onblur|onchange][optgroup|option]' + 
+				'optgroup[E|disabled|label][option]' + 
+				'option[E|selected|disabled|label|value][]' + 
+				'textarea[E|D|name|rows|cols|disabled|readonly|onselect|onchange][]' + 
+				'label[E|for|accesskey|onfocus|onblur][#|S]' + 
+				'button[E|D|name|value|type|disabled][#|p|T|div|U|W|table|G|object|applet|img|map|K|N|Q]' + 
+				'h4[E|align][#|S]' + 
+				'ins[E|cite|datetime][#|Y]' + 
+				'h5[E|align][#|S]' + 
+				'del[E|cite|datetime][#|Y]' + 
+				'h6[E|align][#|S]' + 
+				'div[E|align][#|Y]' + 
+				'ul[E|type|compact][li]' + 
+				'li[E|type|value][#|Y]' + 
+				'ol[E|type|compact|start][li]' + 
+				'dl[E|compact][dt|dd]' + 
+				'dt[E][#|S]' + 
+				'dd[E][#|Y]' + 
+				'menu[E|compact][li]' + 
+				'dir[E|compact][li]' + 
+				'pre[E|width|xml:space][#|ZA]' + 
+				'hr[E|align|noshade|size|width][]' + 
+				'blockquote[E|cite][#|Y]' + 
+				'address[E][#|S|p]' + 
+				'center[E][#|Y]' + 
+				'noframes[E][#|Y]' + 
+				'isindex[A|B|prompt][]' + 
+				'fieldset[E][#|legend|Y]' + 
+				'legend[E|accesskey|align][#|S]' + 
+				'table[E|summary|width|border|frame|rules|cellspacing|cellpadding|align|bgcolor][caption|col|colgroup|thead|tfoot|tbody|tr]' + 
+				'caption[E|align][#|S]' + 
+				'col[ZG][]' + 
+				'colgroup[ZG][col]' + 
+				'thead[ZF][tr]' + 
+				'tr[ZF|bgcolor][th|td]' + 
+				'th[E|ZE][#|Y]' + 
+				'form[E|action|method|name|enctype|onsubmit|onreset|accept|accept-charset|target][#|X|R|Q]' + 
+				'noscript[E][#|Y]' + 
+				'td[E|ZE][#|Y]' + 
+				'tfoot[ZF][tr]' + 
+				'tbody[ZF][tr]' + 
+				'area[E|D|shape|coords|href|nohref|alt|target][]' + 
+				'base[id|href|target][]' + 
+				'body[E|onload|onunload|background|bgcolor|text|link|vlink|alink][#|Y]'
+			);
+		}
+
+		return html4;
+	};
+
+	tinymce.html.Schema = function(settings) {
+		var self = this, elements = {}, children = {}, patternElements = [], validStyles, schemaItems;
+		var whiteSpaceElementsMap, selfClosingElementsMap, shortEndedElementsMap, boolAttrMap, blockElementsMap, nonEmptyElementsMap, customElementsMap = {};
+
+		// Creates an lookup table map object for the specified option or the default value
+		function createLookupTable(option, default_value, extend) {
+			var value = settings[option];
+
+			if (!value) {
+				// Get cached default map or make it if needed
+				value = mapCache[option];
+
+				if (!value) {
+					value = makeMap(default_value, ' ', makeMap(default_value.toUpperCase(), ' '));
+					value = tinymce.extend(value, extend);
+
+					mapCache[option] = value;
+				}
+			} else {
+				// Create custom map
+				value = makeMap(value, ',', makeMap(value.toUpperCase(), ' '));
+			}
+
+			return value;
+		};
+
+		settings = settings || {};
+		schemaItems = settings.schema == "html5" ? getHTML5() : getHTML4();
+
+		// Allow all elements and attributes if verify_html is set to false
+		if (settings.verify_html === false)
+			settings.valid_elements = '*[*]';
+
+		// Build styles list
+		if (settings.valid_styles) {
+			validStyles = {};
+
+			// Convert styles into a rule list
+			each(settings.valid_styles, function(value, key) {
+				validStyles[key] = tinymce.explode(value);
+			});
+		}
+
+		// Setup map objects
+		whiteSpaceElementsMap = createLookupTable('whitespace_elements', 'pre script noscript style textarea');
+		selfClosingElementsMap = createLookupTable('self_closing_elements', 'colgroup dd dt li option p td tfoot th thead tr');
+		shortEndedElementsMap = createLookupTable('short_ended_elements', 'area base basefont br col frame hr img input isindex link meta param embed source wbr');
+		boolAttrMap = createLookupTable('boolean_attributes', 'checked compact declare defer disabled ismap multiple nohref noresize noshade nowrap readonly selected autoplay loop controls');
+		nonEmptyElementsMap = createLookupTable('non_empty_elements', 'td th iframe video audio object script', shortEndedElementsMap);
+		textBlockElementsMap = createLookupTable('text_block_elements', 'h1 h2 h3 h4 h5 h6 p div address pre form ' + 
+						'blockquote center dir fieldset header footer article section hgroup aside nav figure');
+		blockElementsMap = createLookupTable('block_elements', 'hr table tbody thead tfoot ' + 
+						'th tr td li ol ul caption dl dt dd noscript menu isindex samp option datalist select optgroup', textBlockElementsMap);
+
+		// Converts a wildcard expression string to a regexp for example *a will become /.*a/.
+		function patternToRegExp(str) {
+			return new RegExp('^' + str.replace(/([?+*])/g, '.$1') + '$');
+		};
+
+		// Parses the specified valid_elements string and adds to the current rules
+		// This function is a bit hard to read since it's heavily optimized for speed
+		function addValidElements(valid_elements) {
+			var ei, el, ai, al, yl, matches, element, attr, attrData, elementName, attrName, attrType, attributes, attributesOrder,
+				prefix, outputName, globalAttributes, globalAttributesOrder, transElement, key, childKey, value,
+				elementRuleRegExp = /^([#+\-])?([^\[\/]+)(?:\/([^\[]+))?(?:\[([^\]]+)\])?$/,
+				attrRuleRegExp = /^([!\-])?(\w+::\w+|[^=:<]+)?(?:([=:<])(.*))?$/,
+				hasPatternsRegExp = /[*?+]/;
+
+			if (valid_elements) {
+				// Split valid elements into an array with rules
+				valid_elements = split(valid_elements);
+
+				if (elements['@']) {
+					globalAttributes = elements['@'].attributes;
+					globalAttributesOrder = elements['@'].attributesOrder;
+				}
+
+				// Loop all rules
+				for (ei = 0, el = valid_elements.length; ei < el; ei++) {
+					// Parse element rule
+					matches = elementRuleRegExp.exec(valid_elements[ei]);
+					if (matches) {
+						// Setup local names for matches
+						prefix = matches[1];
+						elementName = matches[2];
+						outputName = matches[3];
+						attrData = matches[4];
+
+						// Create new attributes and attributesOrder
+						attributes = {};
+						attributesOrder = [];
+
+						// Create the new element
+						element = {
+							attributes : attributes,
+							attributesOrder : attributesOrder
+						};
+
+						// Padd empty elements prefix
+						if (prefix === '#')
+							element.paddEmpty = true;
+
+						// Remove empty elements prefix
+						if (prefix === '-')
+							element.removeEmpty = true;
+
+						// Copy attributes from global rule into current rule
+						if (globalAttributes) {
+							for (key in globalAttributes)
+								attributes[key] = globalAttributes[key];
+
+							attributesOrder.push.apply(attributesOrder, globalAttributesOrder);
+						}
+
+						// Attributes defined
+						if (attrData) {
+							attrData = split(attrData, '|');
+							for (ai = 0, al = attrData.length; ai < al; ai++) {
+								matches = attrRuleRegExp.exec(attrData[ai]);
+								if (matches) {
+									attr = {};
+									attrType = matches[1];
+									attrName = matches[2].replace(/::/g, ':');
+									prefix = matches[3];
+									value = matches[4];
+
+									// Required
+									if (attrType === '!') {
+										element.attributesRequired = element.attributesRequired || [];
+										element.attributesRequired.push(attrName);
+										attr.required = true;
+									}
+
+									// Denied from global
+									if (attrType === '-') {
+										delete attributes[attrName];
+										attributesOrder.splice(tinymce.inArray(attributesOrder, attrName), 1);
+										continue;
+									}
+
+									// Default value
+									if (prefix) {
+										// Default value
+										if (prefix === '=') {
+											element.attributesDefault = element.attributesDefault || [];
+											element.attributesDefault.push({name: attrName, value: value});
+											attr.defaultValue = value;
+										}
+
+										// Forced value
+										if (prefix === ':') {
+											element.attributesForced = element.attributesForced || [];
+											element.attributesForced.push({name: attrName, value: value});
+											attr.forcedValue = value;
+										}
+
+										// Required values
+										if (prefix === '<')
+											attr.validValues = makeMap(value, '?');
+									}
+
+									// Check for attribute patterns
+									if (hasPatternsRegExp.test(attrName)) {
+										element.attributePatterns = element.attributePatterns || [];
+										attr.pattern = patternToRegExp(attrName);
+										element.attributePatterns.push(attr);
+									} else {
+										// Add attribute to order list if it doesn't already exist
+										if (!attributes[attrName])
+											attributesOrder.push(attrName);
+
+										attributes[attrName] = attr;
+									}
+								}
+							}
+						}
+
+						// Global rule, store away these for later usage
+						if (!globalAttributes && elementName == '@') {
+							globalAttributes = attributes;
+							globalAttributesOrder = attributesOrder;
+						}
+
+						// Handle substitute elements such as b/strong
+						if (outputName) {
+							element.outputName = elementName;
+							elements[outputName] = element;
+						}
+
+						// Add pattern or exact element
+						if (hasPatternsRegExp.test(elementName)) {
+							element.pattern = patternToRegExp(elementName);
+							patternElements.push(element);
+						} else
+							elements[elementName] = element;
+					}
+				}
+			}
+		};
+
+		function setValidElements(valid_elements) {
+			elements = {};
+			patternElements = [];
+
+			addValidElements(valid_elements);
+
+			each(schemaItems, function(element, name) {
+				children[name] = element.children;
+			});
+		};
+
+		// Adds custom non HTML elements to the schema
+		function addCustomElements(custom_elements) {
+			var customElementRegExp = /^(~)?(.+)$/;
+
+			if (custom_elements) {
+				each(split(custom_elements), function(rule) {
+					var matches = customElementRegExp.exec(rule),
+						inline = matches[1] === '~',
+						cloneName = inline ? 'span' : 'div',
+						name = matches[2];
+
+					children[name] = children[cloneName];
+					customElementsMap[name] = cloneName;
+
+					// If it's not marked as inline then add it to valid block elements
+					if (!inline) {
+						blockElementsMap[name.toUpperCase()] = {};
+						blockElementsMap[name] = {};
+					}
+
+					// Add elements clone if needed
+					if (!elements[name]) {
+						elements[name] = elements[cloneName];
+					}
+
+					// Add custom elements at span/div positions
+					each(children, function(element, child) {
+						if (element[cloneName])
+							element[name] = element[cloneName];
+					});
+				});
+			}
+		};
+
+		// Adds valid children to the schema object
+		function addValidChildren(valid_children) {
+			var childRuleRegExp = /^([+\-]?)(\w+)\[([^\]]+)\]$/;
+
+			if (valid_children) {
+				each(split(valid_children), function(rule) {
+					var matches = childRuleRegExp.exec(rule), parent, prefix;
+
+					if (matches) {
+						prefix = matches[1];
+
+						// Add/remove items from default
+						if (prefix)
+							parent = children[matches[2]];
+						else
+							parent = children[matches[2]] = {'#comment' : {}};
+
+						parent = children[matches[2]];
+
+						each(split(matches[3], '|'), function(child) {
+							if (prefix === '-')
+								delete parent[child];
+							else
+								parent[child] = {};
+						});
+					}
+				});
+			}
+		};
+
+		function getElementRule(name) {
+			var element = elements[name], i;
+
+			// Exact match found
+			if (element)
+				return element;
+
+			// No exact match then try the patterns
+			i = patternElements.length;
+			while (i--) {
+				element = patternElements[i];
+
+				if (element.pattern.test(name))
+					return element;
+			}
+		};
+
+		if (!settings.valid_elements) {
+			// No valid elements defined then clone the elements from the schema spec
+			each(schemaItems, function(element, name) {
+				elements[name] = {
+					attributes : element.attributes,
+					attributesOrder : element.attributesOrder
+				};
+
+				children[name] = element.children;
+			});
+
+			// Switch these on HTML4
+			if (settings.schema != "html5") {
+				each(split('strong/b,em/i'), function(item) {
+					item = split(item, '/');
+					elements[item[1]].outputName = item[0];
+				});
+			}
+
+			// Add default alt attribute for images
+			elements.img.attributesDefault = [{name: 'alt', value: ''}];
+
+			// Remove these if they are empty by default
+			each(split('ol,ul,sub,sup,blockquote,span,font,a,table,tbody,tr,strong,em,b,i'), function(name) {
+				if (elements[name]) {
+					elements[name].removeEmpty = true;
+				}
+			});
+
+			// Padd these by default
+			each(split('p,h1,h2,h3,h4,h5,h6,th,td,pre,div,address,caption'), function(name) {
+				elements[name].paddEmpty = true;
+			});
+		} else
+			setValidElements(settings.valid_elements);
+
+		addCustomElements(settings.custom_elements);
+		addValidChildren(settings.valid_children);
+		addValidElements(settings.extended_valid_elements);
+
+		// Todo: Remove this when we fix list handling to be valid
+		addValidChildren('+ol[ul|ol],+ul[ul|ol]');
+
+		// Delete invalid elements
+		if (settings.invalid_elements) {
+			tinymce.each(tinymce.explode(settings.invalid_elements), function(item) {
+				if (elements[item])
+					delete elements[item];
+			});
+		}
+
+		// If the user didn't allow span only allow internal spans
+		if (!getElementRule('span'))
+			addValidElements('span[!data-mce-type|*]');
+
+		self.children = children;
+
+		self.styles = validStyles;
+
+		self.getBoolAttrs = function() {
+			return boolAttrMap;
+		};
+
+		self.getBlockElements = function() {
+			return blockElementsMap;
+		};
+
+		self.getTextBlockElements = function() {
+			return textBlockElementsMap;
+		};
+
+		self.getShortEndedElements = function() {
+			return shortEndedElementsMap;
+		};
+
+		self.getSelfClosingElements = function() {
+			return selfClosingElementsMap;
+		};
+
+		self.getNonEmptyElements = function() {
+			return nonEmptyElementsMap;
+		};
+
+		self.getWhiteSpaceElements = function() {
+			return whiteSpaceElementsMap;
+		};
+
+		self.isValidChild = function(name, child) {
+			var parent = children[name];
+
+			return !!(parent && parent[child]);
+		};
+
+		self.isValid = function(name, attr) {
+			var attrPatterns, i, rule = getElementRule(name);
+
+			// Check if it's a valid element
+			if (rule) {
+				if (attr) {
+					// Check if attribute name exists
+					if (rule.attributes[attr]) {
+						return true;
+					}
+
+					// Check if attribute matches a regexp pattern
+					attrPatterns = rule.attributePatterns;
+					if (attrPatterns) {
+						i = attrPatterns.length;
+						while (i--) {
+							if (attrPatterns[i].pattern.test(name)) {
+								return true;
+							}
+						}
+					}
+				} else {
+					return true;
+				}
+			}
+
+			// No match
+			return false;
+		};
+		
+		self.getElementRule = getElementRule;
+
+		self.getCustomElements = function() {
+			return customElementsMap;
+		};
+
+		self.addValidElements = addValidElements;
+
+		self.setValidElements = setValidElements;
+
+		self.addCustomElements = addCustomElements;
+
+		self.addValidChildren = addValidChildren;
+
+		self.elements = elements;
+	};
+})(tinymce);
+
+(function(tinymce) {
+	tinymce.html.SaxParser = function(settings, schema) {
+		var self = this, noop = function() {};
+
+		settings = settings || {};
+		self.schema = schema = schema || new tinymce.html.Schema();
+
+		if (settings.fix_self_closing !== false)
+			settings.fix_self_closing = true;
+
+		// Add handler functions from settings and setup default handlers
+		tinymce.each('comment cdata text start end pi doctype'.split(' '), function(name) {
+			if (name)
+				self[name] = settings[name] || noop;
+		});
+
+		self.parse = function(html) {
+			var self = this, matches, index = 0, value, endRegExp, stack = [], attrList, i, text, name, isInternalElement, removeInternalElements,
+				shortEndedElements, fillAttrsMap, isShortEnded, validate, elementRule, isValidElement, attr, attribsValue, invalidPrefixRegExp,
+				validAttributesMap, validAttributePatterns, attributesRequired, attributesDefault, attributesForced, selfClosing,
+				tokenRegExp, attrRegExp, specialElements, attrValue, idCount = 0, decode = tinymce.html.Entities.decode, fixSelfClosing, isIE;
+
+			function processEndTag(name) {
+				var pos, i;
+
+				// Find position of parent of the same type
+				pos = stack.length;
+				while (pos--) {
+					if (stack[pos].name === name)
+						break;						
+				}
+
+				// Found parent
+				if (pos >= 0) {
+					// Close all the open elements
+					for (i = stack.length - 1; i >= pos; i--) {
+						name = stack[i];
+
+						if (name.valid)
+							self.end(name.name);
+					}
+
+					// Remove the open elements from the stack
+					stack.length = pos;
+				}
+			};
+
+			function parseAttribute(match, name, value, val2, val3) {
+				var attrRule, i;
+
+				name = name.toLowerCase();
+				value = name in fillAttrsMap ? name : decode(value || val2 || val3 || ''); // Handle boolean attribute than value attribute
+
+				// Validate name and value
+				if (validate && !isInternalElement && name.indexOf('data-') !== 0) {
+					attrRule = validAttributesMap[name];
+
+					// Find rule by pattern matching
+					if (!attrRule && validAttributePatterns) {
+						i = validAttributePatterns.length;
+						while (i--) {
+							attrRule = validAttributePatterns[i];
+							if (attrRule.pattern.test(name))
+								break;
+						}
+
+						// No rule matched
+						if (i === -1)
+							attrRule = null;
+					}
+
+					// No attribute rule found
+					if (!attrRule)
+						return;
+
+					// Validate value
+					if (attrRule.validValues && !(value in attrRule.validValues))
+						return;
+				}
+
+				// Add attribute to list and map
+				attrList.map[name] = value;
+				attrList.push({
+					name: name,
+					value: value
+				});
+			};
+
+			// Precompile RegExps and map objects
+			tokenRegExp = new RegExp('<(?:' +
+				'(?:!--([\\w\\W]*?)-->)|' + // Comment
+				'(?:!\\[CDATA\\[([\\w\\W]*?)\\]\\]>)|' + // CDATA
+				'(?:!DOCTYPE([\\w\\W]*?)>)|' + // DOCTYPE
+				'(?:\\?([^\\s\\/<>]+) ?([\\w\\W]*?)[?/]>)|' + // PI
+				'(?:\\/([^>]+)>)|' + // End element
+				'(?:([A-Za-z0-9\\-\\:\\.]+)((?:\\s+[^"\'>]+(?:(?:"[^"]*")|(?:\'[^\']*\')|[^>]*))*|\\/|\\s+)>)' + // Start element
+			')', 'g');
+
+			attrRegExp = /([\w:\-]+)(?:\s*=\s*(?:(?:\"((?:[^\"])*)\")|(?:\'((?:[^\'])*)\')|([^>\s]+)))?/g;
+			specialElements = {
+				'script' : /<\/script[^>]*>/gi,
+				'style' : /<\/style[^>]*>/gi,
+				'noscript' : /<\/noscript[^>]*>/gi
+			};
+
+			// Setup lookup tables for empty elements and boolean attributes
+			shortEndedElements = schema.getShortEndedElements();
+			selfClosing = settings.self_closing_elements || schema.getSelfClosingElements();
+			fillAttrsMap = schema.getBoolAttrs();
+			validate = settings.validate;
+			removeInternalElements = settings.remove_internals;
+			fixSelfClosing = settings.fix_self_closing;
+			isIE = tinymce.isIE;
+			invalidPrefixRegExp = /^:/;
+
+			while (matches = tokenRegExp.exec(html)) {
+				// Text
+				if (index < matches.index)
+					self.text(decode(html.substr(index, matches.index - index)));
+
+				if (value = matches[6]) { // End element
+					value = value.toLowerCase();
+
+					// IE will add a ":" in front of elements it doesn't understand like custom elements or HTML5 elements
+					if (isIE && invalidPrefixRegExp.test(value))
+						value = value.substr(1);
+
+					processEndTag(value);
+				} else if (value = matches[7]) { // Start element
+					value = value.toLowerCase();
+
+					// IE will add a ":" in front of elements it doesn't understand like custom elements or HTML5 elements
+					if (isIE && invalidPrefixRegExp.test(value))
+						value = value.substr(1);
+
+					isShortEnded = value in shortEndedElements;
+
+					// Is self closing tag for example an <li> after an open <li>
+					if (fixSelfClosing && selfClosing[value] && stack.length > 0 && stack[stack.length - 1].name === value)
+						processEndTag(value);
+
+					// Validate element
+					if (!validate || (elementRule = schema.getElementRule(value))) {
+						isValidElement = true;
+
+						// Grab attributes map and patters when validation is enabled
+						if (validate) {
+							validAttributesMap = elementRule.attributes;
+							validAttributePatterns = elementRule.attributePatterns;
+						}
+
+						// Parse attributes
+						if (attribsValue = matches[8]) {
+							isInternalElement = attribsValue.indexOf('data-mce-type') !== -1; // Check if the element is an internal element
+
+							// If the element has internal attributes then remove it if we are told to do so
+							if (isInternalElement && removeInternalElements)
+								isValidElement = false;
+
+							attrList = [];
+							attrList.map = {};
+
+							attribsValue.replace(attrRegExp, parseAttribute);
+						} else {
+							attrList = [];
+							attrList.map = {};
+						}
+
+						// Process attributes if validation is enabled
+						if (validate && !isInternalElement) {
+							attributesRequired = elementRule.attributesRequired;
+							attributesDefault = elementRule.attributesDefault;
+							attributesForced = elementRule.attributesForced;
+
+							// Handle forced attributes
+							if (attributesForced) {
+								i = attributesForced.length;
+								while (i--) {
+									attr = attributesForced[i];
+									name = attr.name;
+									attrValue = attr.value;
+
+									if (attrValue === '{$uid}')
+										attrValue = 'mce_' + idCount++;
+
+									attrList.map[name] = attrValue;
+									attrList.push({name: name, value: attrValue});
+								}
+							}
+
+							// Handle default attributes
+							if (attributesDefault) {
+								i = attributesDefault.length;
+								while (i--) {
+									attr = attributesDefault[i];
+									name = attr.name;
+
+									if (!(name in attrList.map)) {
+										attrValue = attr.value;
+
+										if (attrValue === '{$uid}')
+											attrValue = 'mce_' + idCount++;
+
+										attrList.map[name] = attrValue;
+										attrList.push({name: name, value: attrValue});
+									}
+								}
+							}
+
+							// Handle required attributes
+							if (attributesRequired) {
+								i = attributesRequired.length;
+								while (i--) {
+									if (attributesRequired[i] in attrList.map)
+										break;
+								}
+
+								// None of the required attributes where found
+								if (i === -1)
+									isValidElement = false;
+							}
+
+							// Invalidate element if it's marked as bogus
+							if (attrList.map['data-mce-bogus'])
+								isValidElement = false;
+						}
+
+						if (isValidElement)
+							self.start(value, attrList, isShortEnded);
+					} else
+						isValidElement = false;
+
+					// Treat script, noscript and style a bit different since they may include code that looks like elements
+					if (endRegExp = specialElements[value]) {
+						endRegExp.lastIndex = index = matches.index + matches[0].length;
+
+						if (matches = endRegExp.exec(html)) {
+							if (isValidElement)
+								text = html.substr(index, matches.index - index);
+
+							index = matches.index + matches[0].length;
+						} else {
+							text = html.substr(index);
+							index = html.length;
+						}
+
+						if (isValidElement && text.length > 0)
+							self.text(text, true);
+
+						if (isValidElement)
+							self.end(value);
+
+						tokenRegExp.lastIndex = index;
+						continue;
+					}
+
+					// Push value on to stack
+					if (!isShortEnded) {
+						if (!attribsValue || attribsValue.indexOf('/') != attribsValue.length - 1)
+							stack.push({name: value, valid: isValidElement});
+						else if (isValidElement)
+							self.end(value);
+					}
+				} else if (value = matches[1]) { // Comment
+					self.comment(value);
+				} else if (value = matches[2]) { // CDATA
+					self.cdata(value);
+				} else if (value = matches[3]) { // DOCTYPE
+					self.doctype(value);
+				} else if (value = matches[4]) { // PI
+					self.pi(value, matches[5]);
+				}
+
+				index = matches.index + matches[0].length;
+			}
+
+			// Text
+			if (index < html.length)
+				self.text(decode(html.substr(index)));
+
+			// Close any open elements
+			for (i = stack.length - 1; i >= 0; i--) {
+				value = stack[i];
+
+				if (value.valid)
+					self.end(value.name);
+			}
+		};
+	}
+})(tinymce);
+
+(function(tinymce) {
+	var whiteSpaceRegExp = /^[ \t\r\n]*$/, typeLookup = {
+		'#text' : 3,
+		'#comment' : 8,
+		'#cdata' : 4,
+		'#pi' : 7,
+		'#doctype' : 10,
+		'#document-fragment' : 11
+	};
+
+	// Walks the tree left/right
+	function walk(node, root_node, prev) {
+		var sibling, parent, startName = prev ? 'lastChild' : 'firstChild', siblingName = prev ? 'prev' : 'next';
+
+		// Walk into nodes if it has a start
+		if (node[startName])
+			return node[startName];
+
+		// Return the sibling if it has one
+		if (node !== root_node) {
+			sibling = node[siblingName];
+
+			if (sibling)
+				return sibling;
+
+			// Walk up the parents to look for siblings
+			for (parent = node.parent; parent && parent !== root_node; parent = parent.parent) {
+				sibling = parent[siblingName];
+
+				if (sibling)
+					return sibling;
+			}
+		}
+	};
+
+	function Node(name, type) {
+		this.name = name;
+		this.type = type;
+
+		if (type === 1) {
+			this.attributes = [];
+			this.attributes.map = {};
+		}
+	}
+
+	tinymce.extend(Node.prototype, {
+		replace : function(node) {
+			var self = this;
+
+			if (node.parent)
+				node.remove();
+
+			self.insert(node, self);
+			self.remove();
+
+			return self;
+		},
+
+		attr : function(name, value) {
+			var self = this, attrs, i, undef;
+
+			if (typeof name !== "string") {
+				for (i in name)
+					self.attr(i, name[i]);
+
+				return self;
+			}
+
+			if (attrs = self.attributes) {
+				if (value !== undef) {
+					// Remove attribute
+					if (value === null) {
+						if (name in attrs.map) {
+							delete attrs.map[name];
+
+							i = attrs.length;
+							while (i--) {
+								if (attrs[i].name === name) {
+									attrs = attrs.splice(i, 1);
+									return self;
+								}
+							}
+						}
+
+						return self;
+					}
+
+					// Set attribute
+					if (name in attrs.map) {
+						// Set attribute
+						i = attrs.length;
+						while (i--) {
+							if (attrs[i].name === name) {
+								attrs[i].value = value;
+								break;
+							}
+						}
+					} else
+						attrs.push({name: name, value: value});
+
+					attrs.map[name] = value;
+
+					return self;
+				} else {
+					return attrs.map[name];
+				}
+			}
+		},
+
+		clone : function() {
+			var self = this, clone = new Node(self.name, self.type), i, l, selfAttrs, selfAttr, cloneAttrs;
+
+			// Clone element attributes
+			if (selfAttrs = self.attributes) {
+				cloneAttrs = [];
+				cloneAttrs.map = {};
+
+				for (i = 0, l = selfAttrs.length; i < l; i++) {
+					selfAttr = selfAttrs[i];
+
+					// Clone everything except id
+					if (selfAttr.name !== 'id') {
+						cloneAttrs[cloneAttrs.length] = {name: selfAttr.name, value: selfAttr.value};
+						cloneAttrs.map[selfAttr.name] = selfAttr.value;
+					}
+				}
+
+				clone.attributes = cloneAttrs;
+			}
+
+			clone.value = self.value;
+			clone.shortEnded = self.shortEnded;
+
+			return clone;
+		},
+
+		wrap : function(wrapper) {
+			var self = this;
+
+			self.parent.insert(wrapper, self);
+			wrapper.append(self);
+
+			return self;
+		},
+
+		unwrap : function() {
+			var self = this, node, next;
+
+			for (node = self.firstChild; node; ) {
+				next = node.next;
+				self.insert(node, self, true);
+				node = next;
+			}
+
+			self.remove();
+		},
+
+		remove : function() {
+			var self = this, parent = self.parent, next = self.next, prev = self.prev;
+
+			if (parent) {
+				if (parent.firstChild === self) {
+					parent.firstChild = next;
+
+					if (next)
+						next.prev = null;
+				} else {
+					prev.next = next;
+				}
+
+				if (parent.lastChild === self) {
+					parent.lastChild = prev;
+
+					if (prev)
+						prev.next = null;
+				} else {
+					next.prev = prev;
+				}
+
+				self.parent = self.next = self.prev = null;
+			}
+
+			return self;
+		},
+
+		append : function(node) {
+			var self = this, last;
+
+			if (node.parent)
+				node.remove();
+
+			last = self.lastChild;
+			if (last) {
+				last.next = node;
+				node.prev = last;
+				self.lastChild = node;
+			} else
+				self.lastChild = self.firstChild = node;
+
+			node.parent = self;
+
+			return node;
+		},
+
+		insert : function(node, ref_node, before) {
+			var parent;
+
+			if (node.parent)
+				node.remove();
+
+			parent = ref_node.parent || this;
+
+			if (before) {
+				if (ref_node === parent.firstChild)
+					parent.firstChild = node;
+				else
+					ref_node.prev.next = node;
+
+				node.prev = ref_node.prev;
+				node.next = ref_node;
+				ref_node.prev = node;
+			} else {
+				if (ref_node === parent.lastChild)
+					parent.lastChild = node;
+				else
+					ref_node.next.prev = node;
+
+				node.next = ref_node.next;
+				node.prev = ref_node;
+				ref_node.next = node;
+			}
+
+			node.parent = parent;
+
+			return node;
+		},
+
+		getAll : function(name) {
+			var self = this, node, collection = [];
+
+			for (node = self.firstChild; node; node = walk(node, self)) {
+				if (node.name === name)
+					collection.push(node);
+			}
+
+			return collection;
+		},
+
+		empty : function() {
+			var self = this, nodes, i, node;
+
+			// Remove all children
+			if (self.firstChild) {
+				nodes = [];
+
+				// Collect the children
+				for (node = self.firstChild; node; node = walk(node, self))
+					nodes.push(node);
+
+				// Remove the children
+				i = nodes.length;
+				while (i--) {
+					node = nodes[i];
+					node.parent = node.firstChild = node.lastChild = node.next = node.prev = null;
+				}
+			}
+
+			self.firstChild = self.lastChild = null;
+
+			return self;
+		},
+
+		isEmpty : function(elements) {
+			var self = this, node = self.firstChild, i, name;
+
+			if (node) {
+				do {
+					if (node.type === 1) {
+						// Ignore bogus elements
+						if (node.attributes.map['data-mce-bogus'])
+							continue;
+
+						// Keep empty elements like <img />
+						if (elements[node.name])
+							return false;
+
+						// Keep elements with data attributes or name attribute like <a name="1"></a>
+						i = node.attributes.length;
+						while (i--) {
+							name = node.attributes[i].name;
+							if (name === "name" || name.indexOf('data-mce-') === 0)
+								return false;
+						}
+					}
+
+					// Keep comments
+					if (node.type === 8)
+						return false;
+					
+					// Keep non whitespace text nodes
+					if ((node.type === 3 && !whiteSpaceRegExp.test(node.value)))
+						return false;
+				} while (node = walk(node, self));
+			}
+
+			return true;
+		},
+
+		walk : function(prev) {
+			return walk(this, null, prev);
+		}
+	});
+
+	tinymce.extend(Node, {
+		create : function(name, attrs) {
+			var node, attrName;
+
+			// Create node
+			node = new Node(name, typeLookup[name] || 1);
+
+			// Add attributes if needed
+			if (attrs) {
+				for (attrName in attrs)
+					node.attr(attrName, attrs[attrName]);
+			}
+
+			return node;
+		}
+	});
+
+	tinymce.html.Node = Node;
+})(tinymce);
+
+(function(tinymce) {
+	var Node = tinymce.html.Node;
+
+	tinymce.html.DomParser = function(settings, schema) {
+		var self = this, nodeFilters = {}, attributeFilters = [], matchedNodes = {}, matchedAttributes = {};
+
+		settings = settings || {};
+		settings.validate = "validate" in settings ? settings.validate : true;
+		settings.root_name = settings.root_name || 'body';
+		self.schema = schema = schema || new tinymce.html.Schema();
+
+		function fixInvalidChildren(nodes) {
+			var ni, node, parent, parents, newParent, currentNode, tempNode, childNode, i,
+				childClone, nonEmptyElements, nonSplitableElements, textBlockElements, sibling, nextNode;
+
+			nonSplitableElements = tinymce.makeMap('tr,td,th,tbody,thead,tfoot,table');
+			nonEmptyElements = schema.getNonEmptyElements();
+			textBlockElements = schema.getTextBlockElements();
+
+			for (ni = 0; ni < nodes.length; ni++) {
+				node = nodes[ni];
+
+				// Already removed or fixed
+				if (!node.parent || node.fixed)
+					continue;
+
+				// If the invalid element is a text block and the text block is within a parent LI element
+				// Then unwrap the first text block and convert other sibling text blocks to LI elements similar to Word/Open Office
+				if (textBlockElements[node.name] && node.parent.name == 'li') {
+					// Move sibling text blocks after LI element
+					sibling = node.next;
+					while (sibling) {
+						if (textBlockElements[sibling.name]) {
+							sibling.name = 'li';
+							sibling.fixed = true;
+							node.parent.insert(sibling, node.parent);
+						} else {
+							break;
+						}
+
+						sibling = sibling.next;
+					}
+
+					// Unwrap current text block
+					node.unwrap(node);
+					continue;
+				}
+
+				// Get list of all parent nodes until we find a valid parent to stick the child into
+				parents = [node];
+				for (parent = node.parent; parent && !schema.isValidChild(parent.name, node.name) && !nonSplitableElements[parent.name]; parent = parent.parent)
+					parents.push(parent);
+
+				// Found a suitable parent
+				if (parent && parents.length > 1) {
+					// Reverse the array since it makes looping easier
+					parents.reverse();
+
+					// Clone the related parent and insert that after the moved node
+					newParent = currentNode = self.filterNode(parents[0].clone());
+
+					// Start cloning and moving children on the left side of the target node
+					for (i = 0; i < parents.length - 1; i++) {
+						if (schema.isValidChild(currentNode.name, parents[i].name)) {
+							tempNode = self.filterNode(parents[i].clone());
+							currentNode.append(tempNode);
+						} else
+							tempNode = currentNode;
+
+						for (childNode = parents[i].firstChild; childNode && childNode != parents[i + 1]; ) {
+							nextNode = childNode.next;
+							tempNode.append(childNode);
+							childNode = nextNode;
+						}
+
+						currentNode = tempNode;
+					}
+
+					if (!newParent.isEmpty(nonEmptyElements)) {
+						parent.insert(newParent, parents[0], true);
+						parent.insert(node, newParent);
+					} else {
+						parent.insert(node, parents[0], true);
+					}
+
+					// Check if the element is empty by looking through it's contents and special treatment for <p><br /></p>
+					parent = parents[0];
+					if (parent.isEmpty(nonEmptyElements) || parent.firstChild === parent.lastChild && parent.firstChild.name === 'br') {
+						parent.empty().remove();
+					}
+				} else if (node.parent) {
+					// If it's an LI try to find a UL/OL for it or wrap it
+					if (node.name === 'li') {
+						sibling = node.prev;
+						if (sibling && (sibling.name === 'ul' || sibling.name === 'ul')) {
+							sibling.append(node);
+							continue;
+						}
+
+						sibling = node.next;
+						if (sibling && (sibling.name === 'ul' || sibling.name === 'ul')) {
+							sibling.insert(node, sibling.firstChild, true);
+							continue;
+						}
+
+						node.wrap(self.filterNode(new Node('ul', 1)));
+						continue;
+					}
+
+					// Try wrapping the element in a DIV
+					if (schema.isValidChild(node.parent.name, 'div') && schema.isValidChild('div', node.name)) {
+						node.wrap(self.filterNode(new Node('div', 1)));
+					} else {
+						// We failed wrapping it, then remove or unwrap it
+						if (node.name === 'style' || node.name === 'script')
+							node.empty().remove();
+						else
+							node.unwrap();
+					}
+				}
+			}
+		};
+
+		self.filterNode = function(node) {
+			var i, name, list;
+
+			// Run element filters
+			if (name in nodeFilters) {
+				list = matchedNodes[name];
+
+				if (list)
+					list.push(node);
+				else
+					matchedNodes[name] = [node];
+			}
+
+			// Run attribute filters
+			i = attributeFilters.length;
+			while (i--) {
+				name = attributeFilters[i].name;
+
+				if (name in node.attributes.map) {
+					list = matchedAttributes[name];
+
+					if (list)
+						list.push(node);
+					else
+						matchedAttributes[name] = [node];
+				}
+			}
+
+			return node;
+		};
+
+		self.addNodeFilter = function(name, callback) {
+			tinymce.each(tinymce.explode(name), function(name) {
+				var list = nodeFilters[name];
+
+				if (!list)
+					nodeFilters[name] = list = [];
+
+				list.push(callback);
+			});
+		};
+
+		self.addAttributeFilter = function(name, callback) {
+			tinymce.each(tinymce.explode(name), function(name) {
+				var i;
+
+				for (i = 0; i < attributeFilters.length; i++) {
+					if (attributeFilters[i].name === name) {
+						attributeFilters[i].callbacks.push(callback);
+						return;
+					}
+				}
+
+				attributeFilters.push({name: name, callbacks: [callback]});
+			});
+		};
+
+		self.parse = function(html, args) {
+			var parser, rootNode, node, nodes, i, l, fi, fl, list, name, validate,
+				blockElements, startWhiteSpaceRegExp, invalidChildren = [], isInWhiteSpacePreservedElement,
+				endWhiteSpaceRegExp, allWhiteSpaceRegExp, isAllWhiteSpaceRegExp, whiteSpaceElements, children, nonEmptyElements, rootBlockName;
+
+			args = args || {};
+			matchedNodes = {};
+			matchedAttributes = {};
+			blockElements = tinymce.extend(tinymce.makeMap('script,style,head,html,body,title,meta,param'), schema.getBlockElements());
+			nonEmptyElements = schema.getNonEmptyElements();
+			children = schema.children;
+			validate = settings.validate;
+			rootBlockName = "forced_root_block" in args ? args.forced_root_block : settings.forced_root_block;
+
+			whiteSpaceElements = schema.getWhiteSpaceElements();
+			startWhiteSpaceRegExp = /^[ \t\r\n]+/;
+			endWhiteSpaceRegExp = /[ \t\r\n]+$/;
+			allWhiteSpaceRegExp = /[ \t\r\n]+/g;
+			isAllWhiteSpaceRegExp = /^[ \t\r\n]+$/;
+
+			function addRootBlocks() {
+				var node = rootNode.firstChild, next, rootBlockNode;
+
+				while (node) {
+					next = node.next;
+
+					if (node.type == 3 || (node.type == 1 && node.name !== 'p' && !blockElements[node.name] && !node.attr('data-mce-type'))) {
+						if (!rootBlockNode) {
+							// Create a new root block element
+							rootBlockNode = createNode(rootBlockName, 1);
+							rootNode.insert(rootBlockNode, node);
+							rootBlockNode.append(node);
+						} else
+							rootBlockNode.append(node);
+					} else {
+						rootBlockNode = null;
+					}
+
+					node = next;
+				};
+			};
+
+			function createNode(name, type) {
+				var node = new Node(name, type), list;
+
+				if (name in nodeFilters) {
+					list = matchedNodes[name];
+
+					if (list)
+						list.push(node);
+					else
+						matchedNodes[name] = [node];
+				}
+
+				return node;
+			};
+
+			function removeWhitespaceBefore(node) {
+				var textNode, textVal, sibling;
+
+				for (textNode = node.prev; textNode && textNode.type === 3; ) {
+					textVal = textNode.value.replace(endWhiteSpaceRegExp, '');
+
+					if (textVal.length > 0) {
+						textNode.value = textVal;
+						textNode = textNode.prev;
+					} else {
+						sibling = textNode.prev;
+						textNode.remove();
+						textNode = sibling;
+					}
+				}
+			};
+
+			function cloneAndExcludeBlocks(input) {
+				var name, output = {};
+
+				for (name in input) {
+					if (name !== 'li' && name != 'p') {
+						output[name] = input[name];
+					}
+				}
+
+				return output;
+			};
+
+			parser = new tinymce.html.SaxParser({
+				validate : validate,
+
+				// Exclude P and LI from DOM parsing since it's treated better by the DOM parser
+				self_closing_elements: cloneAndExcludeBlocks(schema.getSelfClosingElements()),
+
+				cdata: function(text) {
+					node.append(createNode('#cdata', 4)).value = text;
+				},
+
+				text: function(text, raw) {
+					var textNode;
+
+					// Trim all redundant whitespace on non white space elements
+					if (!isInWhiteSpacePreservedElement) {
+						text = text.replace(allWhiteSpaceRegExp, ' ');
+
+						if (node.lastChild && blockElements[node.lastChild.name])
+							text = text.replace(startWhiteSpaceRegExp, '');
+					}
+
+					// Do we need to create the node
+					if (text.length !== 0) {
+						textNode = createNode('#text', 3);
+						textNode.raw = !!raw;
+						node.append(textNode).value = text;
+					}
+				},
+
+				comment: function(text) {
+					node.append(createNode('#comment', 8)).value = text;
+				},
+
+				pi: function(name, text) {
+					node.append(createNode(name, 7)).value = text;
+					removeWhitespaceBefore(node);
+				},
+
+				doctype: function(text) {
+					var newNode;
+		
+					newNode = node.append(createNode('#doctype', 10));
+					newNode.value = text;
+					removeWhitespaceBefore(node);
+				},
+
+				start: function(name, attrs, empty) {
+					var newNode, attrFiltersLen, elementRule, textNode, attrName, text, sibling, parent;
+
+					elementRule = validate ? schema.getElementRule(name) : {};
+					if (elementRule) {
+						newNode = createNode(elementRule.outputName || name, 1);
+						newNode.attributes = attrs;
+						newNode.shortEnded = empty;
+
+						node.append(newNode);
+
+						// Check if node is valid child of the parent node is the child is
+						// unknown we don't collect it since it's probably a custom element
+						parent = children[node.name];
+						if (parent && children[newNode.name] && !parent[newNode.name])
+							invalidChildren.push(newNode);
+
+						attrFiltersLen = attributeFilters.length;
+						while (attrFiltersLen--) {
+							attrName = attributeFilters[attrFiltersLen].name;
+
+							if (attrName in attrs.map) {
+								list = matchedAttributes[attrName];
+
+								if (list)
+									list.push(newNode);
+								else
+									matchedAttributes[attrName] = [newNode];
+							}
+						}
+
+						// Trim whitespace before block
+						if (blockElements[name])
+							removeWhitespaceBefore(newNode);
+
+						// Change current node if the element wasn't empty i.e not <br /> or <img />
+						if (!empty)
+							node = newNode;
+
+						// Check if we are inside a whitespace preserved element
+						if (!isInWhiteSpacePreservedElement && whiteSpaceElements[name]) {
+							isInWhiteSpacePreservedElement = true;
+						}
+					}
+				},
+
+				end: function(name) {
+					var textNode, elementRule, text, sibling, tempNode;
+
+					elementRule = validate ? schema.getElementRule(name) : {};
+					if (elementRule) {
+						if (blockElements[name]) {
+							if (!isInWhiteSpacePreservedElement) {
+								// Trim whitespace of the first node in a block
+								textNode = node.firstChild;
+								if (textNode && textNode.type === 3) {
+									text = textNode.value.replace(startWhiteSpaceRegExp, '');
+
+									// Any characters left after trim or should we remove it
+									if (text.length > 0) {
+										textNode.value = text;
+										textNode = textNode.next;
+									} else {
+										sibling = textNode.next;
+										textNode.remove();
+										textNode = sibling;
+									}
+
+									// Remove any pure whitespace siblings
+									while (textNode && textNode.type === 3) {
+										text = textNode.value;
+										sibling = textNode.next;
+
+										if (text.length === 0 || isAllWhiteSpaceRegExp.test(text)) {
+											textNode.remove();
+											textNode = sibling;
+										}
+
+										textNode = sibling;
+									}
+								}
+
+								// Trim whitespace of the last node in a block
+								textNode = node.lastChild;
+								if (textNode && textNode.type === 3) {
+									text = textNode.value.replace(endWhiteSpaceRegExp, '');
+
+									// Any characters left after trim or should we remove it
+									if (text.length > 0) {
+										textNode.value = text;
+										textNode = textNode.prev;
+									} else {
+										sibling = textNode.prev;
+										textNode.remove();
+										textNode = sibling;
+									}
+
+									// Remove any pure whitespace siblings
+									while (textNode && textNode.type === 3) {
+										text = textNode.value;
+										sibling = textNode.prev;
+
+										if (text.length === 0 || isAllWhiteSpaceRegExp.test(text)) {
+											textNode.remove();
+											textNode = sibling;
+										}
+
+										textNode = sibling;
+									}
+								}
+							}
+
+							// Trim start white space
+							// Removed due to: #5424
+							/*textNode = node.prev;
+							if (textNode && textNode.type === 3) {
+								text = textNode.value.replace(startWhiteSpaceRegExp, '');
+
+								if (text.length > 0)
+									textNode.value = text;
+								else
+									textNode.remove();
+							}*/
+						}
+
+						// Check if we exited a whitespace preserved element
+						if (isInWhiteSpacePreservedElement && whiteSpaceElements[name]) {
+							isInWhiteSpacePreservedElement = false;
+						}
+
+						// Handle empty nodes
+						if (elementRule.removeEmpty || elementRule.paddEmpty) {
+							if (node.isEmpty(nonEmptyElements)) {
+								if (elementRule.paddEmpty)
+									node.empty().append(new Node('#text', '3')).value = '\u00a0';
+								else {
+									// Leave nodes that have a name like <a name="name">
+									if (!node.attributes.map.name && !node.attributes.map.id) {
+										tempNode = node.parent;
+										node.empty().remove();
+										node = tempNode;
+										return;
+									}
+								}
+							}
+						}
+
+						node = node.parent;
+					}
+				}
+			}, schema);
+
+			rootNode = node = new Node(args.context || settings.root_name, 11);
+
+			parser.parse(html);
+
+			// Fix invalid children or report invalid children in a contextual parsing
+			if (validate && invalidChildren.length) {
+				if (!args.context)
+					fixInvalidChildren(invalidChildren);
+				else
+					args.invalid = true;
+			}
+
+			// Wrap nodes in the root into block elements if the root is body
+			if (rootBlockName && rootNode.name == 'body')
+				addRootBlocks();
+
+			// Run filters only when the contents is valid
+			if (!args.invalid) {
+				// Run node filters
+				for (name in matchedNodes) {
+					list = nodeFilters[name];
+					nodes = matchedNodes[name];
+
+					// Remove already removed children
+					fi = nodes.length;
+					while (fi--) {
+						if (!nodes[fi].parent)
+							nodes.splice(fi, 1);
+					}
+
+					for (i = 0, l = list.length; i < l; i++)
+						list[i](nodes, name, args);
+				}
+
+				// Run attribute filters
+				for (i = 0, l = attributeFilters.length; i < l; i++) {
+					list = attributeFilters[i];
+
+					if (list.name in matchedAttributes) {
+						nodes = matchedAttributes[list.name];
+
+						// Remove already removed children
+						fi = nodes.length;
+						while (fi--) {
+							if (!nodes[fi].parent)
+								nodes.splice(fi, 1);
+						}
+
+						for (fi = 0, fl = list.callbacks.length; fi < fl; fi++)
+							list.callbacks[fi](nodes, list.name, args);
+					}
+				}
+			}
+
+			return rootNode;
+		};
+
+		// Remove <br> at end of block elements Gecko and WebKit injects BR elements to
+		// make it possible to place the caret inside empty blocks. This logic tries to remove
+		// these elements and keep br elements that where intended to be there intact
+		if (settings.remove_trailing_brs) {
+			self.addNodeFilter('br', function(nodes, name) {
+				var i, l = nodes.length, node, blockElements = tinymce.extend({}, schema.getBlockElements()),
+					nonEmptyElements = schema.getNonEmptyElements(), parent, lastParent, prev, prevName;
+
+				// Remove brs from body element as well
+				blockElements.body = 1;
+
+				// Must loop forwards since it will otherwise remove all brs in <p>a<br><br><br></p>
+				for (i = 0; i < l; i++) {
+					node = nodes[i];
+					parent = node.parent;
+
+					if (blockElements[node.parent.name] && node === parent.lastChild) {
+						// Loop all nodes to the left of the current node and check for other BR elements
+						// excluding bookmarks since they are invisible
+						prev = node.prev;
+						while (prev) {
+							prevName = prev.name;
+
+							// Ignore bookmarks
+							if (prevName !== "span" || prev.attr('data-mce-type') !== 'bookmark') {
+								// Found a non BR element
+								if (prevName !== "br")
+									break;
+	
+								// Found another br it's a <br><br> structure then don't remove anything
+								if (prevName === 'br') {
+									node = null;
+									break;
+								}
+							}
+
+							prev = prev.prev;
+						}
+
+						if (node) {
+							node.remove();
+
+							// Is the parent to be considered empty after we removed the BR
+							if (parent.isEmpty(nonEmptyElements)) {
+								elementRule = schema.getElementRule(parent.name);
+
+								// Remove or padd the element depending on schema rule
+								if (elementRule) {
+									if (elementRule.removeEmpty)
+										parent.remove();
+									else if (elementRule.paddEmpty)
+										parent.empty().append(new tinymce.html.Node('#text', 3)).value = '\u00a0';
+								}
+							}
+						}
+					} else {
+						// Replaces BR elements inside inline elements like <p><b><i><br></i></b></p> so they become <p><b><i>&nbsp;</i></b></p> 
+						lastParent = node;
+						while (parent.firstChild === lastParent && parent.lastChild === lastParent) {
+							lastParent = parent;
+
+							if (blockElements[parent.name]) {
+								break;
+							}
+
+							parent = parent.parent;
+						}
+
+						if (lastParent === parent) {
+							textNode = new tinymce.html.Node('#text', 3);
+							textNode.value = '\u00a0';
+							node.replace(textNode);
+						}
+					}
+				}
+			});
+		}
+
+		// Force anchor names closed, unless the setting "allow_html_in_named_anchor" is explicitly included.
+		if (!settings.allow_html_in_named_anchor) {
+			self.addAttributeFilter('id,name', function(nodes, name) {
+				var i = nodes.length, sibling, prevSibling, parent, node;
+
+				while (i--) {
+					node = nodes[i];
+					if (node.name === 'a' && node.firstChild && !node.attr('href')) {
+						parent = node.parent;
+
+						// Move children after current node
+						sibling = node.lastChild;
+						do {
+							prevSibling = sibling.prev;
+							parent.insert(sibling, node);
+							sibling = prevSibling;
+						} while (sibling);
+					}
+				}
+			});
+		}
+	}
+})(tinymce);
+
+tinymce.html.Writer = function(settings) {
+	var html = [], indent, indentBefore, indentAfter, encode, htmlOutput;
+
+	settings = settings || {};
+	indent = settings.indent;
+	indentBefore = tinymce.makeMap(settings.indent_before || '');
+	indentAfter = tinymce.makeMap(settings.indent_after || '');
+	encode = tinymce.html.Entities.getEncodeFunc(settings.entity_encoding || 'raw', settings.entities);
+	htmlOutput = settings.element_format == "html";
+
+	return {
+		start: function(name, attrs, empty) {
+			var i, l, attr, value;
+
+			if (indent && indentBefore[name] && html.length > 0) {
+				value = html[html.length - 1];
+
+				if (value.length > 0 && value !== '\n')
+					html.push('\n');
+			}
+
+			html.push('<', name);
+
+			if (attrs) {
+				for (i = 0, l = attrs.length; i < l; i++) {
+					attr = attrs[i];
+					html.push(' ', attr.name, '="', encode(attr.value, true), '"');
+				}
+			}
+
+			if (!empty || htmlOutput)
+				html[html.length] = '>';
+			else
+				html[html.length] = ' />';
+
+			if (empty && indent && indentAfter[name] && html.length > 0) {
+				value = html[html.length - 1];
+
+				if (value.length > 0 && value !== '\n')
+					html.push('\n');
+			}
+		},
+
+		end: function(name) {
+			var value;
+
+			/*if (indent && indentBefore[name] && html.length > 0) {
+				value = html[html.length - 1];
+
+				if (value.length > 0 && value !== '\n')
+					html.push('\n');
+			}*/
+
+			html.push('</', name, '>');
+
+			if (indent && indentAfter[name] && html.length > 0) {
+				value = html[html.length - 1];
+
+				if (value.length > 0 && value !== '\n')
+					html.push('\n');
+			}
+		},
+
+		text: function(text, raw) {
+			if (text.length > 0)
+				html[html.length] = raw ? text : encode(text);
+		},
+
+		cdata: function(text) {
+			html.push('<![CDATA[', text, ']]>');
+		},
+
+		comment: function(text) {
+			html.push('<!--', text, '-->');
+		},
+
+		pi: function(name, text) {
+			if (text)
+				html.push('<?', name, ' ', text, '?>');
+			else
+				html.push('<?', name, '?>');
+
+			if (indent)
+				html.push('\n');
+		},
+
+		doctype: function(text) {
+			html.push('<!DOCTYPE', text, '>', indent ? '\n' : '');
+		},
+
+		reset: function() {
+			html.length = 0;
+		},
+
+		getContent: function() {
+			return html.join('').replace(/\n$/, '');
+		}
+	};
+};
+
+(function(tinymce) {
+	tinymce.html.Serializer = function(settings, schema) {
+		var self = this, writer = new tinymce.html.Writer(settings);
+
+		settings = settings || {};
+		settings.validate = "validate" in settings ? settings.validate : true;
+
+		self.schema = schema = schema || new tinymce.html.Schema();
+		self.writer = writer;
+
+		self.serialize = function(node) {
+			var handlers, validate;
+
+			validate = settings.validate;
+
+			handlers = {
+				// #text
+				3: function(node, raw) {
+					writer.text(node.value, node.raw);
+				},
+
+				// #comment
+				8: function(node) {
+					writer.comment(node.value);
+				},
+
+				// Processing instruction
+				7: function(node) {
+					writer.pi(node.name, node.value);
+				},
+
+				// Doctype
+				10: function(node) {
+					writer.doctype(node.value);
+				},
+
+				// CDATA
+				4: function(node) {
+					writer.cdata(node.value);
+				},
+
+				// Document fragment
+				11: function(node) {
+					if ((node = node.firstChild)) {
+						do {
+							walk(node);
+						} while (node = node.next);
+					}
+				}
+			};
+
+			writer.reset();
+
+			function walk(node) {
+				var handler = handlers[node.type], name, isEmpty, attrs, attrName, attrValue, sortedAttrs, i, l, elementRule;
+
+				if (!handler) {
+					name = node.name;
+					isEmpty = node.shortEnded;
+					attrs = node.attributes;
+
+					// Sort attributes
+					if (validate && attrs && attrs.length > 1) {
+						sortedAttrs = [];
+						sortedAttrs.map = {};
+
+						elementRule = schema.getElementRule(node.name);
+						for (i = 0, l = elementRule.attributesOrder.length; i < l; i++) {
+							attrName = elementRule.attributesOrder[i];
+
+							if (attrName in attrs.map) {
+								attrValue = attrs.map[attrName];
+								sortedAttrs.map[attrName] = attrValue;
+								sortedAttrs.push({name: attrName, value: attrValue});
+							}
+						}
+
+						for (i = 0, l = attrs.length; i < l; i++) {
+							attrName = attrs[i].name;
+
+							if (!(attrName in sortedAttrs.map)) {
+								attrValue = attrs.map[attrName];
+								sortedAttrs.map[attrName] = attrValue;
+								sortedAttrs.push({name: attrName, value: attrValue});
+							}
+						}
+
+						attrs = sortedAttrs;
+					}
+
+					writer.start(node.name, attrs, isEmpty);
+
+					if (!isEmpty) {
+						if ((node = node.firstChild)) {
+							do {
+								walk(node);
+							} while (node = node.next);
+						}
+
+						writer.end(name);
+					}
+				} else
+					handler(node);
+			}
+
+			// Serialize element and treat all non elements as fragments
+			if (node.type == 1 && !settings.inner)
+				walk(node);
+			else
+				handlers[11](node);
+
+			return writer.getContent();
+		};
+	}
+})(tinymce);
+
+// JSLint defined globals
+/*global tinymce:false, window:false */
+
+tinymce.dom = {};
+
+(function(namespace, expando) {
+	var w3cEventModel = !!document.addEventListener;
+
+	function addEvent(target, name, callback, capture) {
+		if (target.addEventListener) {
+			target.addEventListener(name, callback, capture || false);
+		} else if (target.attachEvent) {
+			target.attachEvent('on' + name, callback);
+		}
+	}
+
+	function removeEvent(target, name, callback, capture) {
+		if (target.removeEventListener) {
+			target.removeEventListener(name, callback, capture || false);
+		} else if (target.detachEvent) {
+			target.detachEvent('on' + name, callback);
+		}
+	}
+
+	function fix(original_event, data) {
+		var name, event = data || {};
+
+		// Dummy function that gets replaced on the delegation state functions
+		function returnFalse() {
+			return false;
+		}
+
+		// Dummy function that gets replaced on the delegation state functions
+		function returnTrue() {
+			return true;
+		}
+
+		// Copy all properties from the original event
+		for (name in original_event) {
+			// layerX/layerY is deprecated in Chrome and produces a warning
+			if (name !== "layerX" && name !== "layerY") {
+				event[name] = original_event[name];
+			}
+		}
+
+		// Normalize target IE uses srcElement
+		if (!event.target) {
+			event.target = event.srcElement || document;
+		}
+
+		// Add preventDefault method
+		event.preventDefault = function() {
+			event.isDefaultPrevented = returnTrue;
+
+			// Execute preventDefault on the original event object
+			if (original_event) {
+				if (original_event.preventDefault) {
+					original_event.preventDefault();
+				} else {
+					original_event.returnValue = false; // IE
+				}
+			}
+		};
+
+		// Add stopPropagation
+		event.stopPropagation = function() {
+			event.isPropagationStopped = returnTrue;
+
+			// Execute stopPropagation on the original event object
+			if (original_event) {
+				if (original_event.stopPropagation) {
+					original_event.stopPropagation();
+				} else {
+					original_event.cancelBubble = true; // IE
+				}
+			 }
+		};
+
+		// Add stopImmediatePropagation
+		event.stopImmediatePropagation = function() {
+			event.isImmediatePropagationStopped = returnTrue;
+			event.stopPropagation();
+		};
+
+		// Add event delegation states
+		if (!event.isDefaultPrevented) {
+			event.isDefaultPrevented = returnFalse;
+			event.isPropagationStopped = returnFalse;
+			event.isImmediatePropagationStopped = returnFalse;
+		}
+
+		return event;
+	}
+
+	function bindOnReady(win, callback, event_utils) {
+		var doc = win.document, event = {type: 'ready'};
+
+		// Gets called when the DOM is ready
+		function readyHandler() {
+			if (!event_utils.domLoaded) {
+				event_utils.domLoaded = true;
+				callback(event);
+			}
+		}
+
+		// Page already loaded then fire it directly
+		if (doc.readyState == "complete") {
+			readyHandler();
+			return;
+		}
+
+		// Use W3C method
+		if (w3cEventModel) {
+			addEvent(win, 'DOMContentLoaded', readyHandler);
+		} else {
+			// Use IE method
+			addEvent(doc, "readystatechange", function() {
+				if (doc.readyState === "complete") {
+					removeEvent(doc, "readystatechange", arguments.callee);
+					readyHandler();
+				}
+			});
+
+			// Wait until we can scroll, when we can the DOM is initialized
+			if (doc.documentElement.doScroll && win === win.top) {
+				(function() {
+					try {
+						// If IE is used, use the trick by Diego Perini licensed under MIT by request to the author.
+						// http://javascript.nwbox.com/IEContentLoaded/
+						doc.documentElement.doScroll("left");
+					} catch (ex) {
+						setTimeout(arguments.callee, 0);
+						return;
+					}
+
+					readyHandler();
+				})();
+			}
+		}
+
+		// Fallback if any of the above methods should fail for some odd reason
+		addEvent(win, 'load', readyHandler);
+	}
+
+	function EventUtils(proxy) {
+		var self = this, events = {}, count, isFocusBlurBound, hasFocusIn, hasMouseEnterLeave, mouseEnterLeave;
+
+		hasMouseEnterLeave = "onmouseenter" in document.documentElement;
+		hasFocusIn = "onfocusin" in document.documentElement;
+		mouseEnterLeave = {mouseenter: 'mouseover', mouseleave: 'mouseout'};
+		count = 1;
+
+		// State if the DOMContentLoaded was executed or not
+		self.domLoaded = false;
+		self.events = events;
+
+		function executeHandlers(evt, id) {
+			var callbackList, i, l, callback;
+
+			callbackList = events[id][evt.type];
+			if (callbackList) {
+				for (i = 0, l = callbackList.length; i < l; i++) {
+					callback = callbackList[i];
+					
+					// Check if callback exists might be removed if a unbind is called inside the callback
+					if (callback && callback.func.call(callback.scope, evt) === false) {
+						evt.preventDefault();
+					}
+
+					// Should we stop propagation to immediate listeners
+					if (evt.isImmediatePropagationStopped()) {
+						return;
+					}
+				}
+			}
+		}
+
+		self.bind = function(target, names, callback, scope) {
+			var id, callbackList, i, name, fakeName, nativeHandler, capture, win = window;
+
+			// Native event handler function patches the event and executes the callbacks for the expando
+			function defaultNativeHandler(evt) {
+				executeHandlers(fix(evt || win.event), id);
+			}
+
+			// Don't bind to text nodes or comments
+			if (!target || target.nodeType === 3 || target.nodeType === 8) {
+				return;
+			}
+
+			// Create or get events id for the target
+			if (!target[expando]) {
+				id = count++;
+				target[expando] = id;
+				events[id] = {};
+			} else {
+				id = target[expando];
+
+				if (!events[id]) {
+					events[id] = {};
+				}
+			}
+
+			// Setup the specified scope or use the target as a default
+			scope = scope || target;
+
+			// Split names and bind each event, enables you to bind multiple events with one call
+			names = names.split(' ');
+			i = names.length;
+			while (i--) {
+				name = names[i];
+				nativeHandler = defaultNativeHandler;
+				fakeName = capture = false;
+
+				// Use ready instead of DOMContentLoaded
+				if (name === "DOMContentLoaded") {
+					name = "ready";
+				}
+
+				// DOM is already ready
+				if ((self.domLoaded || target.readyState == 'complete') && name === "ready") {
+					self.domLoaded = true;
+					callback.call(scope, fix({type: name}));
+					continue;
+				}
+
+				// Handle mouseenter/mouseleaver
+				if (!hasMouseEnterLeave) {
+					fakeName = mouseEnterLeave[name];
+
+					if (fakeName) {
+						nativeHandler = function(evt) {
+							var current, related;
+
+							current = evt.currentTarget;
+							related = evt.relatedTarget;
+
+							// Check if related is inside the current target if it's not then the event should be ignored since it's a mouseover/mouseout inside the element
+							if (related && current.contains) {
+								// Use contains for performance
+								related = current.contains(related);
+							} else {
+								while (related && related !== current) {
+									related = related.parentNode;
+								}
+							}
+
+							// Fire fake event
+							if (!related) {
+								evt = fix(evt || win.event);
+								evt.type = evt.type === 'mouseout' ? 'mouseleave' : 'mouseenter';
+								evt.target = current;
+								executeHandlers(evt, id);
+							}
+						};
+					}
+				}
+
+				// Fake bubbeling of focusin/focusout
+				if (!hasFocusIn && (name === "focusin" || name === "focusout")) {
+					capture = true;
+					fakeName = name === "focusin" ? "focus" : "blur";
+					nativeHandler = function(evt) {
+						evt = fix(evt || win.event);
+						evt.type = evt.type === 'focus' ? 'focusin' : 'focusout';
+						executeHandlers(evt, id);
+					};
+				}
+
+				// Setup callback list and bind native event
+				callbackList = events[id][name];
+				if (!callbackList) {
+					events[id][name] = callbackList = [{func: callback, scope: scope}];
+					callbackList.fakeName = fakeName;
+					callbackList.capture = capture;
+
+					// Add the nativeHandler to the callback list so that we can later unbind it
+					callbackList.nativeHandler = nativeHandler;
+					if (!w3cEventModel) {
+						callbackList.proxyHandler = proxy(id);
+					}
+
+					// Check if the target has native events support
+					if (name === "ready") {
+						bindOnReady(target, nativeHandler, self);
+					} else {
+						addEvent(target, fakeName || name, w3cEventModel ? nativeHandler : callbackList.proxyHandler, capture);
+					}
+				} else {
+					// If it already has an native handler then just push the callback
+					callbackList.push({func: callback, scope: scope});
+				}
+			}
+
+			target = callbackList = 0; // Clean memory for IE
+
+			return callback;
+		};
+
+		self.unbind = function(target, names, callback) {
+			var id, callbackList, i, ci, name, eventMap;
+
+			// Don't bind to text nodes or comments
+			if (!target || target.nodeType === 3 || target.nodeType === 8) {
+				return self;
+			}
+
+			// Unbind event or events if the target has the expando
+			id = target[expando];
+			if (id) {
+				eventMap = events[id];
+
+				// Specific callback
+				if (names) {
+					names = names.split(' ');
+					i = names.length;
+					while (i--) {
+						name = names[i];
+						callbackList = eventMap[name];
+
+						// Unbind the event if it exists in the map
+						if (callbackList) {
+							// Remove specified callback
+							if (callback) {
+								ci = callbackList.length;
+								while (ci--) {
+									if (callbackList[ci].func === callback) {
+										callbackList.splice(ci, 1);
+									}
+								}
+							}
+
+							// Remove all callbacks if there isn't a specified callback or there is no callbacks left
+							if (!callback || callbackList.length === 0) {
+								delete eventMap[name];
+								removeEvent(target, callbackList.fakeName || name, w3cEventModel ? callbackList.nativeHandler : callbackList.proxyHandler, callbackList.capture);
+							}
+						}
+					}
+				} else {
+					// All events for a specific element
+					for (name in eventMap) {
+						callbackList = eventMap[name];
+						removeEvent(target, callbackList.fakeName || name, w3cEventModel ? callbackList.nativeHandler : callbackList.proxyHandler, callbackList.capture);
+					}
+
+					eventMap = {};
+				}
+
+				// Check if object is empty, if it isn't then we won't remove the expando map
+				for (name in eventMap) {
+					return self;
+				}
+
+				// Delete event object
+				delete events[id];
+
+				// Remove expando from target
+				try {
+					// IE will fail here since it can't delete properties from window
+					delete target[expando];
+				} catch (ex) {
+					// IE will set it to null
+					target[expando] = null;
+				}
+			}
+
+			return self;
+		};
+
+		self.fire = function(target, name, args) {
+			var id, event;
+
+			// Don't bind to text nodes or comments
+			if (!target || target.nodeType === 3 || target.nodeType === 8) {
+				return self;
+			}
+
+			// Build event object by patching the args
+			event = fix(null, args);
+			event.type = name;
+
+			do {
+				// Found an expando that means there is listeners to execute
+				id = target[expando];
+				if (id) {
+					executeHandlers(event, id);
+				}
+
+				// Walk up the DOM
+				target = target.parentNode || target.ownerDocument || target.defaultView || target.parentWindow;
+			} while (target && !event.isPropagationStopped());
+
+			return self;
+		};
+
+		self.clean = function(target) {
+			var i, children, unbind = self.unbind;
+	
+			// Don't bind to text nodes or comments
+			if (!target || target.nodeType === 3 || target.nodeType === 8) {
+				return self;
+			}
+
+			// Unbind any element on the specificed target
+			if (target[expando]) {
+				unbind(target);
+			}
+
+			// Target doesn't have getElementsByTagName it's probably a window object then use it's document to find the children
+			if (!target.getElementsByTagName) {
+				target = target.document;
+			}
+
+			// Remove events from each child element
+			if (target && target.getElementsByTagName) {
+				unbind(target);
+
+				children = target.getElementsByTagName('*');
+				i = children.length;
+				while (i--) {
+					target = children[i];
+
+					if (target[expando]) {
+						unbind(target);
+					}
+				}
+			}
+
+			return self;
+		};
+
+		self.callNativeHandler = function(id, evt) {
+			if (events) {
+				events[id][evt.type].nativeHandler(evt);
+			}
+		};
+
+		self.destory = function() {
+			events = {};
+		};
+
+		// Legacy function calls
+
+		self.add = function(target, events, func, scope) {
+			// Old API supported direct ID assignment
+			if (typeof(target) === "string") {
+				target = document.getElementById(target);
+			}
+
+			// Old API supported multiple targets
+			if (target && target instanceof Array) {
+				var i = target.length;
+
+				while (i--) {
+					self.add(target[i], events, func, scope);
+				}
+
+				return;
+			}
+
+			// Old API called ready init
+			if (events === "init") {
+				events = "ready";
+			}
+
+			return self.bind(target, events instanceof Array ? events.join(' ') : events, func, scope);
+		};
+
+		self.remove = function(target, events, func, scope) {
+			if (!target) {
+				return self;
+			}
+
+			// Old API supported direct ID assignment
+			if (typeof(target) === "string") {
+				target = document.getElementById(target);
+			}
+
+			// Old API supported multiple targets
+			if (target instanceof Array) {
+				var i = target.length;
+
+				while (i--) {
+					self.remove(target[i], events, func, scope);
+				}
+
+				return self;
+			}
+
+			return self.unbind(target, events instanceof Array ? events.join(' ') : events, func);
+		};
+
+		self.clear = function(target) {
+			// Old API supported direct ID assignment
+			if (typeof(target) === "string") {
+				target = document.getElementById(target);
+			}
+
+			return self.clean(target);
+		};
+
+		self.cancel = function(e) {
+			if (e) {
+				self.prevent(e);
+				self.stop(e);
+			}
+
+			return false;
+		};
+
+		self.prevent = function(e) {
+			if (!e.preventDefault) {
+				e = fix(e);
+			}
+
+			e.preventDefault();
+
+			return false;
+		};
+
+		self.stop = function(e) {
+			if (!e.stopPropagation) {
+				e = fix(e);
+			}
+
+			e.stopPropagation();
+
+			return false;
+		};
+	}
+
+	namespace.EventUtils = EventUtils;
+
+	namespace.Event = new EventUtils(function(id) {
+		return function(evt) {
+			tinymce.dom.Event.callNativeHandler(id, evt);
+		};
+	});
+
+	// Bind ready event when tinymce script is loaded
+	namespace.Event.bind(window, 'ready', function() {});
+
+	namespace = 0;
+})(tinymce.dom, 'data-mce-expando'); // Namespace and expando
+
+tinymce.dom.TreeWalker = function(start_node, root_node) {
+	var node = start_node;
+
+	function findSibling(node, start_name, sibling_name, shallow) {
+		var sibling, parent;
+
+		if (node) {
+			// Walk into nodes if it has a start
+			if (!shallow && node[start_name])
+				return node[start_name];
+
+			// Return the sibling if it has one
+			if (node != root_node) {
+				sibling = node[sibling_name];
+				if (sibling)
+					return sibling;
+
+				// Walk up the parents to look for siblings
+				for (parent = node.parentNode; parent && parent != root_node; parent = parent.parentNode) {
+					sibling = parent[sibling_name];
+					if (sibling)
+						return sibling;
+				}
+			}
+		}
+	};
+
+	this.current = function() {
+		return node;
+	};
+
+	this.next = function(shallow) {
+		return (node = findSibling(node, 'firstChild', 'nextSibling', shallow));
+	};
+
+	this.prev = function(shallow) {
+		return (node = findSibling(node, 'lastChild', 'previousSibling', shallow));
+	};
+};
+
+(function(tinymce) {
+	// Shorten names
+	var each = tinymce.each,
+		is = tinymce.is,
+		isWebKit = tinymce.isWebKit,
+		isIE = tinymce.isIE,
+		Entities = tinymce.html.Entities,
+		simpleSelectorRe = /^([a-z0-9],?)+$/i,
+		whiteSpaceRegExp = /^[ \t\r\n]*$/;
+
+	tinymce.create('tinymce.dom.DOMUtils', {
+		doc : null,
+		root : null,
+		files : null,
+		pixelStyles : /^(top|left|bottom|right|width|height|borderWidth)$/,
+		props : {
+			"for" : "htmlFor",
+			"class" : "className",
+			className : "className",
+			checked : "checked",
+			disabled : "disabled",
+			maxlength : "maxLength",
+			readonly : "readOnly",
+			selected : "selected",
+			value : "value",
+			id : "id",
+			name : "name",
+			type : "type"
+		},
+
+		DOMUtils : function(d, s) {
+			var t = this, globalStyle, name, blockElementsMap;
+
+			t.doc = d;
+			t.win = window;
+			t.files = {};
+			t.cssFlicker = false;
+			t.counter = 0;
+			t.stdMode = !tinymce.isIE || d.documentMode >= 8;
+			t.boxModel = !tinymce.isIE || d.compatMode == "CSS1Compat" || t.stdMode;
+			t.hasOuterHTML = "outerHTML" in d.createElement("a");
+
+			t.settings = s = tinymce.extend({
+				keep_values : false,
+				hex_colors : 1
+			}, s);
+			
+			t.schema = s.schema;
+			t.styles = new tinymce.html.Styles({
+				url_converter : s.url_converter,
+				url_converter_scope : s.url_converter_scope
+			}, s.schema);
+
+			// Fix IE6SP2 flicker and check it failed for pre SP2
+			if (tinymce.isIE6) {
+				try {
+					d.execCommand('BackgroundImageCache', false, true);
+				} catch (e) {
+					t.cssFlicker = true;
+				}
+			}
+
+			t.fixDoc(d);
+			t.events = s.ownEvents ? new tinymce.dom.EventUtils(s.proxy) : tinymce.dom.Event;
+			tinymce.addUnload(t.destroy, t);
+			blockElementsMap = s.schema ? s.schema.getBlockElements() : {};
+
+			t.isBlock = function(node) {
+				// Fix for #5446
+				if (!node) {
+					return false;
+				}
+
+				// This function is called in module pattern style since it might be executed with the wrong this scope
+				var type = node.nodeType;
+
+				// If it's a node then check the type and use the nodeName
+				if (type)
+					return !!(type === 1 && blockElementsMap[node.nodeName]);
+
+				return !!blockElementsMap[node];
+			};
+		},
+
+		fixDoc: function(doc) {
+			var settings = this.settings, name;
+
+			if (isIE && !tinymce.isIE11 && settings.schema) {
+				// Add missing HTML 4/5 elements to IE
+				('abbr article aside audio canvas ' +
+				'details figcaption figure footer ' +
+				'header hgroup mark menu meter nav ' +
+				'output progress section summary ' +
+				'time video').replace(/\w+/g, function(name) {
+					doc.createElement(name);
+				});
+
+				// Create all custom elements
+				for (name in settings.schema.getCustomElements()) {
+					doc.createElement(name);
+				}
+			}
+		},
+
+		clone: function(node, deep) {
+			var self = this, clone, doc;
+
+			// TODO: Add feature detection here in the future
+			if (!isIE || tinymce.isIE11 || node.nodeType !== 1 || deep) {
+				return node.cloneNode(deep);
+			}
+
+			doc = self.doc;
+
+			// Make a HTML5 safe shallow copy
+			if (!deep) {
+				clone = doc.createElement(node.nodeName);
+
+				// Copy attribs
+				each(self.getAttribs(node), function(attr) {
+					self.setAttrib(clone, attr.nodeName, self.getAttrib(node, attr.nodeName));
+				});
+
+				return clone;
+			}
+/*
+			// Setup HTML5 patched document fragment
+			if (!self.frag) {
+				self.frag = doc.createDocumentFragment();
+				self.fixDoc(self.frag);
+			}
+
+			// Make a deep copy by adding it to the document fragment then removing it this removed the :section
+			clone = doc.createElement('div');
+			self.frag.appendChild(clone);
+			clone.innerHTML = node.outerHTML;
+			self.frag.removeChild(clone);
+*/
+			return clone.firstChild;
+		},
+
+		getRoot : function() {
+			var t = this, s = t.settings;
+
+			return (s && t.get(s.root_element)) || t.doc.body;
+		},
+
+		getViewPort : function(w) {
+			var d, b;
+
+			w = !w ? this.win : w;
+			d = w.document;
+			b = this.boxModel ? d.documentElement : d.body;
+
+			// Returns viewport size excluding scrollbars
+			return {
+				x : w.pageXOffset || b.scrollLeft,
+				y : w.pageYOffset || b.scrollTop,
+				w : w.innerWidth || b.clientWidth,
+				h : w.innerHeight || b.clientHeight
+			};
+		},
+
+		getRect : function(e) {
+			var p, t = this, sr;
+
+			e = t.get(e);
+			p = t.getPos(e);
+			sr = t.getSize(e);
+
+			return {
+				x : p.x,
+				y : p.y,
+				w : sr.w,
+				h : sr.h
+			};
+		},
+
+		getSize : function(e) {
+			var t = this, w, h;
+
+			e = t.get(e);
+			w = t.getStyle(e, 'width');
+			h = t.getStyle(e, 'height');
+
+			// Non pixel value, then force offset/clientWidth
+			if (w.indexOf('px') === -1)
+				w = 0;
+
+			// Non pixel value, then force offset/clientWidth
+			if (h.indexOf('px') === -1)
+				h = 0;
+
+			return {
+				w : parseInt(w, 10) || e.offsetWidth || e.clientWidth,
+				h : parseInt(h, 10) || e.offsetHeight || e.clientHeight
+			};
+		},
+
+		getParent : function(n, f, r) {
+			return this.getParents(n, f, r, false);
+		},
+
+		getParents : function(n, f, r, c) {
+			var t = this, na, se = t.settings, o = [];
+
+			n = t.get(n);
+			c = c === undefined;
+
+			if (se.strict_root)
+				r = r || t.getRoot();
+
+			// Wrap node name as func
+			if (is(f, 'string')) {
+				na = f;
+
+				if (f === '*') {
+					f = function(n) {return n.nodeType == 1;};
+				} else {
+					f = function(n) {
+						return t.is(n, na);
+					};
+				}
+			}
+
+			while (n) {
+				if (n == r || !n.nodeType || n.nodeType === 9)
+					break;
+
+				if (!f || f(n)) {
+					if (c)
+						o.push(n);
+					else
+						return n;
+				}
+
+				n = n.parentNode;
+			}
+
+			return c ? o : null;
+		},
+
+		get : function(e) {
+			var n;
+
+			if (e && this.doc && typeof(e) == 'string') {
+				n = e;
+				e = this.doc.getElementById(e);
+
+				// IE and Opera returns meta elements when they match the specified input ID, but getElementsByName seems to do the trick
+				if (e && e.id !== n)
+					return this.doc.getElementsByName(n)[1];
+			}
+
+			return e;
+		},
+
+		getNext : function(node, selector) {
+			return this._findSib(node, selector, 'nextSibling');
+		},
+
+		getPrev : function(node, selector) {
+			return this._findSib(node, selector, 'previousSibling');
+		},
+
+
+		add : function(p, n, a, h, c) {
+			var t = this;
+
+			return this.run(p, function(p) {
+				var e, k;
+
+				e = is(n, 'string') ? t.doc.createElement(n) : n;
+				t.setAttribs(e, a);
+
+				if (h) {
+					if (h.nodeType)
+						e.appendChild(h);
+					else
+						t.setHTML(e, h);
+				}
+
+				return !c ? p.appendChild(e) : e;
+			});
+		},
+
+		create : function(n, a, h) {
+			return this.add(this.doc.createElement(n), n, a, h, 1);
+		},
+
+		createHTML : function(n, a, h) {
+			var o = '', t = this, k;
+
+			o += '<' + n;
+
+			for (k in a) {
+				if (a.hasOwnProperty(k))
+					o += ' ' + k + '="' + t.encode(a[k]) + '"';
+			}
+
+			// A call to tinymce.is doesn't work for some odd reason on IE9 possible bug inside their JS runtime
+			if (typeof(h) != "undefined")
+				return o + '>' + h + '</' + n + '>';
+
+			return o + ' />';
+		},
+
+		remove : function(node, keep_children) {
+			return this.run(node, function(node) {
+				var child, parent = node.parentNode;
+
+				if (!parent)
+					return null;
+
+				if (keep_children) {
+					while (child = node.firstChild) {
+						// IE 8 will crash if you don't remove completely empty text nodes
+						if (!tinymce.isIE || child.nodeType !== 3 || child.nodeValue)
+							parent.insertBefore(child, node);
+						else
+							node.removeChild(child);
+					}
+				}
+
+				return parent.removeChild(node);
+			});
+		},
+
+		setStyle : function(n, na, v) {
+			var t = this;
+
+			return t.run(n, function(e) {
+				var s, i;
+
+				s = e.style;
+
+				// Camelcase it, if needed
+				na = na.replace(/-(\D)/g, function(a, b){
+					return b.toUpperCase();
+				});
+
+				// Default px suffix on these
+				if (t.pixelStyles.test(na) && (tinymce.is(v, 'number') || /^[\-0-9\.]+$/.test(v)))
+					v += 'px';
+
+				switch (na) {
+					case 'opacity':
+						// IE specific opacity
+						if (isIE && ! tinymce.isIE11) {
+							s.filter = v === '' ? '' : "alpha(opacity=" + (v * 100) + ")";
+
+							if (!n.currentStyle || !n.currentStyle.hasLayout)
+								s.display = 'inline-block';
+						}
+
+						// Fix for older browsers
+						s[na] = s['-moz-opacity'] = s['-khtml-opacity'] = v || '';
+						break;
+
+					case 'float':
+						(isIE && ! tinymce.isIE11) ? s.styleFloat = v : s.cssFloat = v;
+						break;
+					
+					default:
+						s[na] = v || '';
+				}
+
+				// Force update of the style data
+				if (t.settings.update_styles)
+					t.setAttrib(e, 'data-mce-style');
+			});
+		},
+
+		getStyle : function(n, na, c) {
+			n = this.get(n);
+
+			if (!n)
+				return;
+
+			// Gecko
+			if (this.doc.defaultView && c) {
+				// Remove camelcase
+				na = na.replace(/[A-Z]/g, function(a){
+					return '-' + a;
+				});
+
+				try {
+					return this.doc.defaultView.getComputedStyle(n, null).getPropertyValue(na);
+				} catch (ex) {
+					// Old safari might fail
+					return null;
+				}
+			}
+
+			// Camelcase it, if needed
+			na = na.replace(/-(\D)/g, function(a, b){
+				return b.toUpperCase();
+			});
+
+			if (na == 'float')
+				na = isIE ? 'styleFloat' : 'cssFloat';
+
+			// IE & Opera
+			if (n.currentStyle && c)
+				return n.currentStyle[na];
+
+			return n.style ? n.style[na] : undefined;
+		},
+
+		setStyles : function(e, o) {
+			var t = this, s = t.settings, ol;
+
+			ol = s.update_styles;
+			s.update_styles = 0;
+
+			each(o, function(v, n) {
+				t.setStyle(e, n, v);
+			});
+
+			// Update style info
+			s.update_styles = ol;
+			if (s.update_styles)
+				t.setAttrib(e, s.cssText);
+		},
+
+		removeAllAttribs: function(e) {
+			return this.run(e, function(e) {
+				var i, attrs = e.attributes;
+				for (i = attrs.length - 1; i >= 0; i--) {
+					e.removeAttributeNode(attrs.item(i));
+				}
+			});
+		},
+
+		setAttrib : function(e, n, v) {
+			var t = this;
+
+			// Whats the point
+			if (!e || !n)
+				return;
+
+			// Strict XML mode
+			if (t.settings.strict)
+				n = n.toLowerCase();
+
+			return this.run(e, function(e) {
+				var s = t.settings;
+				var originalValue = e.getAttribute(n);
+				if (v !== null) {
+					switch (n) {
+						case "style":
+							if (!is(v, 'string')) {
+								each(v, function(v, n) {
+									t.setStyle(e, n, v);
+								});
+
+								return;
+							}
+
+							// No mce_style for elements with these since they might get resized by the user
+							if (s.keep_values) {
+								if (v && !t._isRes(v))
+									e.setAttribute('data-mce-style', v, 2);
+								else
+									e.removeAttribute('data-mce-style', 2);
+							}
+
+							e.style.cssText = v;
+							break;
+
+						case "class":
+							e.className = v || ''; // Fix IE null bug
+							break;
+
+						case "src":
+						case "href":
+							if (s.keep_values) {
+								if (s.url_converter)
+									v = s.url_converter.call(s.url_converter_scope || t, v, n, e);
+
+								t.setAttrib(e, 'data-mce-' + n, v, 2);
+							}
+
+							break;
+
+						case "shape":
+							e.setAttribute('data-mce-style', v);
+							break;
+					}
+				}
+				if (is(v) && v !== null && v.length !== 0)
+					e.setAttribute(n, '' + v, 2);
+				else
+					e.removeAttribute(n, 2);
+
+				// fire onChangeAttrib event for attributes that have changed
+				if (tinyMCE.activeEditor && originalValue != v) {
+					var ed = tinyMCE.activeEditor;
+					ed.onSetAttrib.dispatch(ed, e, n, v);
+				}
+			});
+		},
+
+		setAttribs : function(e, o) {
+			var t = this;
+
+			return this.run(e, function(e) {
+				each(o, function(v, n) {
+					t.setAttrib(e, n, v);
+				});
+			});
+		},
+
+		getAttrib : function(e, n, dv) {
+			var v, t = this, undef;
+
+			e = t.get(e);
+
+			if (!e || e.nodeType !== 1)
+				return dv === undef ? false : dv;
+
+			if (!is(dv))
+				dv = '';
+
+			// Try the mce variant for these
+			if (/^(src|href|style|coords|shape)$/.test(n)) {
+				v = e.getAttribute("data-mce-" + n);
+
+				if (v)
+					return v;
+			}
+
+			if (isIE && t.props[n]) {
+				v = e[t.props[n]];
+				v = v && v.nodeValue ? v.nodeValue : v;
+			}
+
+			if (!v)
+				v = e.getAttribute(n, 2);
+
+			// Check boolean attribs
+			if (/^(checked|compact|declare|defer|disabled|ismap|multiple|nohref|noshade|nowrap|readonly|selected)$/.test(n)) {
+				if (e[t.props[n]] === true && v === '')
+					return n;
+
+				return v ? n : '';
+			}
+
+			// Inner input elements will override attributes on form elements
+			if (e.nodeName === "FORM" && e.getAttributeNode(n))
+				return e.getAttributeNode(n).nodeValue;
+
+			if (n === 'style') {
+				v = v || e.style.cssText;
+
+				if (v) {
+					v = t.serializeStyle(t.parseStyle(v), e.nodeName);
+
+					if (t.settings.keep_values && !t._isRes(v))
+						e.setAttribute('data-mce-style', v);
+				}
+			}
+
+			// Remove Apple and WebKit stuff
+			if (isWebKit && n === "class" && v)
+				v = v.replace(/(apple|webkit)\-[a-z\-]+/gi, '');
+
+			// Handle IE issues
+			if (isIE) {
+				switch (n) {
+					case 'rowspan':
+					case 'colspan':
+						// IE returns 1 as default value
+						if (v === 1)
+							v = '';
+
+						break;
+
+					case 'size':
+						// IE returns +0 as default value for size
+						if (v === '+0' || v === 20 || v === 0)
+							v = '';
+
+						break;
+
+					case 'width':
+					case 'height':
+					case 'vspace':
+					case 'checked':
+					case 'disabled':
+					case 'readonly':
+						if (v === 0)
+							v = '';
+
+						break;
+
+					case 'hspace':
+						// IE returns -1 as default value
+						if (v === -1)
+							v = '';
+
+						break;
+
+					case 'maxlength':
+					case 'tabindex':
+						// IE returns default value
+						if (v === 32768 || v === 2147483647 || v === '32768')
+							v = '';
+
+						break;
+
+					case 'multiple':
+					case 'compact':
+					case 'noshade':
+					case 'nowrap':
+						if (v === 65535)
+							return n;
+
+						return dv;
+
+					case 'shape':
+						v = v.toLowerCase();
+						break;
+
+					default:
+						// IE has odd anonymous function for event attributes
+						if (n.indexOf('on') === 0 && v)
+							v = tinymce._replace(/^function\s+\w+\(\)\s+\{\s+(.*)\s+\}$/, '$1', '' + v);
+				}
+			}
+
+			return (v !== undef && v !== null && v !== '') ? '' + v : dv;
+		},
+
+		getPos : function(n, ro) {
+			var t = this, x = 0, y = 0, e, d = t.doc, r;
+
+			n = t.get(n);
+			ro = ro || d.body;
+
+			if (n) {
+				// Use getBoundingClientRect if it exists since it's faster than looping offset nodes
+				if (n.getBoundingClientRect) {
+					n = n.getBoundingClientRect();
+					e = t.boxModel ? d.documentElement : d.body;
+
+					// Add scroll offsets from documentElement or body since IE with the wrong box model will use d.body and so do WebKit
+					// Also remove the body/documentelement clientTop/clientLeft on IE 6, 7 since they offset the position
+					x = n.left + (d.documentElement.scrollLeft || d.body.scrollLeft) - e.clientTop;
+					y = n.top + (d.documentElement.scrollTop || d.body.scrollTop) - e.clientLeft;
+
+					return {x : x, y : y};
+				}
+
+				r = n;
+				while (r && r != ro && r.nodeType) {
+					x += r.offsetLeft || 0;
+					y += r.offsetTop || 0;
+					r = r.offsetParent;
+				}
+
+				r = n.parentNode;
+				while (r && r != ro && r.nodeType) {
+					x -= r.scrollLeft || 0;
+					y -= r.scrollTop || 0;
+					r = r.parentNode;
+				}
+			}
+
+			return {x : x, y : y};
+		},
+
+		parseStyle : function(st) {
+			return this.styles.parse(st);
+		},
+
+		serializeStyle : function(o, name) {
+			return this.styles.serialize(o, name);
+		},
+
+		addStyle: function(cssText) {
+			var doc = this.doc, head;
+
+			// Create style element if needed
+			styleElm = doc.getElementById('mceDefaultStyles');
+			if (!styleElm) {
+				styleElm = doc.createElement('style'),
+				styleElm.id = 'mceDefaultStyles';
+				styleElm.type = 'text/css';
+
+				head = doc.getElementsByTagName('head')[0];
+				if (head.firstChild) {
+					head.insertBefore(styleElm, head.firstChild);
+				} else {
+					head.appendChild(styleElm);
+				}
+			}
+
+			// Append style data to old or new style element
+			if (styleElm.styleSheet) {
+				styleElm.styleSheet.cssText += cssText;
+			} else {
+				styleElm.appendChild(doc.createTextNode(cssText));
+			}
+		},
+
+		loadCSS : function(u) {
+			var t = this, d = t.doc, head;
+
+			if (!u)
+				u = '';
+
+			head = d.getElementsByTagName('head')[0];
+
+			each(u.split(','), function(u) {
+				var link;
+
+				if (t.files[u])
+					return;
+
+				t.files[u] = true;
+				link = t.create('link', {rel : 'stylesheet', href : tinymce._addVer(u)});
+
+				// IE 8 has a bug where dynamically loading stylesheets would produce a 1 item remaining bug
+				// This fix seems to resolve that issue by realcing the document ones a stylesheet finishes loading
+				// It's ugly but it seems to work fine.
+				if (isIE && !tinymce.isIE11 && d.documentMode && d.recalc) {
+					link.onload = function() {
+						if (d.recalc)
+							d.recalc();
+
+						link.onload = null;
+					};
+				}
+
+				head.appendChild(link);
+			});
+		},
+
+		addClass : function(e, c) {
+			return this.run(e, function(e) {
+				var o;
+
+				if (!c)
+					return 0;
+
+				if (this.hasClass(e, c))
+					return e.className;
+
+				o = this.removeClass(e, c);
+
+				return e.className = (o != '' ? (o + ' ') : '') + c;
+			});
+		},
+
+		removeClass : function(e, c) {
+			var t = this, re;
+
+			return t.run(e, function(e) {
+				var v;
+
+				if (t.hasClass(e, c)) {
+					if (!re)
+						re = new RegExp("(^|\\s+)" + c + "(\\s+|$)", "g");
+
+					v = e.className.replace(re, ' ');
+					v = tinymce.trim(v != ' ' ? v : '');
+
+					e.className = v;
+
+					// Empty class attr
+					if (!v) {
+						e.removeAttribute('class');
+						e.removeAttribute('className');
+					}
+
+					return v;
+				}
+
+				return e.className;
+			});
+		},
+
+		hasClass : function(n, c) {
+			n = this.get(n);
+
+			if (!n || !c)
+				return false;
+
+			return (' ' + n.className + ' ').indexOf(' ' + c + ' ') !== -1;
+		},
+
+		show : function(e) {
+			return this.setStyle(e, 'display', 'block');
+		},
+
+		hide : function(e) {
+			return this.setStyle(e, 'display', 'none');
+		},
+
+		isHidden : function(e) {
+			e = this.get(e);
+
+			return !e || e.style.display == 'none' || this.getStyle(e, 'display') == 'none';
+		},
+
+		uniqueId : function(p) {
+			return (!p ? 'mce_' : p) + (this.counter++);
+		},
+
+		setHTML : function(element, html) {
+			var self = this;
+
+			return self.run(element, function(element) {
+				if (isIE) {
+					// Remove all child nodes, IE keeps empty text nodes in DOM
+					while (element.firstChild)
+						element.removeChild(element.firstChild);
+
+					try {
+						// IE will remove comments from the beginning
+						// unless you padd the contents with something
+						element.innerHTML = '<br />' + html;
+						element.removeChild(element.firstChild);
+					} catch (ex) {
+						// IE sometimes produces an unknown runtime error on innerHTML if it's an block element within a block element for example a div inside a p
+						// This seems to fix this problem
+
+						// Create new div with HTML contents and a BR infront to keep comments
+						var newElement = self.create('div');
+						newElement.innerHTML = '<br />' + html;
+
+						// Add all children from div to target
+						each (tinymce.grep(newElement.childNodes), function(node, i) {
+							// Skip br element
+							if (i && element.canHaveHTML)
+								element.appendChild(node);
+						});
+					}
+				} else
+					element.innerHTML = html;
+
+				return html;
+			});
+		},
+
+		getOuterHTML : function(elm) {
+			var doc, self = this;
+
+			elm = self.get(elm);
+
+			if (!elm)
+				return null;
+
+			if (elm.nodeType === 1 && self.hasOuterHTML)
+				return elm.outerHTML;
+
+			doc = (elm.ownerDocument || self.doc).createElement("body");
+			doc.appendChild(elm.cloneNode(true));
+
+			return doc.innerHTML;
+		},
+
+		setOuterHTML : function(e, h, d) {
+			var t = this;
+
+			function setHTML(e, h, d) {
+				var n, tp;
+
+				tp = d.createElement("body");
+				tp.innerHTML = h;
+
+				n = tp.lastChild;
+				while (n) {
+					t.insertAfter(n.cloneNode(true), e);
+					n = n.previousSibling;
+				}
+
+				t.remove(e);
+			};
+
+			return this.run(e, function(e) {
+				e = t.get(e);
+
+				// Only set HTML on elements
+				if (e.nodeType == 1) {
+					d = d || e.ownerDocument || t.doc;
+
+					if (isIE) {
+						try {
+							// Try outerHTML for IE it sometimes produces an unknown runtime error
+							if (isIE && e.nodeType == 1)
+								e.outerHTML = h;
+							else
+								setHTML(e, h, d);
+						} catch (ex) {
+							// Fix for unknown runtime error
+							setHTML(e, h, d);
+						}
+					} else
+						setHTML(e, h, d);
+				}
+			});
+		},
+
+		decode : Entities.decode,
+
+		encode : Entities.encodeAllRaw,
+
+		insertAfter : function(node, reference_node) {
+			reference_node = this.get(reference_node);
+
+			return this.run(node, function(node) {
+				var parent, nextSibling;
+
+				parent = reference_node.parentNode;
+				nextSibling = reference_node.nextSibling;
+
+				if (nextSibling)
+					parent.insertBefore(node, nextSibling);
+				else
+					parent.appendChild(node);
+
+				return node;
+			});
+		},
+
+		replace : function(n, o, k) {
+			var t = this;
+
+			if (is(o, 'array'))
+				n = n.cloneNode(true);
+
+			return t.run(o, function(o) {
+				if (k) {
+					each(tinymce.grep(o.childNodes), function(c) {
+						n.appendChild(c);
+					});
+				}
+
+				return o.parentNode.replaceChild(n, o);
+			});
+		},
+
+		rename : function(elm, name) {
+			var t = this, newElm;
+
+			if (elm.nodeName != name.toUpperCase()) {
+				// Rename block element
+				newElm = t.create(name);
+
+				// Copy attribs to new block
+				each(t.getAttribs(elm), function(attr_node) {
+					t.setAttrib(newElm, attr_node.nodeName, t.getAttrib(elm, attr_node.nodeName));
+				});
+
+				// Replace block
+				t.replace(newElm, elm, 1);
+			}
+
+			return newElm || elm;
+		},
+
+		findCommonAncestor : function(a, b) {
+			var ps = a, pe;
+
+			while (ps) {
+				pe = b;
+
+				while (pe && ps != pe)
+					pe = pe.parentNode;
+
+				if (ps == pe)
+					break;
+
+				ps = ps.parentNode;
+			}
+
+			if (!ps && a.ownerDocument)
+				return a.ownerDocument.documentElement;
+
+			return ps;
+		},
+
+		toHex : function(s) {
+			var c = /^\s*rgb\s*?\(\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?\)\s*$/i.exec(s);
+
+			function hex(s) {
+				s = parseInt(s, 10).toString(16);
+
+				return s.length > 1 ? s : '0' + s; // 0 -> 00
+			};
+
+			if (c) {
+				s = '#' + hex(c[1]) + hex(c[2]) + hex(c[3]);
+
+				return s;
+			}
+
+			return s;
+		},
+
+		getClasses : function() {
+			var t = this, cl = [], i, lo = {}, f = t.settings.class_filter, ov;
+
+			if (t.classes)
+				return t.classes;
+
+			function addClasses(s) {
+				// IE style imports
+				each(s.imports, function(r) {
+					addClasses(r);
+				});
+
+				each(s.cssRules || s.rules, function(r) {
+					// Real type or fake it on IE
+					switch (r.type || 1) {
+						// Rule
+						case 1:
+							if (r.selectorText) {
+								each(r.selectorText.split(','), function(v) {
+									v = v.replace(/^\s*|\s*$|^\s\./g, "");
+
+									// Is internal or it doesn't contain a class
+									if (/\.mce/.test(v) || !/\.[\w\-]+$/.test(v))
+										return;
+
+									// Remove everything but class name
+									ov = v;
+									v = tinymce._replace(/.*\.([a-z0-9_\-]+).*/i, '$1', v);
+
+									// Filter classes
+									if (f && !(v = f(v, ov)))
+										return;
+
+									if (!lo[v]) {
+										cl.push({'class' : v});
+										lo[v] = 1;
+									}
+								});
+							}
+							break;
+
+						// Import
+						case 3:
+							try {
+								addClasses(r.styleSheet);
+							} catch (ex) {
+								// Ignore
+							}
+
+							break;
+					}
+				});
+			};
+
+			try {
+				each(t.doc.styleSheets, addClasses);
+			} catch (ex) {
+				// Ignore
+			}
+
+			if (cl.length > 0)
+				t.classes = cl;
+
+			return cl;
+		},
+
+		run : function(e, f, s) {
+			var t = this, o;
+
+			if (t.doc && typeof(e) === 'string')
+				e = t.get(e);
+
+			if (!e)
+				return false;
+
+			s = s || this;
+			if (!e.nodeType && (e.length || e.length === 0)) {
+				o = [];
+
+				each(e, function(e, i) {
+					if (e) {
+						if (typeof(e) == 'string')
+							e = t.doc.getElementById(e);
+
+						o.push(f.call(s, e, i));
+					}
+				});
+
+				return o;
+			}
+
+			return f.call(s, e);
+		},
+
+		getAttribs : function(n) {
+			var o;
+
+			n = this.get(n);
+
+			if (!n)
+				return [];
+
+			if (isIE) {
+				o = [];
+
+				// Object will throw exception in IE
+				if (n.nodeName == 'OBJECT')
+					return n.attributes;
+
+				// IE doesn't keep the selected attribute if you clone option elements
+				if (n.nodeName === 'OPTION' && this.getAttrib(n, 'selected'))
+					o.push({specified : 1, nodeName : 'selected'});
+
+				// It's crazy that this is faster in IE but it's because it returns all attributes all the time
+				n.cloneNode(false).outerHTML.replace(/<\/?[\w:\-]+ ?|=[\"][^\"]+\"|=\'[^\']+\'|=[\w\-]+|>/gi, '').replace(/[\w:\-]+/gi, function(a) {
+					o.push({specified : 1, nodeName : a});
+				});
+
+				return o;
+			}
+
+			return n.attributes;
+		},
+
+		isEmpty : function(node, elements) {
+			var self = this, i, attributes, type, walker, name, brCount = 0;
+
+			node = node.firstChild;
+			if (node) {
+				walker = new tinymce.dom.TreeWalker(node, node.parentNode);
+				elements = elements || self.schema ? self.schema.getNonEmptyElements() : null;
+
+				do {
+					type = node.nodeType;
+
+					if (type === 1) {
+						// Ignore bogus elements
+						if (node.getAttribute('data-mce-bogus'))
+							continue;
+
+						// Keep empty elements like <img />
+						name = node.nodeName.toLowerCase();
+						if (elements && elements[name]) {
+							// Ignore single BR elements in blocks like <p><br /></p> or <p><span><br /></span></p>
+							if (name === 'br') {
+								brCount++;
+								continue;
+							}
+
+							return false;
+						}
+
+						// Keep elements with data-bookmark attributes or name attribute like <a name="1"></a>
+						attributes = self.getAttribs(node);
+						i = node.attributes.length;
+						while (i--) {
+							name = node.attributes[i].nodeName;
+							if (name === "name" || name === 'data-mce-bookmark')
+								return false;
+						}
+					}
+
+					// Keep comment nodes
+					if (type == 8)
+						return false;
+
+					// Keep non whitespace text nodes
+					if ((type === 3 && !whiteSpaceRegExp.test(node.nodeValue)))
+						return false;
+				} while (node = walker.next());
+			}
+
+			return brCount <= 1;
+		},
+
+		destroy : function(s) {
+			var t = this;
+
+			t.win = t.doc = t.root = t.events = t.frag = null;
+
+			// Manual destroy then remove unload handler
+			if (!s)
+				tinymce.removeUnload(t.destroy);
+		},
+
+		createRng : function() {
+			var d = this.doc;
+
+			return d.createRange ? d.createRange() : new tinymce.dom.Range(this);
+		},
+
+		nodeIndex : function(node, normalized) {
+			var idx = 0, lastNodeType, lastNode, nodeType;
+
+			if (node) {
+				for (lastNodeType = node.nodeType, node = node.previousSibling, lastNode = node; node; node = node.previousSibling) {
+					nodeType = node.nodeType;
+
+					// Normalize text nodes
+					if (normalized && nodeType == 3) {
+						if (nodeType == lastNodeType || !node.nodeValue.length)
+							continue;
+					}
+					idx++;
+					lastNodeType = nodeType;
+				}
+			}
+
+			return idx;
+		},
+
+		split : function(pe, e, re) {
+			var t = this, r = t.createRng(), bef, aft, pa;
+
+			// W3C valid browsers tend to leave empty nodes to the left/right side of the contents, this makes sense
+			// but we don't want that in our code since it serves no purpose for the end user
+			// For example if this is chopped:
+			//   <p>text 1<span><b>CHOP</b></span>text 2</p>
+			// would produce:
+			//   <p>text 1<span></span></p><b>CHOP</b><p><span></span>text 2</p>
+			// this function will then trim of empty edges and produce:
+			//   <p>text 1</p><b>CHOP</b><p>text 2</p>
+			function trim(node) {
+				var i, children = node.childNodes, type = node.nodeType;
+
+				function surroundedBySpans(node) {
+					var previousIsSpan = node.previousSibling && node.previousSibling.nodeName == 'SPAN';
+					var nextIsSpan = node.nextSibling && node.nextSibling.nodeName == 'SPAN';
+					return previousIsSpan && nextIsSpan;
+				}
+
+				if (type == 1 && node.getAttribute('data-mce-type') == 'bookmark')
+					return;
+
+				for (i = children.length - 1; i >= 0; i--)
+					trim(children[i]);
+
+				if (type != 9) {
+					// Keep non whitespace text nodes
+					if (type == 3 && node.nodeValue.length > 0) {
+						// If parent element isn't a block or there isn't any useful contents for example "<p>   </p>"
+						// Also keep text nodes with only spaces if surrounded by spans.
+						// eg. "<p><span>a</span> <span>b</span></p>" should keep space between a and b
+						var trimmedLength = tinymce.trim(node.nodeValue).length;
+						if (!t.isBlock(node.parentNode) || trimmedLength > 0 || trimmedLength === 0 && surroundedBySpans(node))
+							return;
+					} else if (type == 1) {
+						// If the only child is a bookmark then move it up
+						children = node.childNodes;
+						if (children.length == 1 && children[0] && children[0].nodeType == 1 && children[0].getAttribute('data-mce-type') == 'bookmark')
+							node.parentNode.insertBefore(children[0], node);
+
+						// Keep non empty elements or img, hr etc
+						if (children.length || /^(br|hr|input|img)$/i.test(node.nodeName))
+							return;
+					}
+
+					t.remove(node);
+				}
+
+				return node;
+			};
+
+			if (pe && e) {
+				// Get before chunk
+				r.setStart(pe.parentNode, t.nodeIndex(pe));
+				r.setEnd(e.parentNode, t.nodeIndex(e));
+				bef = r.extractContents();
+
+				// Get after chunk
+				r = t.createRng();
+				r.setStart(e.parentNode, t.nodeIndex(e) + 1);
+				r.setEnd(pe.parentNode, t.nodeIndex(pe) + 1);
+				aft = r.extractContents();
+
+				// Insert before chunk
+				pa = pe.parentNode;
+				pa.insertBefore(trim(bef), pe);
+
+				// Insert middle chunk
+				if (re)
+				pa.replaceChild(re, e);
+			else
+				pa.insertBefore(e, pe);
+
+				// Insert after chunk
+				pa.insertBefore(trim(aft), pe);
+				t.remove(pe);
+
+				return re || e;
+			}
+		},
+
+		bind : function(target, name, func, scope) {
+			return this.events.add(target, name, func, scope || this);
+		},
+
+		unbind : function(target, name, func) {
+			return this.events.remove(target, name, func);
+		},
+
+		fire : function(target, name, evt) {
+			return this.events.fire(target, name, evt);
+		},
+
+		// Returns the content editable state of a node
+		getContentEditable: function(node) {
+			var contentEditable;
+
+			// Check type
+			if (node.nodeType != 1) {
+				return null;
+			}
+
+			// Check for fake content editable
+			contentEditable = node.getAttribute("data-mce-contenteditable");
+			if (contentEditable && contentEditable !== "inherit") {
+				return contentEditable;
+			}
+
+			// Check for real content editable
+			return node.contentEditable !== "inherit" ? node.contentEditable : null;
+		},
+
+
+		_findSib : function(node, selector, name) {
+			var t = this, f = selector;
+
+			if (node) {
+				// If expression make a function of it using is
+				if (is(f, 'string')) {
+					f = function(node) {
+						return t.is(node, selector);
+					};
+				}
+
+				// Loop all siblings
+				for (node = node[name]; node; node = node[name]) {
+					if (f(node))
+						return node;
+				}
+			}
+
+			return null;
+		},
+
+		_isRes : function(c) {
+			// Is live resizble element
+			return /^(top|left|bottom|right|width|height)/i.test(c) || /;\s*(top|left|bottom|right|width|height)/i.test(c);
+		}
+
+		/*
+		walk : function(n, f, s) {
+			var d = this.doc, w;
+
+			if (d.createTreeWalker) {
+				w = d.createTreeWalker(n, NodeFilter.SHOW_TEXT, null, false);
+
+				while ((n = w.nextNode()) != null)
+					f.call(s || this, n);
+			} else
+				tinymce.walk(n, f, 'childNodes', s);
+		}
+		*/
+
+		/*
+		toRGB : function(s) {
+			var c = /^\s*?#([0-9A-F]{2})([0-9A-F]{1,2})([0-9A-F]{2})?\s*?$/.exec(s);
+
+			if (c) {
+				// #FFF -> #FFFFFF
+				if (!is(c[3]))
+					c[3] = c[2] = c[1];
+
+				return "rgb(" + parseInt(c[1], 16) + "," + parseInt(c[2], 16) + "," + parseInt(c[3], 16) + ")";
+			}
+
+			return s;
+		}
+		*/
+	});
+
+	tinymce.DOM = new tinymce.dom.DOMUtils(document, {process_html : 0});
+})(tinymce);
+
+(function(ns) {
+	// Range constructor
+	function Range(dom) {
+		var t = this,
+			doc = dom.doc,
+			EXTRACT = 0,
+			CLONE = 1,
+			DELETE = 2,
+			TRUE = true,
+			FALSE = false,
+			START_OFFSET = 'startOffset',
+			START_CONTAINER = 'startContainer',
+			END_CONTAINER = 'endContainer',
+			END_OFFSET = 'endOffset',
+			extend = tinymce.extend,
+			nodeIndex = dom.nodeIndex;
+
+		extend(t, {
+			// Inital states
+			startContainer : doc,
+			startOffset : 0,
+			endContainer : doc,
+			endOffset : 0,
+			collapsed : TRUE,
+			commonAncestorContainer : doc,
+
+			// Range constants
+			START_TO_START : 0,
+			START_TO_END : 1,
+			END_TO_END : 2,
+			END_TO_START : 3,
+
+			// Public methods
+			setStart : setStart,
+			setEnd : setEnd,
+			setStartBefore : setStartBefore,
+			setStartAfter : setStartAfter,
+			setEndBefore : setEndBefore,
+			setEndAfter : setEndAfter,
+			collapse : collapse,
+			selectNode : selectNode,
+			selectNodeContents : selectNodeContents,
+			compareBoundaryPoints : compareBoundaryPoints,
+			deleteContents : deleteContents,
+			extractContents : extractContents,
+			cloneContents : cloneContents,
+			insertNode : insertNode,
+			surroundContents : surroundContents,
+			cloneRange : cloneRange,
+			toStringIE : toStringIE
+		});
+
+		function createDocumentFragment() {
+			return doc.createDocumentFragment();
+		};
+
+		function setStart(n, o) {
+			_setEndPoint(TRUE, n, o);
+		};
+
+		function setEnd(n, o) {
+			_setEndPoint(FALSE, n, o);
+		};
+
+		function setStartBefore(n) {
+			setStart(n.parentNode, nodeIndex(n));
+		};
+
+		function setStartAfter(n) {
+			setStart(n.parentNode, nodeIndex(n) + 1);
+		};
+
+		function setEndBefore(n) {
+			setEnd(n.parentNode, nodeIndex(n));
+		};
+
+		function setEndAfter(n) {
+			setEnd(n.parentNode, nodeIndex(n) + 1);
+		};
+
+		function collapse(ts) {
+			if (ts) {
+				t[END_CONTAINER] = t[START_CONTAINER];
+				t[END_OFFSET] = t[START_OFFSET];
+			} else {
+				t[START_CONTAINER] = t[END_CONTAINER];
+				t[START_OFFSET] = t[END_OFFSET];
+			}
+
+			t.collapsed = TRUE;
+		};
+
+		function selectNode(n) {
+			setStartBefore(n);
+			setEndAfter(n);
+		};
+
+		function selectNodeContents(n) {
+			setStart(n, 0);
+			setEnd(n, n.nodeType === 1 ? n.childNodes.length : n.nodeValue.length);
+		};
+
+		function compareBoundaryPoints(h, r) {
+			var sc = t[START_CONTAINER], so = t[START_OFFSET], ec = t[END_CONTAINER], eo = t[END_OFFSET],
+			rsc = r.startContainer, rso = r.startOffset, rec = r.endContainer, reo = r.endOffset;
+
+			// Check START_TO_START
+			if (h === 0)
+				return _compareBoundaryPoints(sc, so, rsc, rso);
+	
+			// Check START_TO_END
+			if (h === 1)
+				return _compareBoundaryPoints(ec, eo, rsc, rso);
+	
+			// Check END_TO_END
+			if (h === 2)
+				return _compareBoundaryPoints(ec, eo, rec, reo);
+	
+			// Check END_TO_START
+			if (h === 3) 
+				return _compareBoundaryPoints(sc, so, rec, reo);
+		};
+
+		function deleteContents() {
+			_traverse(DELETE);
+		};
+
+		function extractContents() {
+			return _traverse(EXTRACT);
+		};
+
+		function cloneContents() {
+			return _traverse(CLONE);
+		};
+
+		function insertNode(n) {
+			var startContainer = this[START_CONTAINER],
+				startOffset = this[START_OFFSET], nn, o;
+
+			// Node is TEXT_NODE or CDATA
+			if ((startContainer.nodeType === 3 || startContainer.nodeType === 4) && startContainer.nodeValue) {
+				if (!startOffset) {
+					// At the start of text
+					startContainer.parentNode.insertBefore(n, startContainer);
+				} else if (startOffset >= startContainer.nodeValue.length) {
+					// At the end of text
+					dom.insertAfter(n, startContainer);
+				} else {
+					// Middle, need to split
+					nn = startContainer.splitText(startOffset);
+					startContainer.parentNode.insertBefore(n, nn);
+				}
+			} else {
+				// Insert element node
+				if (startContainer.childNodes.length > 0)
+					o = startContainer.childNodes[startOffset];
+
+				if (o)
+					startContainer.insertBefore(n, o);
+				else
+					startContainer.appendChild(n);
+			}
+		};
+
+		function surroundContents(n) {
+			var f = t.extractContents();
+
+			t.insertNode(n);
+			n.appendChild(f);
+			t.selectNode(n);
+		};
+
+		function cloneRange() {
+			return extend(new Range(dom), {
+				startContainer : t[START_CONTAINER],
+				startOffset : t[START_OFFSET],
+				endContainer : t[END_CONTAINER],
+				endOffset : t[END_OFFSET],
+				collapsed : t.collapsed,
+				commonAncestorContainer : t.commonAncestorContainer
+			});
+		};
+
+		// Private methods
+
+		function _getSelectedNode(container, offset) {
+			var child;
+
+			if (container.nodeType == 3 /* TEXT_NODE */)
+				return container;
+
+			if (offset < 0)
+				return container;
+
+			child = container.firstChild;
+			while (child && offset > 0) {
+				--offset;
+				child = child.nextSibling;
+			}
+
+			if (child)
+				return child;
+
+			return container;
+		};
+
+		function _isCollapsed() {
+			return (t[START_CONTAINER] == t[END_CONTAINER] && t[START_OFFSET] == t[END_OFFSET]);
+		};
+
+		function _compareBoundaryPoints(containerA, offsetA, containerB, offsetB) {
+			var c, offsetC, n, cmnRoot, childA, childB;
+			
+			// In the first case the boundary-points have the same container. A is before B
+			// if its offset is less than the offset of B, A is equal to B if its offset is
+			// equal to the offset of B, and A is after B if its offset is greater than the
+			// offset of B.
+			if (containerA == containerB) {
+				if (offsetA == offsetB)
+					return 0; // equal
+
+				if (offsetA < offsetB)
+					return -1; // before
+
+				return 1; // after
+			}
+
+			// In the second case a child node C of the container of A is an ancestor
+			// container of B. In this case, A is before B if the offset of A is less than or
+			// equal to the index of the child node C and A is after B otherwise.
+			c = containerB;
+			while (c && c.parentNode != containerA)
+				c = c.parentNode;
+
+			if (c) {
+				offsetC = 0;
+				n = containerA.firstChild;
+
+				while (n != c && offsetC < offsetA) {
+					offsetC++;
+					n = n.nextSibling;
+				}
+
+				if (offsetA <= offsetC)
+					return -1; // before
+
+				return 1; // after
+			}
+
+			// In the third case a child node C of the container of B is an ancestor container
+			// of A. In this case, A is before B if the index of the child node C is less than
+			// the offset of B and A is after B otherwise.
+			c = containerA;
+			while (c && c.parentNode != containerB) {
+				c = c.parentNode;
+			}
+
+			if (c) {
+				offsetC = 0;
+				n = containerB.firstChild;
+
+				while (n != c && offsetC < offsetB) {
+					offsetC++;
+					n = n.nextSibling;
+				}
+
+				if (offsetC < offsetB)
+					return -1; // before
+
+				return 1; // after
+			}
+
+			// In the fourth case, none of three other cases hold: the containers of A and B
+			// are siblings or descendants of sibling nodes. In this case, A is before B if
+			// the container of A is before the container of B in a pre-order traversal of the
+			// Ranges' context tree and A is after B otherwise.
+			cmnRoot = dom.findCommonAncestor(containerA, containerB);
+			childA = containerA;
+
+			while (childA && childA.parentNode != cmnRoot)
+				childA = childA.parentNode;
+
+			if (!childA)
+				childA = cmnRoot;
+
+			childB = containerB;
+			while (childB && childB.parentNode != cmnRoot)
+				childB = childB.parentNode;
+
+			if (!childB)
+				childB = cmnRoot;
+
+			if (childA == childB)
+				return 0; // equal
+
+			n = cmnRoot.firstChild;
+			while (n) {
+				if (n == childA)
+					return -1; // before
+
+				if (n == childB)
+					return 1; // after
+
+				n = n.nextSibling;
+			}
+		};
+
+		function _setEndPoint(st, n, o) {
+			var ec, sc;
+
+			if (st) {
+				t[START_CONTAINER] = n;
+				t[START_OFFSET] = o;
+			} else {
+				t[END_CONTAINER] = n;
+				t[END_OFFSET] = o;
+			}
+
+			// If one boundary-point of a Range is set to have a root container
+			// other than the current one for the Range, the Range is collapsed to
+			// the new position. This enforces the restriction that both boundary-
+			// points of a Range must have the same root container.
+			ec = t[END_CONTAINER];
+			while (ec.parentNode)
+				ec = ec.parentNode;
+
+			sc = t[START_CONTAINER];
+			while (sc.parentNode)
+				sc = sc.parentNode;
+
+			if (sc == ec) {
+				// The start position of a Range is guaranteed to never be after the
+				// end position. To enforce this restriction, if the start is set to
+				// be at a position after the end, the Range is collapsed to that
+				// position.
+				if (_compareBoundaryPoints(t[START_CONTAINER], t[START_OFFSET], t[END_CONTAINER], t[END_OFFSET]) > 0)
+					t.collapse(st);
+			} else
+				t.collapse(st);
+
+			t.collapsed = _isCollapsed();
+			t.commonAncestorContainer = dom.findCommonAncestor(t[START_CONTAINER], t[END_CONTAINER]);
+		};
+
+		function _traverse(how) {
+			var c, endContainerDepth = 0, startContainerDepth = 0, p, depthDiff, startNode, endNode, sp, ep;
+
+			if (t[START_CONTAINER] == t[END_CONTAINER])
+				return _traverseSameContainer(how);
+
+			for (c = t[END_CONTAINER], p = c.parentNode; p; c = p, p = p.parentNode) {
+				if (p == t[START_CONTAINER])
+					return _traverseCommonStartContainer(c, how);
+
+				++endContainerDepth;
+			}
+
+			for (c = t[START_CONTAINER], p = c.parentNode; p; c = p, p = p.parentNode) {
+				if (p == t[END_CONTAINER])
+					return _traverseCommonEndContainer(c, how);
+
+				++startContainerDepth;
+			}
+
+			depthDiff = startContainerDepth - endContainerDepth;
+
+			startNode = t[START_CONTAINER];
+			while (depthDiff > 0) {
+				startNode = startNode.parentNode;
+				depthDiff--;
+			}
+
+			endNode = t[END_CONTAINER];
+			while (depthDiff < 0) {
+				endNode = endNode.parentNode;
+				depthDiff++;
+			}
+
+			// ascend the ancestor hierarchy until we have a common parent.
+			for (sp = startNode.parentNode, ep = endNode.parentNode; sp != ep; sp = sp.parentNode, ep = ep.parentNode) {
+				startNode = sp;
+				endNode = ep;
+			}
+
+			return _traverseCommonAncestors(startNode, endNode, how);
+		};
+
+		 function _traverseSameContainer(how) {
+			var frag, s, sub, n, cnt, sibling, xferNode, start, len;
+
+			if (how != DELETE)
+				frag = createDocumentFragment();
+
+			// If selection is empty, just return the fragment
+			if (t[START_OFFSET] == t[END_OFFSET])
+				return frag;
+
+			// Text node needs special case handling
+			if (t[START_CONTAINER].nodeType == 3 /* TEXT_NODE */) {
+				// get the substring
+				s = t[START_CONTAINER].nodeValue;
+				sub = s.substring(t[START_OFFSET], t[END_OFFSET]);
+
+				// set the original text node to its new value
+				if (how != CLONE) {
+					n = t[START_CONTAINER];
+					start = t[START_OFFSET];
+					len = t[END_OFFSET] - t[START_OFFSET];
+
+					if (start === 0 && len >= n.nodeValue.length - 1) {
+						n.parentNode.removeChild(n);
+					} else {
+						n.deleteData(start, len);
+					}
+
+					// Nothing is partially selected, so collapse to start point
+					t.collapse(TRUE);
+				}
+
+				if (how == DELETE)
+					return;
+
+				if (sub.length > 0) {
+					frag.appendChild(doc.createTextNode(sub));
+				}
+
+				return frag;
+			}
+
+			// Copy nodes between the start/end offsets.
+			n = _getSelectedNode(t[START_CONTAINER], t[START_OFFSET]);
+			cnt = t[END_OFFSET] - t[START_OFFSET];
+
+			while (n && cnt > 0) {
+				sibling = n.nextSibling;
+				xferNode = _traverseFullySelected(n, how);
+
+				if (frag)
+					frag.appendChild( xferNode );
+
+				--cnt;
+				n = sibling;
+			}
+
+			// Nothing is partially selected, so collapse to start point
+			if (how != CLONE)
+				t.collapse(TRUE);
+
+			return frag;
+		};
+
+		function _traverseCommonStartContainer(endAncestor, how) {
+			var frag, n, endIdx, cnt, sibling, xferNode;
+
+			if (how != DELETE)
+				frag = createDocumentFragment();
+
+			n = _traverseRightBoundary(endAncestor, how);
+
+			if (frag)
+				frag.appendChild(n);
+
+			endIdx = nodeIndex(endAncestor);
+			cnt = endIdx - t[START_OFFSET];
+
+			if (cnt <= 0) {
+				// Collapse to just before the endAncestor, which
+				// is partially selected.
+				if (how != CLONE) {
+					t.setEndBefore(endAncestor);
+					t.collapse(FALSE);
+				}
+
+				return frag;
+			}
+
+			n = endAncestor.previousSibling;
+			while (cnt > 0) {
+				sibling = n.previousSibling;
+				xferNode = _traverseFullySelected(n, how);
+
+				if (frag)
+					frag.insertBefore(xferNode, frag.firstChild);
+
+				--cnt;
+				n = sibling;
+			}
+
+			// Collapse to just before the endAncestor, which
+			// is partially selected.
+			if (how != CLONE) {
+				t.setEndBefore(endAncestor);
+				t.collapse(FALSE);
+			}
+
+			return frag;
+		};
+
+		function _traverseCommonEndContainer(startAncestor, how) {
+			var frag, startIdx, n, cnt, sibling, xferNode;
+
+			if (how != DELETE)
+				frag = createDocumentFragment();
+
+			n = _traverseLeftBoundary(startAncestor, how);
+			if (frag)
+				frag.appendChild(n);
+
+			startIdx = nodeIndex(startAncestor);
+			++startIdx; // Because we already traversed it
+
+			cnt = t[END_OFFSET] - startIdx;
+			n = startAncestor.nextSibling;
+			while (n && cnt > 0) {
+				sibling = n.nextSibling;
+				xferNode = _traverseFullySelected(n, how);
+
+				if (frag)
+					frag.appendChild(xferNode);
+
+				--cnt;
+				n = sibling;
+			}
+
+			if (how != CLONE) {
+				t.setStartAfter(startAncestor);
+				t.collapse(TRUE);
+			}
+
+			return frag;
+		};
+
+		function _traverseCommonAncestors(startAncestor, endAncestor, how) {
+			var n, frag, commonParent, startOffset, endOffset, cnt, sibling, nextSibling;
+
+			if (how != DELETE)
+				frag = createDocumentFragment();
+
+			n = _traverseLeftBoundary(startAncestor, how);
+			if (frag)
+				frag.appendChild(n);
+
+			commonParent = startAncestor.parentNode;
+			startOffset = nodeIndex(startAncestor);
+			endOffset = nodeIndex(endAncestor);
+			++startOffset;
+
+			cnt = endOffset - startOffset;
+			sibling = startAncestor.nextSibling;
+
+			while (cnt > 0) {
+				nextSibling = sibling.nextSibling;
+				n = _traverseFullySelected(sibling, how);
+
+				if (frag)
+					frag.appendChild(n);
+
+				sibling = nextSibling;
+				--cnt;
+			}
+
+			n = _traverseRightBoundary(endAncestor, how);
+
+			if (frag)
+				frag.appendChild(n);
+
+			if (how != CLONE) {
+				t.setStartAfter(startAncestor);
+				t.collapse(TRUE);
+			}
+
+			return frag;
+		};
+
+		function _traverseRightBoundary(root, how) {
+			var next = _getSelectedNode(t[END_CONTAINER], t[END_OFFSET] - 1), parent, clonedParent, prevSibling, clonedChild, clonedGrandParent, isFullySelected = next != t[END_CONTAINER];
+
+			if (next == root)
+				return _traverseNode(next, isFullySelected, FALSE, how);
+
+			parent = next.parentNode;
+			clonedParent = _traverseNode(parent, FALSE, FALSE, how);
+
+			while (parent) {
+				while (next) {
+					prevSibling = next.previousSibling;
+					clonedChild = _traverseNode(next, isFullySelected, FALSE, how);
+
+					if (how != DELETE)
+						clonedParent.insertBefore(clonedChild, clonedParent.firstChild);
+
+					isFullySelected = TRUE;
+					next = prevSibling;
+				}
+
+				if (parent == root)
+					return clonedParent;
+
+				next = parent.previousSibling;
+				parent = parent.parentNode;
+
+				clonedGrandParent = _traverseNode(parent, FALSE, FALSE, how);
+
+				if (how != DELETE)
+					clonedGrandParent.appendChild(clonedParent);
+
+				clonedParent = clonedGrandParent;
+			}
+		};
+
+		function _traverseLeftBoundary(root, how) {
+			var next = _getSelectedNode(t[START_CONTAINER], t[START_OFFSET]), isFullySelected = next != t[START_CONTAINER], parent, clonedParent, nextSibling, clonedChild, clonedGrandParent;
+
+			if (next == root)
+				return _traverseNode(next, isFullySelected, TRUE, how);
+
+			parent = next.parentNode;
+			clonedParent = _traverseNode(parent, FALSE, TRUE, how);
+
+			while (parent) {
+				while (next) {
+					nextSibling = next.nextSibling;
+					clonedChild = _traverseNode(next, isFullySelected, TRUE, how);
+
+					if (how != DELETE)
+						clonedParent.appendChild(clonedChild);
+
+					isFullySelected = TRUE;
+					next = nextSibling;
+				}
+
+				if (parent == root)
+					return clonedParent;
+
+				next = parent.nextSibling;
+				parent = parent.parentNode;
+
+				clonedGrandParent = _traverseNode(parent, FALSE, TRUE, how);
+
+				if (how != DELETE)
+					clonedGrandParent.appendChild(clonedParent);
+
+				clonedParent = clonedGrandParent;
+			}
+		};
+
+		function _traverseNode(n, isFullySelected, isLeft, how) {
+			var txtValue, newNodeValue, oldNodeValue, offset, newNode;
+
+			if (isFullySelected)
+				return _traverseFullySelected(n, how);
+
+			if (n.nodeType == 3 /* TEXT_NODE */) {
+				txtValue = n.nodeValue;
+
+				if (isLeft) {
+					offset = t[START_OFFSET];
+					newNodeValue = txtValue.substring(offset);
+					oldNodeValue = txtValue.substring(0, offset);
+				} else {
+					offset = t[END_OFFSET];
+					newNodeValue = txtValue.substring(0, offset);
+					oldNodeValue = txtValue.substring(offset);
+				}
+
+				if (how != CLONE)
+					n.nodeValue = oldNodeValue;
+
+				if (how == DELETE)
+					return;
+
+				newNode = dom.clone(n, FALSE);
+				newNode.nodeValue = newNodeValue;
+
+				return newNode;
+			}
+
+			if (how == DELETE)
+				return;
+
+			return dom.clone(n, FALSE);
+		};
+
+		function _traverseFullySelected(n, how) {
+			if (how != DELETE)
+				return how == CLONE ? dom.clone(n, TRUE) : n;
+
+			n.parentNode.removeChild(n);
+		};
+
+		function toStringIE() {
+			return dom.create('body', null, cloneContents()).outerText;
+		}
+		
+		return t;
+	};
+
+	ns.Range = Range;
+
+	// Older IE versions doesn't let you override toString by it's constructor so we have to stick it in the prototype
+	Range.prototype.toString = function() {
+		return this.toStringIE();
+	};
+})(tinymce.dom);
+
+(function() {
+	function Selection(selection) {
+		var self = this, dom = selection.dom, TRUE = true, FALSE = false;
+
+		function getPosition(rng, start) {
+			var checkRng, startIndex = 0, endIndex, inside,
+				children, child, offset, index, position = -1, parent;
+
+			// Setup test range, collapse it and get the parent
+			checkRng = rng.duplicate();
+			checkRng.collapse(start);
+			parent = checkRng.parentElement();
+
+			// Check if the selection is within the right document
+			if (parent.ownerDocument !== selection.dom.doc)
+				return;
+
+			// IE will report non editable elements as it's parent so look for an editable one
+			while (parent.contentEditable === "false") {
+				parent = parent.parentNode;
+			}
+
+			// If parent doesn't have any children then return that we are inside the element
+			if (!parent.hasChildNodes()) {
+				return {node : parent, inside : 1};
+			}
+
+			// Setup node list and endIndex
+			children = parent.children;
+			endIndex = children.length - 1;
+
+			// Perform a binary search for the position
+			while (startIndex <= endIndex) {
+				index = Math.floor((startIndex + endIndex) / 2);
+
+				// Move selection to node and compare the ranges
+				child = children[index];
+				checkRng.moveToElementText(child);
+				position = checkRng.compareEndPoints(start ? 'StartToStart' : 'EndToEnd', rng);
+
+				// Before/after or an exact match
+				if (position > 0) {
+					endIndex = index - 1;
+				} else if (position < 0) {
+					startIndex = index + 1;
+				} else {
+					return {node : child};
+				}
+			}
+
+			// Check if child position is before or we didn't find a position
+			if (position < 0) {
+				// No element child was found use the parent element and the offset inside that
+				if (!child) {
+					checkRng.moveToElementText(parent);
+					checkRng.collapse(true);
+					child = parent;
+					inside = true;
+				} else
+					checkRng.collapse(false);
+
+				// Walk character by character in text node until we hit the selected range endpoint, hit the end of document or parent isn't the right one
+				// We need to walk char by char since rng.text or rng.htmlText will trim line endings
+				offset = 0;
+				while (checkRng.compareEndPoints(start ? 'StartToStart' : 'StartToEnd', rng) !== 0) {
+					if (checkRng.move('character', 1) === 0 || parent != checkRng.parentElement()) {
+						break;
+					}
+
+					offset++;
+				}
+			} else {
+				// Child position is after the selection endpoint
+				checkRng.collapse(true);
+
+				// Walk character by character in text node until we hit the selected range endpoint, hit the end of document or parent isn't the right one
+				offset = 0;
+				while (checkRng.compareEndPoints(start ? 'StartToStart' : 'StartToEnd', rng) !== 0) {
+					if (checkRng.move('character', -1) === 0 || parent != checkRng.parentElement()) {
+						break;
+					}
+
+					offset++;
+				}
+			}
+
+			return {node : child, position : position, offset : offset, inside : inside};
+		};
+
+		// Returns a W3C DOM compatible range object by using the IE Range API
+		function getRange() {
+			var ieRange = selection.getRng(), domRange = dom.createRng(), element, collapsed, tmpRange, element2, bookmark, fail;
+
+			// If selection is outside the current document just return an empty range
+			element = ieRange.item ? ieRange.item(0) : ieRange.parentElement();
+			if (element.ownerDocument != dom.doc)
+				return domRange;
+
+			collapsed = selection.isCollapsed();
+
+			// Handle control selection
+			if (ieRange.item) {
+				domRange.setStart(element.parentNode, dom.nodeIndex(element));
+				domRange.setEnd(domRange.startContainer, domRange.startOffset + 1);
+
+				return domRange;
+			}
+
+			function findEndPoint(start) {
+				var endPoint = getPosition(ieRange, start), container, offset, textNodeOffset = 0, sibling, undef, nodeValue;
+
+				container = endPoint.node;
+				offset = endPoint.offset;
+
+				if (endPoint.inside && !container.hasChildNodes()) {
+					domRange[start ? 'setStart' : 'setEnd'](container, 0);
+					return;
+				}
+
+				if (offset === undef) {
+					domRange[start ? 'setStartBefore' : 'setEndAfter'](container);
+					return;
+				}
+
+				if (endPoint.position < 0) {
+					sibling = endPoint.inside ? container.firstChild : container.nextSibling;
+
+					if (!sibling) {
+						domRange[start ? 'setStartAfter' : 'setEndAfter'](container);
+						return;
+					}
+
+					if (!offset) {
+						if (sibling.nodeType == 3)
+							domRange[start ? 'setStart' : 'setEnd'](sibling, 0);
+						else
+							domRange[start ? 'setStartBefore' : 'setEndBefore'](sibling);
+
+						return;
+					}
+
+					// Find the text node and offset
+					while (sibling) {
+						nodeValue = sibling.nodeValue;
+						textNodeOffset += nodeValue.length;
+
+						// We are at or passed the position we where looking for
+						if (textNodeOffset >= offset) {
+							container = sibling;
+							textNodeOffset -= offset;
+							textNodeOffset = nodeValue.length - textNodeOffset;
+							break;
+						}
+
+						sibling = sibling.nextSibling;
+					}
+				} else {
+					// Find the text node and offset
+					sibling = container.previousSibling;
+
+					if (!sibling)
+						return domRange[start ? 'setStartBefore' : 'setEndBefore'](container);
+
+					// If there isn't any text to loop then use the first position
+					if (!offset) {
+						if (container.nodeType == 3)
+							domRange[start ? 'setStart' : 'setEnd'](sibling, container.nodeValue.length);
+						else
+							domRange[start ? 'setStartAfter' : 'setEndAfter'](sibling);
+
+						return;
+					}
+
+					while (sibling) {
+						textNodeOffset += sibling.nodeValue.length;
+
+						// We are at or passed the position we where looking for
+						if (textNodeOffset >= offset) {
+							container = sibling;
+							textNodeOffset -= offset;
+							break;
+						}
+
+						sibling = sibling.previousSibling;
+					}
+				}
+
+				domRange[start ? 'setStart' : 'setEnd'](container, textNodeOffset);
+			};
+
+			try {
+				// Find start point
+				findEndPoint(true);
+
+				// Find end point if needed
+				if (!collapsed)
+					findEndPoint();
+			} catch (ex) {
+				// IE has a nasty bug where text nodes might throw "invalid argument" when you
+				// access the nodeValue or other properties of text nodes. This seems to happend when
+				// text nodes are split into two nodes by a delete/backspace call. So lets detect it and try to fix it.
+				if (ex.number == -2147024809) {
+					// Get the current selection
+					bookmark = self.getBookmark(2);
+
+					// Get start element
+					tmpRange = ieRange.duplicate();
+					tmpRange.collapse(true);
+					element = tmpRange.parentElement();
+
+					// Get end element
+					if (!collapsed) {
+						tmpRange = ieRange.duplicate();
+						tmpRange.collapse(false);
+						element2 = tmpRange.parentElement();
+						element2.innerHTML = element2.innerHTML;
+					}
+
+					// Remove the broken elements
+					element.innerHTML = element.innerHTML;
+
+					// Restore the selection
+					self.moveToBookmark(bookmark);
+
+					// Since the range has moved we need to re-get it
+					ieRange = selection.getRng();
+
+					// Find start point
+					findEndPoint(true);
+
+					// Find end point if needed
+					if (!collapsed)
+						findEndPoint();
+				} else
+					throw ex; // Throw other errors
+			}
+
+			return domRange;
+		};
+
+		this.getBookmark = function(type) {
+			var rng = selection.getRng(), start, end, bookmark = {};
+
+			function getIndexes(node) {
+				var parent, root, children, i, indexes = [];
+
+				parent = node.parentNode;
+				root = dom.getRoot().parentNode;
+
+				while (parent != root && parent.nodeType !== 9) {
+					children = parent.children;
+
+					i = children.length;
+					while (i--) {
+						if (node === children[i]) {
+							indexes.push(i);
+							break;
+						}
+					}
+
+					node = parent;
+					parent = parent.parentNode;
+				}
+
+				return indexes;
+			};
+
+			function getBookmarkEndPoint(start) {
+				var position;
+
+				position = getPosition(rng, start);
+				if (position) {
+					return {
+						position : position.position,
+						offset : position.offset,
+						indexes : getIndexes(position.node),
+						inside : position.inside
+					};
+				}
+			};
+
+			// Non ubstructive bookmark
+			if (type === 2) {
+				// Handle text selection
+				if (!rng.item) {
+					bookmark.start = getBookmarkEndPoint(true);
+
+					if (!selection.isCollapsed())
+						bookmark.end = getBookmarkEndPoint();
+				} else
+					bookmark.start = {ctrl : true, indexes : getIndexes(rng.item(0))};
+			}
+
+			return bookmark;
+		};
+
+		this.moveToBookmark = function(bookmark) {
+			var rng, body = dom.doc.body;
+
+			function resolveIndexes(indexes) {
+				var node, i, idx, children;
+
+				node = dom.getRoot();
+				for (i = indexes.length - 1; i >= 0; i--) {
+					children = node.children;
+					idx = indexes[i];
+
+					if (idx <= children.length - 1) {
+						node = children[idx];
+					}
+				}
+
+				return node;
+			};
+			
+			function setBookmarkEndPoint(start) {
+				var endPoint = bookmark[start ? 'start' : 'end'], moveLeft, moveRng, undef;
+
+				if (endPoint) {
+					moveLeft = endPoint.position > 0;
+
+					moveRng = body.createTextRange();
+					moveRng.moveToElementText(resolveIndexes(endPoint.indexes));
+
+					offset = endPoint.offset;
+					if (offset !== undef) {
+						moveRng.collapse(endPoint.inside || moveLeft);
+						moveRng.moveStart('character', moveLeft ? -offset : offset);
+					} else
+						moveRng.collapse(start);
+
+					rng.setEndPoint(start ? 'StartToStart' : 'EndToStart', moveRng);
+
+					if (start)
+						rng.collapse(true);
+				}
+			};
+
+			if (bookmark.start) {
+				if (bookmark.start.ctrl) {
+					rng = body.createControlRange();
+					rng.addElement(resolveIndexes(bookmark.start.indexes));
+					rng.select();
+				} else {
+					rng = body.createTextRange();
+					setBookmarkEndPoint(true);
+					setBookmarkEndPoint();
+					rng.select();
+				}
+			}
+		};
+
+		this.addRange = function(rng) {
+			var ieRng, ctrlRng, startContainer, startOffset, endContainer, endOffset, sibling,
+				doc = selection.dom.doc, body = doc.body, nativeRng, ctrlElm;
+
+			function setEndPoint(start) {
+				var container, offset, marker, tmpRng, nodes;
+
+				marker = dom.create('a');
+				container = start ? startContainer : endContainer;
+				offset = start ? startOffset : endOffset;
+				tmpRng = ieRng.duplicate();
+
+				if (container == doc || container == doc.documentElement) {
+					container = body;
+					offset = 0;
+				}
+
+				if (container.nodeType == 3) {
+					container.parentNode.insertBefore(marker, container);
+					tmpRng.moveToElementText(marker);
+					tmpRng.moveStart('character', offset);
+					dom.remove(marker);
+					ieRng.setEndPoint(start ? 'StartToStart' : 'EndToEnd', tmpRng);
+				} else {
+					nodes = container.childNodes;
+
+					if (nodes.length) {
+						if (offset >= nodes.length) {
+							dom.insertAfter(marker, nodes[nodes.length - 1]);
+						} else {
+							container.insertBefore(marker, nodes[offset]);
+						}
+
+						tmpRng.moveToElementText(marker);
+					} else if (container.canHaveHTML) {
+						// Empty node selection for example <div>|</div>
+						// Setting innerHTML with a span marker then remove that marker seems to keep empty block elements open
+						container.innerHTML = '<span>\uFEFF</span>';
+						marker = container.firstChild;
+						tmpRng.moveToElementText(marker);
+						tmpRng.collapse(FALSE); // Collapse false works better than true for some odd reason
+					}
+
+					ieRng.setEndPoint(start ? 'StartToStart' : 'EndToEnd', tmpRng);
+					dom.remove(marker);
+				}
+			}
+
+			// Setup some shorter versions
+			startContainer = rng.startContainer;
+			startOffset = rng.startOffset;
+			endContainer = rng.endContainer;
+			endOffset = rng.endOffset;
+			ieRng = body.createTextRange();
+
+			// If single element selection then try making a control selection out of it
+			if (startContainer == endContainer && startContainer.nodeType == 1) {
+				// Trick to place the caret inside an empty block element like <p></p>
+				if (startOffset == endOffset && !startContainer.hasChildNodes()) {
+					if (startContainer.canHaveHTML) {
+						// Check if previous sibling is an empty block if it is then we need to render it
+						// IE would otherwise move the caret into the sibling instead of the empty startContainer see: #5236
+						// Example this: <p></p><p>|</p> would become this: <p>|</p><p></p>
+						sibling = startContainer.previousSibling;
+						if (sibling && !sibling.hasChildNodes() && dom.isBlock(sibling)) {
+							sibling.innerHTML = '\uFEFF';
+						} else {
+							sibling = null;
+						}
+
+						startContainer.innerHTML = '<span>\uFEFF</span><span>\uFEFF</span>';
+						ieRng.moveToElementText(startContainer.lastChild);
+						ieRng.select();
+						dom.doc.selection.clear();
+						startContainer.innerHTML = '';
+
+						if (sibling) {
+							sibling.innerHTML = '';
+						}
+						return;
+					} else {
+						startOffset = dom.nodeIndex(startContainer);
+						startContainer = startContainer.parentNode;
+					}
+				}
+
+				if (startOffset == endOffset - 1) {
+					try {
+						ctrlElm = startContainer.childNodes[startOffset];
+						ctrlRng = body.createControlRange();
+						ctrlRng.addElement(ctrlElm);
+						ctrlRng.select();
+
+						// Check if the range produced is on the correct element and is a control range
+						// On IE 8 it will select the parent contentEditable container if you select an inner element see: #5398
+						nativeRng = selection.getRng();
+						if (nativeRng.item && ctrlElm === nativeRng.item(0)) {
+							return;
+						}
+					} catch (ex) {
+						// Ignore
+					}
+				}
+			}
+
+			// Set start/end point of selection
+			setEndPoint(true);
+			setEndPoint();
+
+			// Select the new range and scroll it into view
+			ieRng.select();
+		};
+
+		// Expose range method
+		this.getRangeAt = getRange;
+	};
+
+	// Expose the selection object
+	tinymce.dom.TridentSelection = Selection;
+})();
+
+
+(function(tinymce) {
+	tinymce.dom.Element = function(id, settings) {
+		var t = this, dom, el;
+
+		t.settings = settings = settings || {};
+		t.id = id;
+		t.dom = dom = settings.dom || tinymce.DOM;
+
+		// Only IE leaks DOM references, this is a lot faster
+		if (!tinymce.isIE)
+			el = dom.get(t.id);
+
+		tinymce.each(
+				('getPos,getRect,getParent,add,setStyle,getStyle,setStyles,' + 
+				'setAttrib,setAttribs,getAttrib,addClass,removeClass,' + 
+				'hasClass,getOuterHTML,setOuterHTML,remove,show,hide,' + 
+				'isHidden,setHTML,get').split(/,/), function(k) {
+					t[k] = function() {
+						var a = [id], i;
+
+						for (i = 0; i < arguments.length; i++)
+							a.push(arguments[i]);
+
+						a = dom[k].apply(dom, a);
+						t.update(k);
+
+						return a;
+					};
+			}
+		);
+
+		tinymce.extend(t, {
+			on : function(n, f, s) {
+				return tinymce.dom.Event.add(t.id, n, f, s);
+			},
+
+			getXY : function() {
+				return {
+					x : parseInt(t.getStyle('left')),
+					y : parseInt(t.getStyle('top'))
+				};
+			},
+
+			getSize : function() {
+				var n = dom.get(t.id);
+
+				return {
+					w : parseInt(t.getStyle('width') || n.clientWidth),
+					h : parseInt(t.getStyle('height') || n.clientHeight)
+				};
+			},
+
+			moveTo : function(x, y) {
+				t.setStyles({left : x, top : y});
+			},
+
+			moveBy : function(x, y) {
+				var p = t.getXY();
+
+				t.moveTo(p.x + x, p.y + y);
+			},
+
+			resizeTo : function(w, h) {
+				t.setStyles({width : w, height : h});
+			},
+
+			resizeBy : function(w, h) {
+				var s = t.getSize();
+
+				t.resizeTo(s.w + w, s.h + h);
+			},
+
+			update : function(k) {
+				var b;
+
+				if (tinymce.isIE6 && settings.blocker) {
+					k = k || '';
+
+					// Ignore getters
+					if (k.indexOf('get') === 0 || k.indexOf('has') === 0 || k.indexOf('is') === 0)
+						return;
+
+					// Remove blocker on remove
+					if (k == 'remove') {
+						dom.remove(t.blocker);
+						return;
+					}
+
+					if (!t.blocker) {
+						t.blocker = dom.uniqueId();
+						b = dom.add(settings.container || dom.getRoot(), 'iframe', {id : t.blocker, style : 'position:absolute;', frameBorder : 0, src : 'javascript:""'});
+						dom.setStyle(b, 'opacity', 0);
+					} else
+						b = dom.get(t.blocker);
+
+					dom.setStyles(b, {
+						left : t.getStyle('left', 1),
+						top : t.getStyle('top', 1),
+						width : t.getStyle('width', 1),
+						height : t.getStyle('height', 1),
+						display : t.getStyle('display', 1),
+						zIndex : parseInt(t.getStyle('zIndex', 1) || 0) - 1
+					});
+				}
+			}
+		});
+	};
+})(tinymce);
+
+(function(tinymce) {
+	function trimNl(s) {
+		return s.replace(/[\n\r]+/g, '');
+	};
+
+	// Shorten names
+	var is = tinymce.is, isIE = tinymce.isIE, each = tinymce.each, TreeWalker = tinymce.dom.TreeWalker;
+
+	tinymce.create('tinymce.dom.Selection', {
+		Selection : function(dom, win, serializer, editor) {
+			var t = this;
+
+			t.dom = dom;
+			t.win = win;
+			t.serializer = serializer;
+			t.editor = editor;
+
+			// Add events
+			each([
+				'onBeforeSetContent',
+
+				'onBeforeGetContent',
+
+				'onSetContent',
+
+				'onGetContent'
+			], function(e) {
+				t[e] = new tinymce.util.Dispatcher(t);
+			});
+
+			// No W3C Range support
+			if (!t.win.getSelection)
+				t.tridentSel = new tinymce.dom.TridentSelection(t);
+
+			if (tinymce.isIE && ! tinymce.isIE11 && dom.boxModel)
+				this._fixIESelection();
+
+			// Prevent leaks
+			tinymce.addUnload(t.destroy, t);
+		},
+
+		setCursorLocation: function(node, offset) {
+			var t = this; var r = t.dom.createRng();
+			r.setStart(node, offset);
+			r.setEnd(node, offset);
+			t.setRng(r);
+			t.collapse(false);
+		},
+		getContent : function(s) {
+			var t = this, r = t.getRng(), e = t.dom.create("body"), se = t.getSel(), wb, wa, n;
+
+			s = s || {};
+			wb = wa = '';
+			s.get = true;
+			s.format = s.format || 'html';
+			s.forced_root_block = '';
+			t.onBeforeGetContent.dispatch(t, s);
+
+			if (s.format == 'text')
+				return t.isCollapsed() ? '' : (r.text || (se.toString ? se.toString() : ''));
+
+			if (r.cloneContents) {
+				n = r.cloneContents();
+
+				if (n)
+					e.appendChild(n);
+			} else if (is(r.item) || is(r.htmlText)) {
+				// IE will produce invalid markup if elements are present that
+				// it doesn't understand like custom elements or HTML5 elements.
+				// Adding a BR in front of the contents and then remoiving it seems to fix it though.
+				e.innerHTML = '<br>' + (r.item ? r.item(0).outerHTML : r.htmlText);
+				e.removeChild(e.firstChild);
+			} else
+				e.innerHTML = r.toString();
+
+			// Keep whitespace before and after
+			if (/^\s/.test(e.innerHTML))
+				wb = ' ';
+
+			if (/\s+$/.test(e.innerHTML))
+				wa = ' ';
+
+			s.getInner = true;
+
+			s.content = t.isCollapsed() ? '' : wb + t.serializer.serialize(e, s) + wa;
+			t.onGetContent.dispatch(t, s);
+
+			return s.content;
+		},
+
+		setContent : function(content, args) {
+			var self = this, rng = self.getRng(), caretNode, doc = self.win.document, frag, temp;
+
+			args = args || {format : 'html'};
+			args.set = true;
+			content = args.content = content;
+
+			// Dispatch before set content event
+			if (!args.no_events)
+				self.onBeforeSetContent.dispatch(self, args);
+
+			content = args.content;
+
+			if (rng.insertNode) {
+				// Make caret marker since insertNode places the caret in the beginning of text after insert
+				content += '<span id="__caret">_</span>';
+
+				// Delete and insert new node
+				if (rng.startContainer == doc && rng.endContainer == doc) {
+					// WebKit will fail if the body is empty since the range is then invalid and it can't insert contents
+					doc.body.innerHTML = content;
+				} else {
+					rng.deleteContents();
+
+					if (doc.body.childNodes.length === 0) {
+						doc.body.innerHTML = content;
+					} else {
+						// createContextualFragment doesn't exists in IE 9 DOMRanges
+						if (rng.createContextualFragment) {
+							rng.insertNode(rng.createContextualFragment(content));
+						} else {
+							// Fake createContextualFragment call in IE 9
+							frag = doc.createDocumentFragment();
+							temp = doc.createElement('div');
+
+							frag.appendChild(temp);
+							temp.outerHTML = content;
+
+							rng.insertNode(frag);
+						}
+					}
+				}
+
+				// Move to caret marker
+				caretNode = self.dom.get('__caret');
+
+				// Make sure we wrap it compleatly, Opera fails with a simple select call
+				rng = doc.createRange();
+				rng.setStartBefore(caretNode);
+				rng.setEndBefore(caretNode);
+				self.setRng(rng);
+
+				// Remove the caret position
+				self.dom.remove('__caret');
+
+				try {
+					self.setRng(rng);
+				} catch (ex) {
+					// Might fail on Opera for some odd reason
+				}
+			} else {
+				if (rng.item) {
+					// Delete content and get caret text selection
+					doc.execCommand('Delete', false, null);
+					rng = self.getRng();
+				}
+
+				// Explorer removes spaces from the beginning of pasted contents
+				if (/^\s+/.test(content)) {
+					rng.pasteHTML('<span id="__mce_tmp">_</span>' + content);
+					self.dom.remove('__mce_tmp');
+				} else
+					rng.pasteHTML(content);
+			}
+
+			// Dispatch set content event
+			if (!args.no_events)
+				self.onSetContent.dispatch(self, args);
+		},
+
+		getStart : function() {
+			var self = this, rng = self.getRng(), startElement, parentElement, checkRng, node;
+
+			if (rng.duplicate || rng.item) {
+				// Control selection, return first item
+				if (rng.item)
+					return rng.item(0);
+
+				// Get start element
+				checkRng = rng.duplicate();
+				checkRng.collapse(1);
+				startElement = checkRng.parentElement();
+				if (startElement.ownerDocument !== self.dom.doc) {
+					startElement = self.dom.getRoot();
+				}
+
+				// Check if range parent is inside the start element, then return the inner parent element
+				// This will fix issues when a single element is selected, IE would otherwise return the wrong start element
+				parentElement = node = rng.parentElement();
+				while (node = node.parentNode) {
+					if (node == startElement) {
+						startElement = parentElement;
+						break;
+					}
+				}
+
+				return startElement;
+			} else {
+				startElement = rng.startContainer;
+
+				if (startElement.nodeType == 1 && startElement.hasChildNodes())
+					startElement = startElement.childNodes[Math.min(startElement.childNodes.length - 1, rng.startOffset)];
+
+				if (startElement && startElement.nodeType == 3)
+					return startElement.parentNode;
+
+				return startElement;
+			}
+		},
+
+		getEnd : function() {
+			var self = this, rng = self.getRng(), endElement, endOffset;
+
+			if (rng.duplicate || rng.item) {
+				if (rng.item)
+					return rng.item(0);
+
+				rng = rng.duplicate();
+				rng.collapse(0);
+				endElement = rng.parentElement();
+				if (endElement.ownerDocument !== self.dom.doc) {
+					endElement = self.dom.getRoot();
+				}
+
+				if (endElement && endElement.nodeName == 'BODY')
+					return endElement.lastChild || endElement;
+
+				return endElement;
+			} else {
+				endElement = rng.endContainer;
+				endOffset = rng.endOffset;
+
+				if (endElement.nodeType == 1 && endElement.hasChildNodes())
+					endElement = endElement.childNodes[endOffset > 0 ? endOffset - 1 : endOffset];
+
+				if (endElement && endElement.nodeType == 3)
+					return endElement.parentNode;
+
+				return endElement;
+			}
+		},
+
+		getBookmark : function(type, normalized) {
+			var t = this, dom = t.dom, rng, rng2, id, collapsed, name, element, index, chr = '\uFEFF', styles;
+
+			function findIndex(name, element) {
+				var index = 0;
+
+				each(dom.select(name), function(node, i) {
+					if (node == element)
+						index = i;
+				});
+
+				return index;
+			};
+
+			function normalizeTableCellSelection(rng) {
+				function moveEndPoint(start) {
+					var container, offset, childNodes, prefix = start ? 'start' : 'end';
+
+					container = rng[prefix + 'Container'];
+					offset = rng[prefix + 'Offset'];
+
+					if (container.nodeType == 1 && container.nodeName == "TR") {
+						childNodes = container.childNodes;
+						container = childNodes[Math.min(start ? offset : offset - 1, childNodes.length - 1)];
+						if (container) {
+							offset = start ? 0 : container.childNodes.length;
+							rng['set' + (start ? 'Start' : 'End')](container, offset);
+						}
+					}
+				};
+
+				moveEndPoint(true);
+				moveEndPoint();
+
+				return rng;
+			};
+
+			function getLocation() {
+				var rng = t.getRng(true), root = dom.getRoot(), bookmark = {};
+
+				function getPoint(rng, start) {
+					var container = rng[start ? 'startContainer' : 'endContainer'],
+						offset = rng[start ? 'startOffset' : 'endOffset'], point = [], node, childNodes, after = 0;
+
+					if (container.nodeType == 3) {
+						if (normalized) {
+							for (node = container.previousSibling; node && node.nodeType == 3; node = node.previousSibling)
+								offset += node.nodeValue.length;
+						}
+
+						point.push(offset);
+					} else {
+						childNodes = container.childNodes;
+
+						if (offset >= childNodes.length && childNodes.length) {
+							after = 1;
+							offset = Math.max(0, childNodes.length - 1);
+						}
+
+						point.push(t.dom.nodeIndex(childNodes[offset], normalized) + after);
+					}
+
+					for (; container && container != root; container = container.parentNode)
+						point.push(t.dom.nodeIndex(container, normalized));
+
+					return point;
+				};
+
+				bookmark.start = getPoint(rng, true);
+
+				if (!t.isCollapsed())
+					bookmark.end = getPoint(rng);
+
+				return bookmark;
+			};
+
+			if (type == 2) {
+				if (t.tridentSel)
+					return t.tridentSel.getBookmark(type);
+
+				return getLocation();
+			}
+
+			// Handle simple range
+			if (type) {
+				rng = t.getRng();
+
+				if (rng.setStart) {
+					rng = {
+						startContainer: rng.startContainer,
+						startOffset: rng.startOffset,
+						endContainer: rng.endContainer,
+						endOffset: rng.endOffset
+					};
+				}
+
+				return {rng : rng};
+			}
+
+			rng = t.getRng();
+			id = dom.uniqueId();
+			collapsed = tinyMCE.activeEditor.selection.isCollapsed();
+			styles = 'overflow:hidden;line-height:0px';
+
+			// Explorer method
+			if (rng.duplicate || rng.item) {
+				// Text selection
+				if (!rng.item) {
+					rng2 = rng.duplicate();
+
+					try {
+						// Insert start marker
+						rng.collapse();
+						rng.pasteHTML('<span data-mce-type="bookmark" id="' + id + '_start" style="' + styles + '">' + chr + '</span>');
+
+						// Insert end marker
+						if (!collapsed) {
+							rng2.collapse(false);
+
+							// Detect the empty space after block elements in IE and move the end back one character <p></p>] becomes <p>]</p>
+							rng.moveToElementText(rng2.parentElement());
+							if (rng.compareEndPoints('StartToEnd', rng2) === 0)
+								rng2.move('character', -1);
+
+							rng2.pasteHTML('<span data-mce-type="bookmark" id="' + id + '_end" style="' + styles + '">' + chr + '</span>');
+						}
+					} catch (ex) {
+						// IE might throw unspecified error so lets ignore it
+						return null;
+					}
+				} else {
+					// Control selection
+					element = rng.item(0);
+					name = element.nodeName;
+
+					return {name : name, index : findIndex(name, element)};
+				}
+			} else {
+				element = t.getNode();
+				name = element.nodeName;
+				if (name == 'IMG')
+					return {name : name, index : findIndex(name, element)};
+
+				// W3C method
+				rng2 = normalizeTableCellSelection(rng.cloneRange());
+
+				// Insert end marker
+				if (!collapsed) {
+					rng2.collapse(false);
+					rng2.insertNode(dom.create('span', {'data-mce-type' : "bookmark", id : id + '_end', style : styles}, chr));
+				}
+
+				rng = normalizeTableCellSelection(rng);
+				rng.collapse(true);
+				rng.insertNode(dom.create('span', {'data-mce-type' : "bookmark", id : id + '_start', style : styles}, chr));
+			}
+
+			t.moveToBookmark({id : id, keep : 1});
+
+			return {id : id};
+		},
+
+		moveToBookmark : function(bookmark) {
+			var t = this, dom = t.dom, marker1, marker2, rng, rng2, root, startContainer, endContainer, startOffset, endOffset;
+
+			function setEndPoint(start) {
+				var point = bookmark[start ? 'start' : 'end'], i, node, offset, children;
+
+				if (point) {
+					offset = point[0];
+
+					// Find container node
+					for (node = root, i = point.length - 1; i >= 1; i--) {
+						children = node.childNodes;
+
+						if (point[i] > children.length - 1)
+							return;
+
+						node = children[point[i]];
+					}
+
+					// Move text offset to best suitable location
+					if (node.nodeType === 3)
+						offset = Math.min(point[0], node.nodeValue.length);
+
+					// Move element offset to best suitable location
+					if (node.nodeType === 1)
+						offset = Math.min(point[0], node.childNodes.length);
+
+					// Set offset within container node
+					if (start)
+						rng.setStart(node, offset);
+					else
+						rng.setEnd(node, offset);
+				}
+
+				return true;
+			};
+
+			function restoreEndPoint(suffix) {
+				var marker = dom.get(bookmark.id + '_' + suffix), node, idx, next, prev, keep = bookmark.keep;
+
+				if (marker) {
+					node = marker.parentNode;
+
+					if (suffix == 'start') {
+						if (!keep) {
+							idx = dom.nodeIndex(marker);
+						} else {
+							node = marker.firstChild;
+							idx = 1;
+						}
+
+						startContainer = endContainer = node;
+						startOffset = endOffset = idx;
+					} else {
+						if (!keep) {
+							idx = dom.nodeIndex(marker);
+						} else {
+							node = marker.firstChild;
+							idx = 1;
+						}
+
+						endContainer = node;
+						endOffset = idx;
+					}
+
+					if (!keep) {
+						prev = marker.previousSibling;
+						next = marker.nextSibling;
+
+						// Remove all marker text nodes
+						each(tinymce.grep(marker.childNodes), function(node) {
+							if (node.nodeType == 3)
+								node.nodeValue = node.nodeValue.replace(/\uFEFF/g, '');
+						});
+
+						// Remove marker but keep children if for example contents where inserted into the marker
+						// Also remove duplicated instances of the marker for example by a split operation or by WebKit auto split on paste feature
+						while (marker = dom.get(bookmark.id + '_' + suffix))
+							dom.remove(marker, 1);
+
+						// If siblings are text nodes then merge them unless it's Opera since it some how removes the node
+						// and we are sniffing since adding a lot of detection code for a browser with 3% of the market isn't worth the effort. Sorry, Opera but it's just a fact
+						if (prev && next && prev.nodeType == next.nodeType && prev.nodeType == 3 && !tinymce.isOpera) {
+							idx = prev.nodeValue.length;
+							prev.appendData(next.nodeValue);
+							dom.remove(next);
+
+							if (suffix == 'start') {
+								startContainer = endContainer = prev;
+								startOffset = endOffset = idx;
+							} else {
+								endContainer = prev;
+								endOffset = idx;
+							}
+						}
+					}
+				}
+			};
+
+			function addBogus(node) {
+				// Adds a bogus BR element for empty block elements
+				if (dom.isBlock(node) && !node.innerHTML && !isIE)
+					node.innerHTML = '<br data-mce-bogus="1" />';
+
+				return node;
+			};
+
+			if (bookmark) {
+				if (bookmark.start) {
+					rng = dom.createRng();
+					root = dom.getRoot();
+
+					if (t.tridentSel)
+						return t.tridentSel.moveToBookmark(bookmark);
+
+					if (setEndPoint(true) && setEndPoint()) {
+						t.setRng(rng);
+					}
+				} else if (bookmark.id) {
+					// Restore start/end points
+					restoreEndPoint('start');
+					restoreEndPoint('end');
+
+					if (startContainer) {
+						rng = dom.createRng();
+						rng.setStart(addBogus(startContainer), startOffset);
+						rng.setEnd(addBogus(endContainer), endOffset);
+						t.setRng(rng);
+					}
+				} else if (bookmark.name) {
+					t.select(dom.select(bookmark.name)[bookmark.index]);
+				} else if (bookmark.rng) {
+					rng = bookmark.rng;
+
+					if (rng.startContainer) {
+						rng2 = t.dom.createRng();
+
+						try {
+							rng2.setStart(rng.startContainer, rng.startOffset);
+							rng2.setEnd(rng.endContainer, rng.endOffset);
+						} catch (e) {
+							// Might fail with index error
+						}
+
+						rng = rng2;
+					}
+
+					t.setRng(rng);
+				}
+			}
+		},
+
+		select : function(node, content) {
+			var t = this, dom = t.dom, rng = dom.createRng(), idx;
+
+			function setPoint(node, start) {
+				var walker = new TreeWalker(node, node);
+
+				do {
+					// Text node
+					if (node.nodeType == 3 && tinymce.trim(node.nodeValue).length !== 0) {
+						if (start)
+							rng.setStart(node, 0);
+						else
+							rng.setEnd(node, node.nodeValue.length);
+
+						return;
+					}
+
+					// BR element
+					if (node.nodeName == 'BR') {
+						if (start)
+							rng.setStartBefore(node);
+						else
+							rng.setEndBefore(node);
+
+						return;
+					}
+				} while (node = (start ? walker.next() : walker.prev()));
+			};
+
+			if (node) {
+				idx = dom.nodeIndex(node);
+				rng.setStart(node.parentNode, idx);
+				rng.setEnd(node.parentNode, idx + 1);
+
+				// Find first/last text node or BR element
+				if (content) {
+					setPoint(node, 1);
+					setPoint(node);
+				}
+
+				t.setRng(rng);
+			}
+
+			return node;
+		},
+
+		isCollapsed : function() {
+			var t = this, r = t.getRng(), s = t.getSel();
+
+			if (!r || r.item)
+				return false;
+
+			if (r.compareEndPoints)
+				return r.compareEndPoints('StartToEnd', r) === 0;
+
+			return !s || r.collapsed;
+		},
+
+		collapse : function(to_start) {
+			var self = this, rng = self.getRng(), node;
+
+			// Control range on IE
+			if (rng.item) {
+				node = rng.item(0);
+				rng = self.win.document.body.createTextRange();
+				rng.moveToElementText(node);
+			}
+
+			rng.collapse(!!to_start);
+			self.setRng(rng);
+		},
+
+		getSel : function() {
+			var t = this, w = this.win;
+
+			return w.getSelection ? w.getSelection() : w.document.selection;
+		},
+
+		getRng : function(w3c) {
+			var self = this, selection, rng, elm, doc = self.win.document;
+
+			// Workaround for IE 11 not being able to select images properly see #6613 see quirk fix
+			if (self.fakeRng) {
+				return self.fakeRng;
+			}
+
+			// Found tridentSel object then we need to use that one
+			if (w3c && self.tridentSel) {
+				return self.tridentSel.getRangeAt(0);
+			}
+
+			try {
+				if (selection = self.getSel()) {
+					rng = selection.rangeCount > 0 ? selection.getRangeAt(0) : (selection.createRange ? selection.createRange() : doc.createRange());
+				}
+			} catch (ex) {
+				// IE throws unspecified error here if TinyMCE is placed in a frame/iframe
+			}
+
+			// We have W3C ranges and it's IE then fake control selection since IE9 doesn't handle that correctly yet
+			if (tinymce.isIE && ! tinymce.isIE11 && rng && rng.setStart && doc.selection.createRange().item) {
+				elm = doc.selection.createRange().item(0);
+				rng = doc.createRange();
+				rng.setStartBefore(elm);
+				rng.setEndAfter(elm);
+			}
+
+			// No range found then create an empty one
+			// This can occur when the editor is placed in a hidden container element on Gecko
+			// Or on IE when there was an exception
+			if (!rng) {
+				rng = doc.createRange ? doc.createRange() : doc.body.createTextRange();
+			}
+
+			// If range is at start of document then move it to start of body
+			if (rng.setStart && rng.startContainer.nodeType === 9 && rng.collapsed) {
+				elm = self.dom.getRoot();
+				rng.setStart(elm, 0);
+				rng.setEnd(elm, 0);
+			}
+
+			if (self.selectedRange && self.explicitRange) {
+				if (rng.compareBoundaryPoints(rng.START_TO_START, self.selectedRange) === 0 && rng.compareBoundaryPoints(rng.END_TO_END, self.selectedRange) === 0) {
+					// Safari, Opera and Chrome only ever select text which causes the range to change.
+					// This lets us use the originally set range if the selection hasn't been changed by the user.
+					rng = self.explicitRange;
+				} else {
+					self.selectedRange = null;
+					self.explicitRange = null;
+				}
+			}
+
+			return rng;
+		},
+
+		setRng : function(r, forward) {
+			var s, t = this;
+
+			if (!t.tridentSel) {
+				s = t.getSel();
+
+				if (s) {
+					t.explicitRange = r;
+
+					try {
+						s.removeAllRanges();
+					} catch (ex) {
+						// IE9 might throw errors here don't know why
+					}
+
+					s.addRange(r);
+
+					// Forward is set to false and we have an extend function
+					if (forward === false && s.extend) {
+						s.collapse(r.endContainer, r.endOffset);
+						s.extend(r.startContainer, r.startOffset);
+					}
+
+					// adding range isn't always successful so we need to check range count otherwise an exception can occur
+					t.selectedRange = s.rangeCount > 0 ? s.getRangeAt(0) : null;
+				}
+			} else {
+				// Is W3C Range
+				if (r.cloneRange) {
+					try {
+						t.tridentSel.addRange(r);
+						return;
+					} catch (ex) {
+						//IE9 throws an error here if called before selection is placed in the editor
+					}
+				}
+
+				// Is IE specific range
+				try {
+					r.select();
+				} catch (ex) {
+					// Needed for some odd IE bug #1843306
+				}
+			}
+		},
+
+		setNode : function(n) {
+			var t = this;
+
+			t.setContent(t.dom.getOuterHTML(n));
+
+			return n;
+		},
+
+		getNode : function() {
+			var t = this, rng = t.getRng(), sel = t.getSel(), elm, start = rng.startContainer, end = rng.endContainer;
+
+			function skipEmptyTextNodes(n, forwards) {
+				var orig = n;
+				while (n && n.nodeType === 3 && n.length === 0) {
+					n = forwards ? n.nextSibling : n.previousSibling;
+				}
+				return n || orig;
+			};
+
+			// Range maybe lost after the editor is made visible again
+			if (!rng)
+				return t.dom.getRoot();
+
+			if (rng.setStart) {
+				elm = rng.commonAncestorContainer;
+
+				// Handle selection a image or other control like element such as anchors
+				if (!rng.collapsed) {
+					if (rng.startContainer == rng.endContainer) {
+						if (rng.endOffset - rng.startOffset < 2) {
+							if (rng.startContainer.hasChildNodes())
+								elm = rng.startContainer.childNodes[rng.startOffset];
+						}
+					}
+
+					// If the anchor node is a element instead of a text node then return this element
+					//if (tinymce.isWebKit && sel.anchorNode && sel.anchorNode.nodeType == 1)
+					//	return sel.anchorNode.childNodes[sel.anchorOffset];
+
+					// Handle cases where the selection is immediately wrapped around a node and return that node instead of it's parent.
+					// This happens when you double click an underlined word in FireFox.
+					if (start.nodeType === 3 && end.nodeType === 3) {
+						if (start.length === rng.startOffset) {
+							start = skipEmptyTextNodes(start.nextSibling, true);
+						} else {
+							start = start.parentNode;
+						}
+						if (rng.endOffset === 0) {
+							end = skipEmptyTextNodes(end.previousSibling, false);
+						} else {
+							end = end.parentNode;
+						}
+
+						if (start && start === end)
+							return start;
+					}
+				}
+
+				if (elm && elm.nodeType == 3)
+					return elm.parentNode;
+
+				return elm;
+			}
+
+			return rng.item ? rng.item(0) : rng.parentElement();
+		},
+
+		getSelectedBlocks : function(st, en) {
+			var t = this, dom = t.dom, sb, eb, n, bl = [];
+
+			sb = dom.getParent(st || t.getStart(), dom.isBlock);
+			eb = dom.getParent(en || t.getEnd(), dom.isBlock);
+
+			if (sb)
+				bl.push(sb);
+
+			if (sb && eb && sb != eb) {
+				n = sb;
+
+				var walker = new TreeWalker(sb, dom.getRoot());
+				while ((n = walker.next()) && n != eb) {
+					if (dom.isBlock(n))
+						bl.push(n);
+				}
+			}
+
+			if (eb && sb != eb)
+				bl.push(eb);
+
+			return bl;
+		},
+
+		isForward: function(){
+			var dom = this.dom, sel = this.getSel(), anchorRange, focusRange;
+
+			// No support for selection direction then always return true
+			if (!sel || sel.anchorNode == null || sel.focusNode == null) {
+				return true;
+			}
+
+			anchorRange = dom.createRng();
+			anchorRange.setStart(sel.anchorNode, sel.anchorOffset);
+			anchorRange.collapse(true);
+
+			focusRange = dom.createRng();
+			focusRange.setStart(sel.focusNode, sel.focusOffset);
+			focusRange.collapse(true);
+
+			return anchorRange.compareBoundaryPoints(anchorRange.START_TO_START, focusRange) <= 0;
+		},
+
+		normalize : function() {
+			var self = this, rng, normalized, collapsed, node, sibling;
+
+			function normalizeEndPoint(start) {
+				var container, offset, walker, dom = self.dom, body = dom.getRoot(), node, nonEmptyElementsMap, nodeName;
+
+				function hasBrBeforeAfter(node, left) {
+					var walker = new TreeWalker(node, dom.getParent(node.parentNode, dom.isBlock) || body);
+
+					while (node = walker[left ? 'prev' : 'next']()) {
+						if (node.nodeName === "BR") {
+							return true;
+						}
+					}
+				};
+
+				// Walks the dom left/right to find a suitable text node to move the endpoint into
+				// It will only walk within the current parent block or body and will stop if it hits a block or a BR/IMG
+				function findTextNodeRelative(left, startNode) {
+					var walker, lastInlineElement;
+
+					startNode = startNode || container;
+					walker = new TreeWalker(startNode, dom.getParent(startNode.parentNode, dom.isBlock) || body);
+
+					// Walk left until we hit a text node we can move to or a block/br/img
+					while (node = walker[left ? 'prev' : 'next']()) {
+						// Found text node that has a length
+						if (node.nodeType === 3 && node.nodeValue.length > 0) {
+							container = node;
+							offset = left ? node.nodeValue.length : 0;
+							normalized = true;
+							return;
+						}
+
+						// Break if we find a block or a BR/IMG/INPUT etc
+						if (dom.isBlock(node) || nonEmptyElementsMap[node.nodeName.toLowerCase()]) {
+							return;
+						}
+
+						lastInlineElement = node;
+					}
+
+					// Only fetch the last inline element when in caret mode for now
+					if (collapsed && lastInlineElement) {
+						container = lastInlineElement;
+						normalized = true;
+						offset = 0;
+					}
+				};
+
+				container = rng[(start ? 'start' : 'end') + 'Container'];
+				offset = rng[(start ? 'start' : 'end') + 'Offset'];
+				nonEmptyElementsMap = dom.schema.getNonEmptyElements();
+
+				// If the container is a document move it to the body element
+				if (container.nodeType === 9) {
+					container = dom.getRoot();
+					offset = 0;
+				}
+
+				// If the container is body try move it into the closest text node or position
+				if (container === body) {
+					// If start is before/after a image, table etc
+					if (start) {
+						node = container.childNodes[offset > 0 ? offset - 1 : 0];
+						if (node) {
+							nodeName = node.nodeName.toLowerCase();
+							if (nonEmptyElementsMap[node.nodeName] || node.nodeName == "TABLE") {
+								return;
+							}
+						}
+					}
+
+					// Resolve the index
+					if (container.hasChildNodes()) {
+						container = container.childNodes[Math.min(!start && offset > 0 ? offset - 1 : offset, container.childNodes.length - 1)];
+						offset = 0;
+
+						// Don't walk into elements that doesn't have any child nodes like a IMG
+						if (container.hasChildNodes() && !/TABLE/.test(container.nodeName)) {
+							// Walk the DOM to find a text node to place the caret at or a BR
+							node = container;
+							walker = new TreeWalker(container, body);
+
+							do {
+								// Found a text node use that position
+								if (node.nodeType === 3 && node.nodeValue.length > 0) {
+									offset = start ? 0 : node.nodeValue.length;
+									container = node;
+									normalized = true;
+									break;
+								}
+
+								// Found a BR/IMG element that we can place the caret before
+								if (nonEmptyElementsMap[node.nodeName.toLowerCase()]) {
+									offset = dom.nodeIndex(node);
+									container = node.parentNode;
+
+									// Put caret after image when moving the end point
+									if (node.nodeName ==  "IMG" && !start) {
+										offset++;
+									}
+
+									normalized = true;
+									break;
+								}
+							} while (node = (start ? walker.next() : walker.prev()));
+						}
+					}
+				}
+
+				// Lean the caret to the left if possible
+				if (collapsed) {
+					// So this: <b>x</b><i>|x</i>
+					// Becomes: <b>x|</b><i>x</i>
+					// Seems that only gecko has issues with this
+					if (container.nodeType === 3 && offset === 0) {
+						findTextNodeRelative(true);
+					}
+
+					// Lean left into empty inline elements when the caret is before a BR
+					// So this: <i><b></b><i>|<br></i>
+					// Becomes: <i><b>|</b><i><br></i>
+					// Seems that only gecko has issues with this
+					if (container.nodeType === 1) {
+						node = container.childNodes[offset];
+						if(node && node.nodeName === 'BR' && !hasBrBeforeAfter(node) && !hasBrBeforeAfter(node, true)) {
+							findTextNodeRelative(true, container.childNodes[offset]);
+						}
+					}
+				}
+
+				// Lean the start of the selection right if possible
+				// So this: x[<b>x]</b>
+				// Becomes: x<b>[x]</b>
+				if (start && !collapsed && container.nodeType === 3 && offset === container.nodeValue.length) {
+					findTextNodeRelative(false);
+				}
+
+				// Set endpoint if it was normalized
+				if (normalized)
+					rng['set' + (start ? 'Start' : 'End')](container, offset);
+			};
+
+			// Normalize only on non IE browsers for now
+			if (tinymce.isIE)
+				return;
+			
+			rng = self.getRng();
+			collapsed = rng.collapsed;
+
+			// Normalize the end points
+			normalizeEndPoint(true);
+
+			if (!collapsed)
+				normalizeEndPoint();
+
+			// Set the selection if it was normalized
+			if (normalized) {
+				// If it was collapsed then make sure it still is
+				if (collapsed) {
+					rng.collapse(true);
+				}
+
+				//console.log(self.dom.dumpRng(rng));
+				self.setRng(rng, self.isForward());
+			}
+		},
+
+		selectorChanged: function(selector, callback) {
+			var self = this, currentSelectors;
+
+			if (!self.selectorChangedData) {
+				self.selectorChangedData = {};
+				currentSelectors = {};
+
+				self.editor.onNodeChange.addToTop(function(ed, cm, node) {
+					var dom = self.dom, parents = dom.getParents(node, null, dom.getRoot()), matchedSelectors = {};
+
+					// Check for new matching selectors
+					each(self.selectorChangedData, function(callbacks, selector) {
+						each(parents, function(node) {
+							if (dom.is(node, selector)) {
+								if (!currentSelectors[selector]) {
+									// Execute callbacks
+									each(callbacks, function(callback) {
+										callback(true, {node: node, selector: selector, parents: parents});
+									});
+
+									currentSelectors[selector] = callbacks;
+								}
+
+								matchedSelectors[selector] = callbacks;
+								return false;
+							}
+						});
+					});
+
+					// Check if current selectors still match
+					each(currentSelectors, function(callbacks, selector) {
+						if (!matchedSelectors[selector]) {
+							delete currentSelectors[selector];
+
+							each(callbacks, function(callback) {
+								callback(false, {node: node, selector: selector, parents: parents});
+							});
+						}
+					});
+				});
+			}
+
+			// Add selector listeners
+			if (!self.selectorChangedData[selector]) {
+				self.selectorChangedData[selector] = [];
+			}
+
+			self.selectorChangedData[selector].push(callback);
+
+			return self;
+		},
+
+		scrollIntoView: function(elm) {
+			var y, viewPort, self = this, dom = self.dom;
+
+			viewPort = dom.getViewPort(self.editor.getWin());
+			y = dom.getPos(elm).y;
+			if (y < viewPort.y || y + 25 > viewPort.y + viewPort.h) {
+				self.editor.getWin().scrollTo(0, y < viewPort.y ? y : y - viewPort.h + 25);
+			}
+		},
+
+		destroy : function(manual) {
+			var self = this;
+
+			self.win = null;
+
+			// Manual destroy then remove unload handler
+			if (!manual)
+				tinymce.removeUnload(self.destroy);
+		},
+
+		// IE has an issue where you can't select/move the caret by clicking outside the body if the document is in standards mode
+		_fixIESelection : function() {
+			var dom = this.dom, doc = dom.doc, body = doc.body, started, startRng, htmlElm;
+
+			// Return range from point or null if it failed
+			function rngFromPoint(x, y) {
+				var rng = body.createTextRange();
+
+				try {
+					rng.moveToPoint(x, y);
+				} catch (ex) {
+					// IE sometimes throws and exception, so lets just ignore it
+					rng = null;
+				}
+
+				return rng;
+			};
+
+			// Fires while the selection is changing
+			function selectionChange(e) {
+				var pointRng;
+
+				// Check if the button is down or not
+				if (e.button) {
+					// Create range from mouse position
+					pointRng = rngFromPoint(e.x, e.y);
+
+					if (pointRng) {
+						// Check if pointRange is before/after selection then change the endPoint
+						if (pointRng.compareEndPoints('StartToStart', startRng) > 0)
+							pointRng.setEndPoint('StartToStart', startRng);
+						else
+							pointRng.setEndPoint('EndToEnd', startRng);
+
+						pointRng.select();
+					}
+				} else
+					endSelection();
+			}
+
+			// Removes listeners
+			function endSelection() {
+				var rng = doc.selection.createRange();
+
+				// If the range is collapsed then use the last start range
+				if (startRng && !rng.item && rng.compareEndPoints('StartToEnd', rng) === 0)
+					startRng.select();
+
+				dom.unbind(doc, 'mouseup', endSelection);
+				dom.unbind(doc, 'mousemove', selectionChange);
+				startRng = started = 0;
+			};
+
+			// Make HTML element unselectable since we are going to handle selection by hand
+			doc.documentElement.unselectable = true;
+			
+			// Detect when user selects outside BODY
+			dom.bind(doc, ['mousedown', 'contextmenu'], function(e) {
+				if (e.target.nodeName === 'HTML') {
+					if (started)
+						endSelection();
+
+					// Detect vertical scrollbar, since IE will fire a mousedown on the scrollbar and have target set as HTML
+					htmlElm = doc.documentElement;
+					if (htmlElm.scrollHeight > htmlElm.clientHeight)
+						return;
+
+					started = 1;
+					// Setup start position
+					startRng = rngFromPoint(e.x, e.y);
+					if (startRng) {
+						// Listen for selection change events
+						dom.bind(doc, 'mouseup', endSelection);
+						dom.bind(doc, 'mousemove', selectionChange);
+
+						dom.win.focus();
+						startRng.select();
+					}
+				}
+			});
+		}
+	});
+})(tinymce);
+
+(function(tinymce) {
+	tinymce.dom.Serializer = function(settings, dom, schema) {
+		var onPreProcess, onPostProcess, isIE = tinymce.isIE, each = tinymce.each, htmlParser;
+
+		// Support the old apply_source_formatting option
+		if (!settings.apply_source_formatting)
+			settings.indent = false;
+
+		// Default DOM and Schema if they are undefined
+		dom = dom || tinymce.DOM;
+		schema = schema || new tinymce.html.Schema(settings);
+		settings.entity_encoding = settings.entity_encoding || 'named';
+		settings.remove_trailing_brs = "remove_trailing_brs" in settings ? settings.remove_trailing_brs : true;
+
+		onPreProcess = new tinymce.util.Dispatcher(self);
+
+		onPostProcess = new tinymce.util.Dispatcher(self);
+
+		htmlParser = new tinymce.html.DomParser(settings, schema);
+
+		// Convert move data-mce-src, data-mce-href and data-mce-style into nodes or process them if needed
+		htmlParser.addAttributeFilter('src,href,style', function(nodes, name) {
+			var i = nodes.length, node, value, internalName = 'data-mce-' + name, urlConverter = settings.url_converter, urlConverterScope = settings.url_converter_scope, undef;
+
+			while (i--) {
+				node = nodes[i];
+
+				value = node.attributes.map[internalName];
+				if (value !== undef) {
+					// Set external name to internal value and remove internal
+					node.attr(name, value.length > 0 ? value : null);
+					node.attr(internalName, null);
+				} else {
+					// No internal attribute found then convert the value we have in the DOM
+					value = node.attributes.map[name];
+
+					if (name === "style")
+						value = dom.serializeStyle(dom.parseStyle(value), node.name);
+					else if (urlConverter)
+						value = urlConverter.call(urlConverterScope, value, name, node.name);
+
+					node.attr(name, value.length > 0 ? value : null);
+				}
+			}
+		});
+
+		// Remove internal classes mceItem<..> or mceSelected
+		htmlParser.addAttributeFilter('class', function(nodes, name) {
+			var i = nodes.length, node, value;
+
+			while (i--) {
+				node = nodes[i];
+				value = node.attr('class').replace(/(?:^|\s)mce(Item\w+|Selected)(?!\S)/g, '');
+				node.attr('class', value.length > 0 ? value : null);
+			}
+		});
+
+		// Remove bookmark elements
+		htmlParser.addAttributeFilter('data-mce-type', function(nodes, name, args) {
+			var i = nodes.length, node;
+
+			while (i--) {
+				node = nodes[i];
+
+				if (node.attributes.map['data-mce-type'] === 'bookmark' && !args.cleanup)
+					node.remove();
+			}
+		});
+
+		// Remove expando attributes
+		htmlParser.addAttributeFilter('data-mce-expando', function(nodes, name, args) {
+			var i = nodes.length;
+
+			while (i--) {
+				nodes[i].attr(name, null);
+			}
+		});
+
+		htmlParser.addNodeFilter('noscript', function(nodes) {
+			var i = nodes.length, node;
+
+			while (i--) {
+				node = nodes[i].firstChild;
+
+				if (node) {
+					node.value = tinymce.html.Entities.decode(node.value);
+				}
+			}
+		});
+
+		// Force script into CDATA sections and remove the mce- prefix also add comments around styles
+		htmlParser.addNodeFilter('script,style', function(nodes, name) {
+			var i = nodes.length, node, value;
+
+			function trim(value) {
+				return value.replace(/(<!--\[CDATA\[|\]\]-->)/g, '\n')
+						.replace(/^[\r\n]*|[\r\n]*$/g, '')
+						.replace(/^\s*((<!--)?(\s*\/\/)?\s*<!\[CDATA\[|(<!--\s*)?\/\*\s*<!\[CDATA\[\s*\*\/|(\/\/)?\s*<!--|\/\*\s*<!--\s*\*\/)\s*[\r\n]*/gi, '')
+						.replace(/\s*(\/\*\s*\]\]>\s*\*\/(-->)?|\s*\/\/\s*\]\]>(-->)?|\/\/\s*(-->)?|\]\]>|\/\*\s*-->\s*\*\/|\s*-->\s*)\s*$/g, '');
+			};
+
+			while (i--) {
+				node = nodes[i];
+				value = node.firstChild ? node.firstChild.value : '';
+
+				if (name === "script") {
+					// Remove mce- prefix from script elements
+					node.attr('type', (node.attr('type') || 'text/javascript').replace(/^mce\-/, ''));
+
+					if (value.length > 0)
+						node.firstChild.value = '// <![CDATA[\n' + trim(value) + '\n// ]]>';
+				} else {
+					if (value.length > 0)
+						node.firstChild.value = '<!--\n' + trim(value) + '\n-->';
+				}
+			}
+		});
+
+		// Convert comments to cdata and handle protected comments
+		htmlParser.addNodeFilter('#comment', function(nodes, name) {
+			var i = nodes.length, node;
+
+			while (i--) {
+				node = nodes[i];
+
+				if (node.value.indexOf('[CDATA[') === 0) {
+					node.name = '#cdata';
+					node.type = 4;
+					node.value = node.value.replace(/^\[CDATA\[|\]\]$/g, '');
+				} else if (node.value.indexOf('mce:protected ') === 0) {
+					node.name = "#text";
+					node.type = 3;
+					node.raw = true;
+					node.value = unescape(node.value).substr(14);
+				}
+			}
+		});
+
+		htmlParser.addNodeFilter('xml:namespace,input', function(nodes, name) {
+			var i = nodes.length, node;
+
+			while (i--) {
+				node = nodes[i];
+				if (node.type === 7)
+					node.remove();
+				else if (node.type === 1) {
+					if (name === "input" && !("type" in node.attributes.map))
+						node.attr('type', 'text');
+				}
+			}
+		});
+
+		// Fix list elements, TODO: Replace this later
+		if (settings.fix_list_elements) {
+			htmlParser.addNodeFilter('ul,ol', function(nodes, name) {
+				var i = nodes.length, node, parentNode;
+
+				while (i--) {
+					node = nodes[i];
+					parentNode = node.parent;
+
+					if (parentNode.name === 'ul' || parentNode.name === 'ol') {
+						if (node.prev && node.prev.name === 'li') {
+							node.prev.append(node);
+						}
+					}
+				}
+			});
+		}
+
+		// Remove internal data attributes
+		htmlParser.addAttributeFilter('data-mce-src,data-mce-href,data-mce-style', function(nodes, name) {
+			var i = nodes.length;
+
+			while (i--) {
+				nodes[i].attr(name, null);
+			}
+		});
+
+		// Return public methods
+		return {
+			schema : schema,
+
+			addNodeFilter : htmlParser.addNodeFilter,
+
+			addAttributeFilter : htmlParser.addAttributeFilter,
+
+			onPreProcess : onPreProcess,
+
+			onPostProcess : onPostProcess,
+
+			serialize : function(node, args) {
+				var impl, doc, oldDoc, htmlSerializer, content;
+
+				// Explorer won't clone contents of script and style and the
+				// selected index of select elements are cleared on a clone operation.
+				if (isIE && dom.select('script,style,select,map').length > 0) {
+					content = node.innerHTML;
+					node = node.cloneNode(false);
+					dom.setHTML(node, content);
+				} else
+					node = node.cloneNode(true);
+
+				// Nodes needs to be attached to something in WebKit/Opera
+				// Older builds of Opera crashes if you attach the node to an document created dynamically
+				// and since we can't feature detect a crash we need to sniff the acutal build number
+				// This fix will make DOM ranges and make Sizzle happy!
+				impl = node.ownerDocument.implementation;
+				if (impl.createHTMLDocument) {
+					// Create an empty HTML document
+					doc = impl.createHTMLDocument("");
+
+					// Add the element or it's children if it's a body element to the new document
+					each(node.nodeName == 'BODY' ? node.childNodes : [node], function(node) {
+						doc.body.appendChild(doc.importNode(node, true));
+					});
+
+					// Grab first child or body element for serialization
+					if (node.nodeName != 'BODY')
+						node = doc.body.firstChild;
+					else
+						node = doc.body;
+
+					// set the new document in DOMUtils so createElement etc works
+					oldDoc = dom.doc;
+					dom.doc = doc;
+				}
+
+				args = args || {};
+				args.format = args.format || 'html';
+
+				// Pre process
+				if (!args.no_events) {
+					args.node = node;
+					onPreProcess.dispatch(self, args);
+				}
+
+				// Setup serializer
+				htmlSerializer = new tinymce.html.Serializer(settings, schema);
+
+				// Parse and serialize HTML
+				args.content = htmlSerializer.serialize(
+					htmlParser.parse(tinymce.trim(args.getInner ? node.innerHTML : dom.getOuterHTML(node)), args)
+				);
+
+				// Replace all BOM characters for now until we can find a better solution
+				if (!args.cleanup)
+					args.content = args.content.replace(/\uFEFF/g, '');
+
+				// Post process
+				if (!args.no_events)
+					onPostProcess.dispatch(self, args);
+
+				// Restore the old document if it was changed
+				if (oldDoc)
+					dom.doc = oldDoc;
+
+				args.node = null;
+
+				return args.content;
+			},
+
+			addRules : function(rules) {
+				schema.addValidElements(rules);
+			},
+
+			setRules : function(rules) {
+				schema.setValidElements(rules);
+			}
+		};
+	};
+})(tinymce);
+(function(tinymce) {
+	tinymce.dom.ScriptLoader = function(settings) {
+		var QUEUED = 0,
+			LOADING = 1,
+			LOADED = 2,
+			states = {},
+			queue = [],
+			scriptLoadedCallbacks = {},
+			queueLoadedCallbacks = [],
+			loading = 0,
+			undef;
+
+		function loadScript(url, callback) {
+			var t = this, dom = tinymce.DOM, elm, uri, loc, id;
+
+			// Execute callback when script is loaded
+			function done() {
+				dom.remove(id);
+
+				if (elm)
+					elm.onreadystatechange = elm.onload = elm = null;
+
+				callback();
+			};
+			
+			function error() {
+				// Report the error so it's easier for people to spot loading errors
+				if (typeof(console) !== "undefined" && console.log)
+					console.log("Failed to load: " + url);
+
+				// We can't mark it as done if there is a load error since
+				// A) We don't want to produce 404 errors on the server and
+				// B) the onerror event won't fire on all browsers.
+				// done();
+			};
+
+			id = dom.uniqueId();
+
+			if (tinymce.isIE6) {
+				uri = new tinymce.util.URI(url);
+				loc = location;
+
+				// If script is from same domain and we
+				// use IE 6 then use XHR since it's more reliable
+				if (uri.host == loc.hostname && uri.port == loc.port && (uri.protocol + ':') == loc.protocol && uri.protocol.toLowerCase() != 'file') {
+					tinymce.util.XHR.send({
+						url : tinymce._addVer(uri.getURI()),
+						success : function(content) {
+							// Create new temp script element
+							var script = dom.create('script', {
+								type : 'text/javascript'
+							});
+
+							// Evaluate script in global scope
+							script.text = content;
+							document.getElementsByTagName('head')[0].appendChild(script);
+							dom.remove(script);
+
+							done();
+						},
+						
+						error : error
+					});
+
+					return;
+				}
+			}
+
+			// Create new script element
+			elm = document.createElement('script');
+			elm.id = id;
+			elm.type = 'text/javascript';
+			elm.src = tinymce._addVer(url);
+
+			// Add onload listener for non IE browsers since IE9
+			// fires onload event before the script is parsed and executed
+			if (!tinymce.isIE || tinymce.isIE11)
+				elm.onload = done;
+
+			// Add onerror event will get fired on some browsers but not all of them
+			elm.onerror = error;
+
+			// Opera 9.60 doesn't seem to fire the onreadystate event at correctly
+			if (!tinymce.isOpera) {
+				elm.onreadystatechange = function() {
+					var state = elm.readyState;
+
+					// Loaded state is passed on IE 6 however there
+					// are known issues with this method but we can't use
+					// XHR in a cross domain loading
+					if (state == 'complete' || state == 'loaded')
+						done();
+				};
+			}
+
+			// Most browsers support this feature so we report errors
+			// for those at least to help users track their missing plugins etc
+			// todo: Removed since it produced error if the document is unloaded by navigating away, re-add it as an option
+			/*elm.onerror = function() {
+				alert('Failed to load: ' + url);
+			};*/
+
+			// Add script to document
+			(document.getElementsByTagName('head')[0] || document.body).appendChild(elm);
+		};
+
+		this.isDone = function(url) {
+			return states[url] == LOADED;
+		};
+
+		this.markDone = function(url) {
+			states[url] = LOADED;
+		};
+
+		this.add = this.load = function(url, callback, scope) {
+			var item, state = states[url];
+
+			// Add url to load queue
+			if (state == undef) {
+				queue.push(url);
+				states[url] = QUEUED;
+			}
+
+			if (callback) {
+				// Store away callback for later execution
+				if (!scriptLoadedCallbacks[url])
+					scriptLoadedCallbacks[url] = [];
+
+				scriptLoadedCallbacks[url].push({
+					func : callback,
+					scope : scope || this
+				});
+			}
+		};
+
+		this.loadQueue = function(callback, scope) {
+			this.loadScripts(queue, callback, scope);
+		};
+
+		this.loadScripts = function(scripts, callback, scope) {
+			var loadScripts;
+
+			function execScriptLoadedCallbacks(url) {
+				// Execute URL callback functions
+				tinymce.each(scriptLoadedCallbacks[url], function(callback) {
+					callback.func.call(callback.scope);
+				});
+
+				scriptLoadedCallbacks[url] = undef;
+			};
+
+			queueLoadedCallbacks.push({
+				func : callback,
+				scope : scope || this
+			});
+
+			loadScripts = function() {
+				var loadingScripts = tinymce.grep(scripts);
+
+				// Current scripts has been handled
+				scripts.length = 0;
+
+				// Load scripts that needs to be loaded
+				tinymce.each(loadingScripts, function(url) {
+					// Script is already loaded then execute script callbacks directly
+					if (states[url] == LOADED) {
+						execScriptLoadedCallbacks(url);
+						return;
+					}
+
+					// Is script not loading then start loading it
+					if (states[url] != LOADING) {
+						states[url] = LOADING;
+						loading++;
+
+						loadScript(url, function() {
+							states[url] = LOADED;
+							loading--;
+
+							execScriptLoadedCallbacks(url);
+
+							// Load more scripts if they where added by the recently loaded script
+							loadScripts();
+						});
+					}
+				});
+
+				// No scripts are currently loading then execute all pending queue loaded callbacks
+				if (!loading) {
+					tinymce.each(queueLoadedCallbacks, function(callback) {
+						callback.func.call(callback.scope);
+					});
+
+					queueLoadedCallbacks.length = 0;
+				}
+			};
+
+			loadScripts();
+		};
+	};
+
+	// Global script loader
+	tinymce.ScriptLoader = new tinymce.dom.ScriptLoader();
+})(tinymce);
+
+(function(tinymce) {
+	tinymce.dom.RangeUtils = function(dom) {
+		var INVISIBLE_CHAR = '\uFEFF';
+
+		this.walk = function(rng, callback) {
+			var startContainer = rng.startContainer,
+				startOffset = rng.startOffset,
+				endContainer = rng.endContainer,
+				endOffset = rng.endOffset,
+				ancestor, startPoint,
+				endPoint, node, parent, siblings, nodes;
+
+			// Handle table cell selection the table plugin enables
+			// you to fake select table cells and perform formatting actions on them
+			nodes = dom.select('td.mceSelected,th.mceSelected');
+			if (nodes.length > 0) {
+				tinymce.each(nodes, function(node) {
+					callback([node]);
+				});
+
+				return;
+			}
+
+			function exclude(nodes) {
+				var node;
+
+				// First node is excluded
+				node = nodes[0];
+				if (node.nodeType === 3 && node === startContainer && startOffset >= node.nodeValue.length) {
+					nodes.splice(0, 1);
+				}
+
+				// Last node is excluded
+				node = nodes[nodes.length - 1];
+				if (endOffset === 0 && nodes.length > 0 && node === endContainer && node.nodeType === 3) {
+					nodes.splice(nodes.length - 1, 1);
+				}
+
+				return nodes;
+			};
+
+			function collectSiblings(node, name, end_node) {
+				var siblings = [];
+
+				for (; node && node != end_node; node = node[name])
+					siblings.push(node);
+
+				return siblings;
+			};
+
+			function findEndPoint(node, root) {
+				do {
+					if (node.parentNode == root)
+						return node;
+
+					node = node.parentNode;
+				} while(node);
+			};
+
+			function walkBoundary(start_node, end_node, next) {
+				var siblingName = next ? 'nextSibling' : 'previousSibling';
+
+				for (node = start_node, parent = node.parentNode; node && node != end_node; node = parent) {
+					parent = node.parentNode;
+					siblings = collectSiblings(node == start_node ? node : node[siblingName], siblingName);
+
+					if (siblings.length) {
+						if (!next)
+							siblings.reverse();
+
+						callback(exclude(siblings));
+					}
+				}
+			};
+
+			// If index based start position then resolve it
+			if (startContainer.nodeType == 1 && startContainer.hasChildNodes())
+				startContainer = startContainer.childNodes[startOffset];
+
+			// If index based end position then resolve it
+			if (endContainer.nodeType == 1 && endContainer.hasChildNodes())
+				endContainer = endContainer.childNodes[Math.min(endOffset - 1, endContainer.childNodes.length - 1)];
+
+			// Same container
+			if (startContainer == endContainer)
+				return callback(exclude([startContainer]));
+
+			// Find common ancestor and end points
+			ancestor = dom.findCommonAncestor(startContainer, endContainer);
+				
+			// Process left side
+			for (node = startContainer; node; node = node.parentNode) {
+				if (node === endContainer)
+					return walkBoundary(startContainer, ancestor, true);
+
+				if (node === ancestor)
+					break;
+			}
+
+			// Process right side
+			for (node = endContainer; node; node = node.parentNode) {
+				if (node === startContainer)
+					return walkBoundary(endContainer, ancestor);
+
+				if (node === ancestor)
+					break;
+			}
+
+			// Find start/end point
+			startPoint = findEndPoint(startContainer, ancestor) || startContainer;
+			endPoint = findEndPoint(endContainer, ancestor) || endContainer;
+
+			// Walk left leaf
+			walkBoundary(startContainer, startPoint, true);
+
+			// Walk the middle from start to end point
+			siblings = collectSiblings(
+				startPoint == startContainer ? startPoint : startPoint.nextSibling,
+				'nextSibling',
+				endPoint == endContainer ? endPoint.nextSibling : endPoint
+			);
+
+			if (siblings.length)
+				callback(exclude(siblings));
+
+			// Walk right leaf
+			walkBoundary(endContainer, endPoint);
+		};
+
+		this.split = function(rng) {
+			var startContainer = rng.startContainer,
+				startOffset = rng.startOffset,
+				endContainer = rng.endContainer,
+				endOffset = rng.endOffset;
+
+			function splitText(node, offset) {
+				return node.splitText(offset);
+			};
+
+			// Handle single text node
+			if (startContainer == endContainer && startContainer.nodeType == 3) {
+				if (startOffset > 0 && startOffset < startContainer.nodeValue.length) {
+					endContainer = splitText(startContainer, startOffset);
+					startContainer = endContainer.previousSibling;
+
+					if (endOffset > startOffset) {
+						endOffset = endOffset - startOffset;
+						startContainer = endContainer = splitText(endContainer, endOffset).previousSibling;
+						endOffset = endContainer.nodeValue.length;
+						startOffset = 0;
+					} else {
+						endOffset = 0;
+					}
+				}
+			} else {
+				// Split startContainer text node if needed
+				if (startContainer.nodeType == 3 && startOffset > 0 && startOffset < startContainer.nodeValue.length) {
+					startContainer = splitText(startContainer, startOffset);
+					startOffset = 0;
+				}
+
+				// Split endContainer text node if needed
+				if (endContainer.nodeType == 3 && endOffset > 0 && endOffset < endContainer.nodeValue.length) {
+					endContainer = splitText(endContainer, endOffset).previousSibling;
+					endOffset = endContainer.nodeValue.length;
+				}
+			}
+
+			return {
+				startContainer : startContainer,
+				startOffset : startOffset,
+				endContainer : endContainer,
+				endOffset : endOffset
+			};
+		};
+
+	};
+
+	tinymce.dom.RangeUtils.compareRanges = function(rng1, rng2) {
+		if (rng1 && rng2) {
+			// Compare native IE ranges
+			if (rng1.item || rng1.duplicate) {
+				// Both are control ranges and the selected element matches
+				if (rng1.item && rng2.item && rng1.item(0) === rng2.item(0))
+					return true;
+
+				// Both are text ranges and the range matches
+				if (rng1.isEqual && rng2.isEqual && rng2.isEqual(rng1))
+					return true;
+			} else {
+				// Compare w3c ranges
+				return rng1.startContainer == rng2.startContainer && rng1.startOffset == rng2.startOffset;
+			}
+		}
+
+		return false;
+	};
+})(tinymce);
+
+(function(tinymce) {
+	var Event = tinymce.dom.Event, each = tinymce.each;
+
+	tinymce.create('tinymce.ui.KeyboardNavigation', {
+		KeyboardNavigation: function(settings, dom) {
+			var t = this, root = settings.root, items = settings.items,
+					enableUpDown = settings.enableUpDown, enableLeftRight = settings.enableLeftRight || !settings.enableUpDown,
+					excludeFromTabOrder = settings.excludeFromTabOrder,
+					itemFocussed, itemBlurred, rootKeydown, rootFocussed, focussedId;
+
+			dom = dom || tinymce.DOM;
+
+			itemFocussed = function(evt) {
+				focussedId = evt.target.id;
+			};
+			
+			itemBlurred = function(evt) {
+				dom.setAttrib(evt.target.id, 'tabindex', '-1');
+			};
+			
+			rootFocussed = function(evt) {
+				var item = dom.get(focussedId);
+				dom.setAttrib(item, 'tabindex', '0');
+				item.focus();
+			};
+			
+			t.focus = function() {
+				dom.get(focussedId).focus();
+			};
+
+			t.destroy = function() {
+				each(items, function(item) {
+					var elm = dom.get(item.id);
+
+					dom.unbind(elm, 'focus', itemFocussed);
+					dom.unbind(elm, 'blur', itemBlurred);
+				});
+
+				var rootElm = dom.get(root);
+				dom.unbind(rootElm, 'focus', rootFocussed);
+				dom.unbind(rootElm, 'keydown', rootKeydown);
+
+				items = dom = root = t.focus = itemFocussed = itemBlurred = rootKeydown = rootFocussed = null;
+				t.destroy = function() {};
+			};
+			
+			t.moveFocus = function(dir, evt) {
+				var idx = -1, controls = t.controls, newFocus;
+
+				if (!focussedId)
+					return;
+
+				each(items, function(item, index) {
+					if (item.id === focussedId) {
+						idx = index;
+						return false;
+					}
+				});
+
+				idx += dir;
+				if (idx < 0) {
+					idx = items.length - 1;
+				} else if (idx >= items.length) {
+					idx = 0;
+				}
+				
+				newFocus = items[idx];
+				dom.setAttrib(focussedId, 'tabindex', '-1');
+				dom.setAttrib(newFocus.id, 'tabindex', '0');
+				dom.get(newFocus.id).focus();
+
+				if (settings.actOnFocus) {
+					settings.onAction(newFocus.id);
+				}
+
+				if (evt)
+					Event.cancel(evt);
+			};
+			
+			rootKeydown = function(evt) {
+				var DOM_VK_LEFT = 37, DOM_VK_RIGHT = 39, DOM_VK_UP = 38, DOM_VK_DOWN = 40, DOM_VK_ESCAPE = 27, DOM_VK_ENTER = 14, DOM_VK_RETURN = 13, DOM_VK_SPACE = 32;
+				
+				switch (evt.keyCode) {
+					case DOM_VK_LEFT:
+						if (enableLeftRight) t.moveFocus(-1);
+						Event.cancel(evt);
+						break;
+	
+					case DOM_VK_RIGHT:
+						if (enableLeftRight) t.moveFocus(1);
+						Event.cancel(evt);
+						break;
+	
+					case DOM_VK_UP:
+						if (enableUpDown) t.moveFocus(-1);
+						Event.cancel(evt);
+						break;
+
+					case DOM_VK_DOWN:
+						if (enableUpDown) t.moveFocus(1);
+						Event.cancel(evt);
+						break;
+
+					case DOM_VK_ESCAPE:
+						if (settings.onCancel) {
+							settings.onCancel();
+							Event.cancel(evt);
+						}
+						break;
+
+					case DOM_VK_ENTER:
+					case DOM_VK_RETURN:
+					case DOM_VK_SPACE:
+						if (settings.onAction) {
+							settings.onAction(focussedId);
+							Event.cancel(evt);
+						}
+						break;
+				}
+			};
+
+			// Set up state and listeners for each item.
+			each(items, function(item, idx) {
+				var tabindex, elm;
+
+				if (!item.id) {
+					item.id = dom.uniqueId('_mce_item_');
+				}
+
+				elm = dom.get(item.id);
+
+				if (excludeFromTabOrder) {
+					dom.bind(elm, 'blur', itemBlurred);
+					tabindex = '-1';
+				} else {
+					tabindex = (idx === 0 ? '0' : '-1');
+				}
+
+				elm.setAttribute('tabindex', tabindex);
+				dom.bind(elm, 'focus', itemFocussed);
+			});
+			
+			// Setup initial state for root element.
+			if (items[0]){
+				focussedId = items[0].id;
+			}
+
+			dom.setAttrib(root, 'tabindex', '-1');
+
+			// Setup listeners for root element.
+			var rootElm = dom.get(root);
+			dom.bind(rootElm, 'focus', rootFocussed);
+			dom.bind(rootElm, 'keydown', rootKeydown);
+		}
+	});
+})(tinymce);
+
+(function(tinymce) {
+	// Shorten class names
+	var DOM = tinymce.DOM, is = tinymce.is;
+
+	tinymce.create('tinymce.ui.Control', {
+		Control : function(id, s, editor) {
+			this.id = id;
+			this.settings = s = s || {};
+			this.rendered = false;
+			this.onRender = new tinymce.util.Dispatcher(this);
+			this.classPrefix = '';
+			this.scope = s.scope || this;
+			this.disabled = 0;
+			this.active = 0;
+			this.editor = editor;
+		},
+		
+		setAriaProperty : function(property, value) {
+			var element = DOM.get(this.id + '_aria') || DOM.get(this.id);
+			if (element) {
+				DOM.setAttrib(element, 'aria-' + property, !!value);
+			}
+		},
+		
+		focus : function() {
+			DOM.get(this.id).focus();
+		},
+
+		setDisabled : function(s) {
+			if (s != this.disabled) {
+				this.setAriaProperty('disabled', s);
+
+				this.setState('Disabled', s);
+				this.setState('Enabled', !s);
+				this.disabled = s;
+			}
+		},
+
+		isDisabled : function() {
+			return this.disabled;
+		},
+
+		setActive : function(s) {
+			if (s != this.active) {
+				this.setState('Active', s);
+				this.active = s;
+				this.setAriaProperty('pressed', s);
+			}
+		},
+
+		isActive : function() {
+			return this.active;
+		},
+
+		setState : function(c, s) {
+			var n = DOM.get(this.id);
+
+			c = this.classPrefix + c;
+
+			if (s)
+				DOM.addClass(n, c);
+			else
+				DOM.removeClass(n, c);
+		},
+
+		isRendered : function() {
+			return this.rendered;
+		},
+
+		renderHTML : function() {
+		},
+
+		renderTo : function(n) {
+			DOM.setHTML(n, this.renderHTML());
+		},
+
+		postRender : function() {
+			var t = this, b;
+
+			// Set pending states
+			if (is(t.disabled)) {
+				b = t.disabled;
+				t.disabled = -1;
+				t.setDisabled(b);
+			}
+
+			if (is(t.active)) {
+				b = t.active;
+				t.active = -1;
+				t.setActive(b);
+			}
+		},
+
+		remove : function() {
+			DOM.remove(this.id);
+			this.destroy();
+		},
+
+		destroy : function() {
+			tinymce.dom.Event.clear(this.id);
+		}
+	});
+})(tinymce);
+tinymce.create('tinymce.ui.Container:tinymce.ui.Control', {
+	Container : function(id, s, editor) {
+		this.parent(id, s, editor);
+
+		this.controls = [];
+
+		this.lookup = {};
+	},
+
+	add : function(c) {
+		this.lookup[c.id] = c;
+		this.controls.push(c);
+
+		return c;
+	},
+
+	get : function(n) {
+		return this.lookup[n];
+	}
+});
+
+
+tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
+	Separator : function(id, s) {
+		this.parent(id, s);
+		this.classPrefix = 'mceSeparator';
+		this.setDisabled(true);
+	},
+
+	renderHTML : function() {
+		return tinymce.DOM.createHTML('span', {'class' : this.classPrefix, role : 'separator', 'aria-orientation' : 'vertical', tabindex : '-1'});
+	}
+});
+
+(function(tinymce) {
+	var is = tinymce.is, DOM = tinymce.DOM, each = tinymce.each, walk = tinymce.walk;
+
+	tinymce.create('tinymce.ui.MenuItem:tinymce.ui.Control', {
+		MenuItem : function(id, s) {
+			this.parent(id, s);
+			this.classPrefix = 'mceMenuItem';
+		},
+
+		setSelected : function(s) {
+			this.setState('Selected', s);
+			this.setAriaProperty('checked', !!s);
+			this.selected = s;
+		},
+
+		isSelected : function() {
+			return this.selected;
+		},
+
+		postRender : function() {
+			var t = this;
+			
+			t.parent();
+
+			// Set pending state
+			if (is(t.selected))
+				t.setSelected(t.selected);
+		}
+	});
+})(tinymce);
+
+(function(tinymce) {
+	var is = tinymce.is, DOM = tinymce.DOM, each = tinymce.each, walk = tinymce.walk;
+
+	tinymce.create('tinymce.ui.Menu:tinymce.ui.MenuItem', {
+		Menu : function(id, s) {
+			var t = this;
+
+			t.parent(id, s);
+			t.items = {};
+			t.collapsed = false;
+			t.menuCount = 0;
+			t.onAddItem = new tinymce.util.Dispatcher(this);
+		},
+
+		expand : function(d) {
+			var t = this;
+
+			if (d) {
+				walk(t, function(o) {
+					if (o.expand)
+						o.expand();
+				}, 'items', t);
+			}
+
+			t.collapsed = false;
+		},
+
+		collapse : function(d) {
+			var t = this;
+
+			if (d) {
+				walk(t, function(o) {
+					if (o.collapse)
+						o.collapse();
+				}, 'items', t);
+			}
+
+			t.collapsed = true;
+		},
+
+		isCollapsed : function() {
+			return this.collapsed;
+		},
+
+		add : function(o) {
+			if (!o.settings)
+				o = new tinymce.ui.MenuItem(o.id || DOM.uniqueId(), o);
+
+			this.onAddItem.dispatch(this, o);
+
+			return this.items[o.id] = o;
+		},
+
+		addSeparator : function() {
+			return this.add({separator : true});
+		},
+
+		addMenu : function(o) {
+			if (!o.collapse)
+				o = this.createMenu(o);
+
+			this.menuCount++;
+
+			return this.add(o);
+		},
+
+		hasMenus : function() {
+			return this.menuCount !== 0;
+		},
+
+		remove : function(o) {
+			delete this.items[o.id];
+		},
+
+		removeAll : function() {
+			var t = this;
+
+			walk(t, function(o) {
+				if (o.removeAll)
+					o.removeAll();
+				else
+					o.remove();
+
+				o.destroy();
+			}, 'items', t);
+
+			t.items = {};
+		},
+
+		createMenu : function(o) {
+			var m = new tinymce.ui.Menu(o.id || DOM.uniqueId(), o);
+
+			m.onAddItem.add(this.onAddItem.dispatch, this.onAddItem);
+
+			return m;
+		}
+	});
+})(tinymce);
+(function(tinymce) {
+	var is = tinymce.is, DOM = tinymce.DOM, each = tinymce.each, Event = tinymce.dom.Event, Element = tinymce.dom.Element;
+
+	tinymce.create('tinymce.ui.DropMenu:tinymce.ui.Menu', {
+		DropMenu : function(id, s) {
+			s = s || {};
+			s.container = s.container || DOM.doc.body;
+			s.offset_x = s.offset_x || 0;
+			s.offset_y = s.offset_y || 0;
+			s.vp_offset_x = s.vp_offset_x || 0;
+			s.vp_offset_y = s.vp_offset_y || 0;
+
+			if (is(s.icons) && !s.icons)
+				s['class'] += ' mceNoIcons';
+
+			this.parent(id, s);
+			this.onShowMenu = new tinymce.util.Dispatcher(this);
+			this.onHideMenu = new tinymce.util.Dispatcher(this);
+			this.classPrefix = 'mceMenu';
+		},
+
+		createMenu : function(s) {
+			var t = this, cs = t.settings, m;
+
+			s.container = s.container || cs.container;
+			s.parent = t;
+			s.constrain = s.constrain || cs.constrain;
+			s['class'] = s['class'] || cs['class'];
+			s.vp_offset_x = s.vp_offset_x || cs.vp_offset_x;
+			s.vp_offset_y = s.vp_offset_y || cs.vp_offset_y;
+			s.keyboard_focus = cs.keyboard_focus;
+			m = new tinymce.ui.DropMenu(s.id || DOM.uniqueId(), s);
+
+			m.onAddItem.add(t.onAddItem.dispatch, t.onAddItem);
+
+			return m;
+		},
+		
+		focus : function() {
+			var t = this;
+			if (t.keyboardNav) {
+				t.keyboardNav.focus();
+			}
+		},
+
+		update : function() {
+			var t = this, s = t.settings, tb = DOM.get('menu_' + t.id + '_tbl'), co = DOM.get('menu_' + t.id + '_co'), tw, th;
+
+			tw = s.max_width ? Math.min(tb.offsetWidth, s.max_width) : tb.offsetWidth;
+			th = s.max_height ? Math.min(tb.offsetHeight, s.max_height) : tb.offsetHeight;
+
+			if (!DOM.boxModel)
+				t.element.setStyles({width : tw + 2, height : th + 2});
+			else
+				t.element.setStyles({width : tw, height : th});
+
+			if (s.max_width)
+				DOM.setStyle(co, 'width', tw);
+
+			if (s.max_height) {
+				DOM.setStyle(co, 'height', th);
+
+				if (tb.clientHeight < s.max_height)
+					DOM.setStyle(co, 'overflow', 'hidden');
+			}
+		},
+
+		showMenu : function(x, y, px) {
+			var t = this, s = t.settings, co, vp = DOM.getViewPort(), w, h, mx, my, ot = 2, dm, tb, cp = t.classPrefix;
+
+			t.collapse(1);
+
+			if (t.isMenuVisible)
+				return;
+
+			if (!t.rendered) {
+				co = DOM.add(t.settings.container, t.renderNode());
+
+				each(t.items, function(o) {
+					o.postRender();
+				});
+
+				t.element = new Element('menu_' + t.id, {blocker : 1, container : s.container});
+			} else
+				co = DOM.get('menu_' + t.id);
+
+			// Move layer out of sight unless it's Opera since it scrolls to top of page due to an bug
+			if (!tinymce.isOpera)
+				DOM.setStyles(co, {left : -0xFFFF , top : -0xFFFF});
+
+			DOM.show(co);
+			t.update();
+
+			x += s.offset_x || 0;
+			y += s.offset_y || 0;
+			vp.w -= 4;
+			vp.h -= 4;
+
+			// Move inside viewport if not submenu
+			if (s.constrain) {
+				w = co.clientWidth - ot;
+				h = co.clientHeight - ot;
+				mx = vp.x + vp.w;
+				my = vp.y + vp.h;
+
+				if ((x + s.vp_offset_x + w) > mx)
+					x = px ? px - w : Math.max(0, (mx - s.vp_offset_x) - w);
+
+				if ((y + s.vp_offset_y + h) > my)
+					y = Math.max(0, (my - s.vp_offset_y) - h);
+			}
+
+			DOM.setStyles(co, {left : x , top : y});
+			t.element.update();
+
+			t.isMenuVisible = 1;
+			t.mouseClickFunc = Event.add(co, 'click', function(e) {
+				var m;
+
+				e = e.target;
+
+				if (e && (e = DOM.getParent(e, 'tr')) && !DOM.hasClass(e, cp + 'ItemSub')) {
+					m = t.items[e.id];
+
+					if (m.isDisabled())
+						return;
+
+					dm = t;
+
+					while (dm) {
+						if (dm.hideMenu)
+							dm.hideMenu();
+
+						dm = dm.settings.parent;
+					}
+
+					if (m.settings.onclick)
+						m.settings.onclick(e);
+
+					return false; // Cancel to fix onbeforeunload problem
+				}
+			});
+
+			if (t.hasMenus()) {
+				t.mouseOverFunc = Event.add(co, 'mouseover', function(e) {
+					var m, r, mi;
+
+					e = e.target;
+					if (e && (e = DOM.getParent(e, 'tr'))) {
+						m = t.items[e.id];
+
+						if (t.lastMenu)
+							t.lastMenu.collapse(1);
+
+						if (m.isDisabled())
+							return;
+
+						if (e && DOM.hasClass(e, cp + 'ItemSub')) {
+							//p = DOM.getPos(s.container);
+							r = DOM.getRect(e);
+							m.showMenu((r.x + r.w - ot), r.y - ot, r.x);
+							t.lastMenu = m;
+							DOM.addClass(DOM.get(m.id).firstChild, cp + 'ItemActive');
+						}
+					}
+				});
+			}
+			
+			Event.add(co, 'keydown', t._keyHandler, t);
+
+			t.onShowMenu.dispatch(t);
+
+			if (s.keyboard_focus) { 
+				t._setupKeyboardNav(); 
+			}
+		},
+
+		hideMenu : function(c) {
+			var t = this, co = DOM.get('menu_' + t.id), e;
+
+			if (!t.isMenuVisible)
+				return;
+
+			if (t.keyboardNav) t.keyboardNav.destroy();
+			Event.remove(co, 'mouseover', t.mouseOverFunc);
+			Event.remove(co, 'click', t.mouseClickFunc);
+			Event.remove(co, 'keydown', t._keyHandler);
+			DOM.hide(co);
+			t.isMenuVisible = 0;
+
+			if (!c)
+				t.collapse(1);
+
+			if (t.element)
+				t.element.hide();
+
+			if (e = DOM.get(t.id))
+				DOM.removeClass(e.firstChild, t.classPrefix + 'ItemActive');
+
+			t.onHideMenu.dispatch(t);
+		},
+
+		add : function(o) {
+			var t = this, co;
+
+			o = t.parent(o);
+
+			if (t.isRendered && (co = DOM.get('menu_' + t.id)))
+				t._add(DOM.select('tbody', co)[0], o);
+
+			return o;
+		},
+
+		collapse : function(d) {
+			this.parent(d);
+			this.hideMenu(1);
+		},
+
+		remove : function(o) {
+			DOM.remove(o.id);
+			this.destroy();
+
+			return this.parent(o);
+		},
+
+		destroy : function() {
+			var t = this, co = DOM.get('menu_' + t.id);
+
+			if (t.keyboardNav) t.keyboardNav.destroy();
+			Event.remove(co, 'mouseover', t.mouseOverFunc);
+			Event.remove(DOM.select('a', co), 'focus', t.mouseOverFunc);
+			Event.remove(co, 'click', t.mouseClickFunc);
+			Event.remove(co, 'keydown', t._keyHandler);
+
+			if (t.element)
+				t.element.remove();
+
+			DOM.remove(co);
+		},
+
+		renderNode : function() {
+			var t = this, s = t.settings, n, tb, co, w;
+
+			w = DOM.create('div', {role: 'listbox', id : 'menu_' + t.id, 'class' : s['class'], 'style' : 'position:absolute;left:0;top:0;z-index:200000;outline:0'});
+			if (t.settings.parent) {
+				DOM.setAttrib(w, 'aria-parent', 'menu_' + t.settings.parent.id);
+			}
+			co = DOM.add(w, 'div', {role: 'presentation', id : 'menu_' + t.id + '_co', 'class' : t.classPrefix + (s['class'] ? ' ' + s['class'] : '')});
+			t.element = new Element('menu_' + t.id, {blocker : 1, container : s.container});
+
+			if (s.menu_line)
+				DOM.add(co, 'span', {'class' : t.classPrefix + 'Line'});
+
+//			n = DOM.add(co, 'div', {id : 'menu_' + t.id + '_co', 'class' : 'mceMenuContainer'});
+			n = DOM.add(co, 'table', {role: 'presentation', id : 'menu_' + t.id + '_tbl', border : 0, cellPadding : 0, cellSpacing : 0});
+			tb = DOM.add(n, 'tbody');
+
+			each(t.items, function(o) {
+				t._add(tb, o);
+			});
+
+			t.rendered = true;
+
+			return w;
+		},
+
+		// Internal functions
+		_setupKeyboardNav : function(){
+			var contextMenu, menuItems, t=this; 
+			contextMenu = DOM.get('menu_' + t.id);
+			menuItems = DOM.select('a[role=option]', 'menu_' + t.id);
+			menuItems.splice(0,0,contextMenu);
+			t.keyboardNav = new tinymce.ui.KeyboardNavigation({
+				root: 'menu_' + t.id,
+				items: menuItems,
+				onCancel: function() {
+					t.hideMenu();
+				},
+				enableUpDown: true
+			});
+			contextMenu.focus();
+		},
+
+		_keyHandler : function(evt) {
+			var t = this, e;
+			switch (evt.keyCode) {
+				case 37: // Left
+					if (t.settings.parent) {
+						t.hideMenu();
+						t.settings.parent.focus();
+						Event.cancel(evt);
+					}
+					break;
+				case 39: // Right
+					if (t.mouseOverFunc)
+						t.mouseOverFunc(evt);
+					break;
+			}
+		},
+
+		_add : function(tb, o) {
+			var n, s = o.settings, a, ro, it, cp = this.classPrefix, ic;
+
+			if (s.separator) {
+				ro = DOM.add(tb, 'tr', {id : o.id, 'class' : cp + 'ItemSeparator'});
+				DOM.add(ro, 'td', {'class' : cp + 'ItemSeparator'});
+
+				if (n = ro.previousSibling)
+					DOM.addClass(n, 'mceLast');
+
+				return;
+			}
+
+			n = ro = DOM.add(tb, 'tr', {id : o.id, 'class' : cp + 'Item ' + cp + 'ItemEnabled'});
+			n = it = DOM.add(n, s.titleItem ? 'th' : 'td');
+			n = a = DOM.add(n, 'a', {id: o.id + '_aria',  role: s.titleItem ? 'presentation' : 'option', href : 'javascript:;', onclick : "return false;", onmousedown : 'return false;'});
+
+			if (s.parent) {
+				DOM.setAttrib(a, 'aria-haspopup', 'true');
+				DOM.setAttrib(a, 'aria-owns', 'menu_' + o.id);
+			}
+
+			DOM.addClass(it, s['class']);
+//			n = DOM.add(n, 'span', {'class' : 'item'});
+
+			ic = DOM.add(n, 'span', {'class' : 'mceIcon' + (s.icon ? ' mce_' + s.icon : '')});
+
+			if (s.icon_src)
+				DOM.add(ic, 'img', {src : s.icon_src});
+
+			n = DOM.add(n, s.element || 'span', {'class' : 'mceText', title : o.settings.title}, o.settings.title);
+
+			if (o.settings.style) {
+				if (typeof o.settings.style == "function")
+					o.settings.style = o.settings.style();
+
+				DOM.setAttrib(n, 'style', o.settings.style);
+			}
+
+			if (tb.childNodes.length == 1)
+				DOM.addClass(ro, 'mceFirst');
+
+			if ((n = ro.previousSibling) && DOM.hasClass(n, cp + 'ItemSeparator'))
+				DOM.addClass(ro, 'mceFirst');
+
+			if (o.collapse)
+				DOM.addClass(ro, cp + 'ItemSub');
+
+			if (n = ro.previousSibling)
+				DOM.removeClass(n, 'mceLast');
+
+			DOM.addClass(ro, 'mceLast');
+		}
+	});
+})(tinymce);
+(function(tinymce) {
+	var DOM = tinymce.DOM;
+
+	tinymce.create('tinymce.ui.Button:tinymce.ui.Control', {
+		Button : function(id, s, ed) {
+			this.parent(id, s, ed);
+			this.classPrefix = 'mceButton';
+		},
+
+		renderHTML : function() {
+			var cp = this.classPrefix, s = this.settings, h, l;
+
+			l = DOM.encode(s.label || '');
+			h = '<a role="button" id="' + this.id + '" href="javascript:;" class="' + cp + ' ' + cp + 'Enabled ' + s['class'] + (l ? ' ' + cp + 'Labeled' : '') +'" onmousedown="return false;" onclick="return false;" aria-labelledby="' + this.id + '_voice" title="' + DOM.encode(s.title) + '">';
+			if (s.image && !(this.editor  &&this.editor.forcedHighContrastMode) )
+				h += '<span class="mceIcon ' + s['class'] + '"><img class="mceIcon" src="' + s.image + '" alt="' + DOM.encode(s.title) + '" /></span>' + (l ? '<span class="' + cp + 'Label">' + l + '</span>' : '');
+			else
+				h += '<span class="mceIcon ' + s['class'] + '"></span>' + (l ? '<span class="' + cp + 'Label">' + l + '</span>' : '');
+
+			h += '<span class="mceVoiceLabel mceIconOnly" style="display: none;" id="' + this.id + '_voice">' + s.title + '</span>';
+			h += '</a>';
+			return h;
+		},
+
+		postRender : function() {
+			var t = this, s = t.settings, imgBookmark;
+
+			// In IE a large image that occupies the entire editor area will be deselected when a button is clicked, so
+			// need to keep the selection in case the selection is lost
+			if (tinymce.isIE && t.editor) {
+				tinymce.dom.Event.add(t.id, 'mousedown', function(e) {
+					var nodeName = t.editor.selection.getNode().nodeName;
+					imgBookmark = nodeName === 'IMG' ? t.editor.selection.getBookmark() : null;
+				});
+			}
+			tinymce.dom.Event.add(t.id, 'click', function(e) {
+				if (!t.isDisabled()) {
+					// restore the selection in case the selection is lost in IE
+					if (tinymce.isIE && t.editor && imgBookmark !== null) {
+						t.editor.selection.moveToBookmark(imgBookmark);
+					}
+					return s.onclick.call(s.scope, e);
+				}
+			});
+			tinymce.dom.Event.add(t.id, 'keydown', function(e) {
+				if (!t.isDisabled() && e.keyCode==tinymce.VK.SPACEBAR) {
+					tinymce.dom.Event.cancel(e);
+					return s.onclick.call(s.scope, e);
+				}
+			});
+		}
+	});
+})(tinymce);
+
+(function(tinymce) {
+	var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each, Dispatcher = tinymce.util.Dispatcher, undef;
+
+	tinymce.create('tinymce.ui.ListBox:tinymce.ui.Control', {
+		ListBox : function(id, s, ed) {
+			var t = this;
+
+			t.parent(id, s, ed);
+
+			t.items = [];
+
+			t.onChange = new Dispatcher(t);
+
+			t.onPostRender = new Dispatcher(t);
+
+			t.onAdd = new Dispatcher(t);
+
+			t.onRenderMenu = new tinymce.util.Dispatcher(this);
+
+			t.classPrefix = 'mceListBox';
+			t.marked = {};
+		},
+
+		select : function(va) {
+			var t = this, fv, f;
+
+			t.marked = {};
+
+			if (va == undef)
+				return t.selectByIndex(-1);
+
+			// Is string or number make function selector
+			if (va && typeof(va)=="function")
+				f = va;
+			else {
+				f = function(v) {
+					return v == va;
+				};
+			}
+
+			// Do we need to do something?
+			if (va != t.selectedValue) {
+				// Find item
+				each(t.items, function(o, i) {
+					if (f(o.value)) {
+						fv = 1;
+						t.selectByIndex(i);
+						return false;
+					}
+				});
+
+				if (!fv)
+					t.selectByIndex(-1);
+			}
+		},
+
+		selectByIndex : function(idx) {
+			var t = this, e, o, label;
+
+			t.marked = {};
+
+			if (idx != t.selectedIndex) {
+				e = DOM.get(t.id + '_text');
+				label = DOM.get(t.id + '_voiceDesc');
+				o = t.items[idx];
+
+				if (o) {
+					t.selectedValue = o.value;
+					t.selectedIndex = idx;
+					DOM.setHTML(e, DOM.encode(o.title));
+					DOM.setHTML(label, t.settings.title + " - " + o.title);
+					DOM.removeClass(e, 'mceTitle');
+					DOM.setAttrib(t.id, 'aria-valuenow', o.title);
+				} else {
+					DOM.setHTML(e, DOM.encode(t.settings.title));
+					DOM.setHTML(label, DOM.encode(t.settings.title));
+					DOM.addClass(e, 'mceTitle');
+					t.selectedValue = t.selectedIndex = null;
+					DOM.setAttrib(t.id, 'aria-valuenow', t.settings.title);
+				}
+				e = 0;
+			}
+		},
+
+		mark : function(value) {
+			this.marked[value] = true;
+		},
+
+		add : function(n, v, o) {
+			var t = this;
+
+			o = o || {};
+			o = tinymce.extend(o, {
+				title : n,
+				value : v
+			});
+
+			t.items.push(o);
+			t.onAdd.dispatch(t, o);
+		},
+
+		getLength : function() {
+			return this.items.length;
+		},
+
+		renderHTML : function() {
+			var h = '', t = this, s = t.settings, cp = t.classPrefix;
+
+			h = '<span role="listbox" aria-haspopup="true" aria-labelledby="' + t.id +'_voiceDesc" aria-describedby="' + t.id + '_voiceDesc"><table role="presentation" tabindex="0" id="' + t.id + '" cellpadding="0" cellspacing="0" class="' + cp + ' ' + cp + 'Enabled' + (s['class'] ? (' ' + s['class']) : '') + '"><tbody><tr>';
+			h += '<td>' + DOM.createHTML('span', {id: t.id + '_voiceDesc', 'class': 'voiceLabel', style:'display:none;'}, t.settings.title); 
+			h += DOM.createHTML('a', {id : t.id + '_text', tabindex : -1, href : 'javascript:;', 'class' : 'mceText', onclick : "return false;", onmousedown : 'return false;'}, DOM.encode(t.settings.title)) + '</td>';
+			h += '<td>' + DOM.createHTML('a', {id : t.id + '_open', tabindex : -1, href : 'javascript:;', 'class' : 'mceOpen', onclick : "return false;", onmousedown : 'return false;'}, '<span><span style="display:none;" class="mceIconOnly" aria-hidden="true">\u25BC</span></span>') + '</td>';
+			h += '</tr></tbody></table></span>';
+
+			return h;
+		},
+
+		showMenu : function() {
+			var t = this, p2, e = DOM.get(this.id), m;
+
+			if (t.isDisabled() || t.items.length === 0)
+				return;
+
+			if (t.menu && t.menu.isMenuVisible)
+				return t.hideMenu();
+
+			if (!t.isMenuRendered) {
+				t.renderMenu();
+				t.isMenuRendered = true;
+			}
+
+			p2 = DOM.getPos(e);
+
+			m = t.menu;
+			m.settings.offset_x = p2.x;
+			m.settings.offset_y = p2.y;
+			m.settings.keyboard_focus = !tinymce.isOpera; // Opera is buggy when it comes to auto focus
+
+			// Select in menu
+			each(t.items, function(o) {
+				if (m.items[o.id]) {
+					m.items[o.id].setSelected(0);
+				}
+			});
+
+			each(t.items, function(o) {
+				if (m.items[o.id] && t.marked[o.value]) {
+					m.items[o.id].setSelected(1);
+				}
+
+				if (o.value === t.selectedValue) {
+					m.items[o.id].setSelected(1);
+				}
+			});
+
+			m.showMenu(0, e.clientHeight);
+
+			Event.add(DOM.doc, 'mousedown', t.hideMenu, t);
+			DOM.addClass(t.id, t.classPrefix + 'Selected');
+
+			//DOM.get(t.id + '_text').focus();
+		},
+
+		hideMenu : function(e) {
+			var t = this;
+
+			if (t.menu && t.menu.isMenuVisible) {
+				DOM.removeClass(t.id, t.classPrefix + 'Selected');
+
+				// Prevent double toogles by canceling the mouse click event to the button
+				if (e && e.type == "mousedown" && (e.target.id == t.id + '_text' || e.target.id == t.id + '_open'))
+					return;
+
+				if (!e || !DOM.getParent(e.target, '.mceMenu')) {
+					DOM.removeClass(t.id, t.classPrefix + 'Selected');
+					Event.remove(DOM.doc, 'mousedown', t.hideMenu, t);
+					t.menu.hideMenu();
+				}
+			}
+		},
+
+		renderMenu : function() {
+			var t = this, m;
+
+			m = t.settings.control_manager.createDropMenu(t.id + '_menu', {
+				menu_line : 1,
+				'class' : t.classPrefix + 'Menu mceNoIcons',
+				max_width : 250,
+				max_height : 150
+			});
+
+			m.onHideMenu.add(function() {
+				t.hideMenu();
+				t.focus();
+			});
+
+			m.add({
+				title : t.settings.title,
+				'class' : 'mceMenuItemTitle',
+				onclick : function() {
+					if (t.settings.onselect('') !== false)
+						t.select(''); // Must be runned after
+				}
+			});
+
+			each(t.items, function(o) {
+				// No value then treat it as a title
+				if (o.value === undef) {
+					m.add({
+						title : o.title,
+						role : "option",
+						'class' : 'mceMenuItemTitle',
+						onclick : function() {
+							if (t.settings.onselect('') !== false)
+								t.select(''); // Must be runned after
+						}
+					});
+				} else {
+					o.id = DOM.uniqueId();
+					o.role= "option";
+					o.onclick = function() {
+						if (t.settings.onselect(o.value) !== false)
+							t.select(o.value); // Must be runned after
+					};
+
+					m.add(o);
+				}
+			});
+
+			t.onRenderMenu.dispatch(t, m);
+			t.menu = m;
+		},
+
+		postRender : function() {
+			var t = this, cp = t.classPrefix;
+
+			Event.add(t.id, 'click', t.showMenu, t);
+			Event.add(t.id, 'keydown', function(evt) {
+				if (evt.keyCode == 32) { // Space
+					t.showMenu(evt);
+					Event.cancel(evt);
+				}
+			});
+			Event.add(t.id, 'focus', function() {
+				if (!t._focused) {
+					t.keyDownHandler = Event.add(t.id, 'keydown', function(e) {
+						if (e.keyCode == 40) {
+							t.showMenu();
+							Event.cancel(e);
+						}
+					});
+					t.keyPressHandler = Event.add(t.id, 'keypress', function(e) {
+						var v;
+						if (e.keyCode == 13) {
+							// Fake select on enter
+							v = t.selectedValue;
+							t.selectedValue = null; // Needs to be null to fake change
+							Event.cancel(e);
+							t.settings.onselect(v);
+						}
+					});
+				}
+
+				t._focused = 1;
+			});
+			Event.add(t.id, 'blur', function() {
+				Event.remove(t.id, 'keydown', t.keyDownHandler);
+				Event.remove(t.id, 'keypress', t.keyPressHandler);
+				t._focused = 0;
+			});
+
+			// Old IE doesn't have hover on all elements
+			if (tinymce.isIE6 || !DOM.boxModel) {
+				Event.add(t.id, 'mouseover', function() {
+					if (!DOM.hasClass(t.id, cp + 'Disabled'))
+						DOM.addClass(t.id, cp + 'Hover');
+				});
+
+				Event.add(t.id, 'mouseout', function() {
+					if (!DOM.hasClass(t.id, cp + 'Disabled'))
+						DOM.removeClass(t.id, cp + 'Hover');
+				});
+			}
+
+			t.onPostRender.dispatch(t, DOM.get(t.id));
+		},
+
+		destroy : function() {
+			this.parent();
+
+			Event.clear(this.id + '_text');
+			Event.clear(this.id + '_open');
+		}
+	});
+})(tinymce);
+
+(function(tinymce) {
+	var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each, Dispatcher = tinymce.util.Dispatcher, undef;
+
+	tinymce.create('tinymce.ui.NativeListBox:tinymce.ui.ListBox', {
+		NativeListBox : function(id, s) {
+			this.parent(id, s);
+			this.classPrefix = 'mceNativeListBox';
+		},
+
+		setDisabled : function(s) {
+			DOM.get(this.id).disabled = s;
+			this.setAriaProperty('disabled', s);
+		},
+
+		isDisabled : function() {
+			return DOM.get(this.id).disabled;
+		},
+
+		select : function(va) {
+			var t = this, fv, f;
+
+			if (va == undef)
+				return t.selectByIndex(-1);
+
+			// Is string or number make function selector
+			if (va && typeof(va)=="function")
+				f = va;
+			else {
+				f = function(v) {
+					return v == va;
+				};
+			}
+
+			// Do we need to do something?
+			if (va != t.selectedValue) {
+				// Find item
+				each(t.items, function(o, i) {
+					if (f(o.value)) {
+						fv = 1;
+						t.selectByIndex(i);
+						return false;
+					}
+				});
+
+				if (!fv)
+					t.selectByIndex(-1);
+			}
+		},
+
+		selectByIndex : function(idx) {
+			DOM.get(this.id).selectedIndex = idx + 1;
+			this.selectedValue = this.items[idx] ? this.items[idx].value : null;
+		},
+
+		add : function(n, v, a) {
+			var o, t = this;
+
+			a = a || {};
+			a.value = v;
+
+			if (t.isRendered())
+				DOM.add(DOM.get(this.id), 'option', a, n);
+
+			o = {
+				title : n,
+				value : v,
+				attribs : a
+			};
+
+			t.items.push(o);
+			t.onAdd.dispatch(t, o);
+		},
+
+		getLength : function() {
+			return this.items.length;
+		},
+
+		renderHTML : function() {
+			var h, t = this;
+
+			h = DOM.createHTML('option', {value : ''}, '-- ' + t.settings.title + ' --');
+
+			each(t.items, function(it) {
+				h += DOM.createHTML('option', {value : it.value}, it.title);
+			});
+
+			h = DOM.createHTML('select', {id : t.id, 'class' : 'mceNativeListBox', 'aria-labelledby': t.id + '_aria'}, h);
+			h += DOM.createHTML('span', {id : t.id + '_aria', 'style': 'display: none'}, t.settings.title);
+			return h;
+		},
+
+		postRender : function() {
+			var t = this, ch, changeListenerAdded = true;
+
+			t.rendered = true;
+
+			function onChange(e) {
+				var v = t.items[e.target.selectedIndex - 1];
+
+				if (v && (v = v.value)) {
+					t.onChange.dispatch(t, v);
+
+					if (t.settings.onselect)
+						t.settings.onselect(v);
+				}
+			};
+
+			Event.add(t.id, 'change', onChange);
+
+			// Accessibility keyhandler
+			Event.add(t.id, 'keydown', function(e) {
+				var bf, DOM_VK_LEFT = 37, DOM_VK_RIGHT = 39, DOM_VK_UP = 38, DOM_VK_DOWN = 40, DOM_VK_RETURN = 13, DOM_VK_SPACE = 32;
+
+				Event.remove(t.id, 'change', ch);
+				changeListenerAdded = false;
+
+				bf = Event.add(t.id, 'blur', function() {
+					if (changeListenerAdded) return;
+					changeListenerAdded = true;
+					Event.add(t.id, 'change', onChange);
+					Event.remove(t.id, 'blur', bf);
+				});
+
+				if (e.keyCode == DOM_VK_RETURN || e.keyCode == DOM_VK_SPACE) {
+					onChange(e);
+					return Event.cancel(e);
+				} else if (e.keyCode == DOM_VK_DOWN || e.keyCode == DOM_VK_UP) {
+					// allow native implementation (navigate select element options)
+					e.stopImmediatePropagation();
+				}
+			});
+
+			t.onPostRender.dispatch(t, DOM.get(t.id));
+		}
+	});
+})(tinymce);
+
+(function(tinymce) {
+	var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each;
+
+	tinymce.create('tinymce.ui.MenuButton:tinymce.ui.Button', {
+		MenuButton : function(id, s, ed) {
+			this.parent(id, s, ed);
+
+			this.onRenderMenu = new tinymce.util.Dispatcher(this);
+
+			s.menu_container = s.menu_container || DOM.doc.body;
+		},
+
+		showMenu : function() {
+			var t = this, p1, p2, e = DOM.get(t.id), m;
+
+			if (t.isDisabled())
+				return;
+
+			if (!t.isMenuRendered) {
+				t.renderMenu();
+				t.isMenuRendered = true;
+			}
+
+			if (t.isMenuVisible)
+				return t.hideMenu();
+
+			p1 = DOM.getPos(t.settings.menu_container);
+			p2 = DOM.getPos(e);
+
+			m = t.menu;
+			m.settings.offset_x = p2.x;
+			m.settings.offset_y = p2.y;
+			m.settings.vp_offset_x = p2.x;
+			m.settings.vp_offset_y = p2.y;
+			m.settings.keyboard_focus = t._focused;
+			m.showMenu(0, e.firstChild.clientHeight);
+
+			Event.add(DOM.doc, 'mousedown', t.hideMenu, t);
+			t.setState('Selected', 1);
+
+			t.isMenuVisible = 1;
+		},
+
+		renderMenu : function() {
+			var t = this, m;
+
+			m = t.settings.control_manager.createDropMenu(t.id + '_menu', {
+				menu_line : 1,
+				'class' : this.classPrefix + 'Menu',
+				icons : t.settings.icons
+			});
+
+			m.onHideMenu.add(function() {
+				t.hideMenu();
+				t.focus();
+			});
+
+			t.onRenderMenu.dispatch(t, m);
+			t.menu = m;
+		},
+
+		hideMenu : function(e) {
+			var t = this;
+
+			// Prevent double toogles by canceling the mouse click event to the button
+			if (e && e.type == "mousedown" && DOM.getParent(e.target, function(e) {return e.id === t.id || e.id === t.id + '_open';}))
+				return;
+
+			if (!e || !DOM.getParent(e.target, '.mceMenu')) {
+				t.setState('Selected', 0);
+				Event.remove(DOM.doc, 'mousedown', t.hideMenu, t);
+				if (t.menu)
+					t.menu.hideMenu();
+			}
+
+			t.isMenuVisible = 0;
+		},
+
+		postRender : function() {
+			var t = this, s = t.settings;
+
+			Event.add(t.id, 'click', function() {
+				if (!t.isDisabled()) {
+					if (s.onclick)
+						s.onclick(t.value);
+
+					t.showMenu();
+				}
+			});
+		}
+	});
+})(tinymce);
+
+(function(tinymce) {
+	var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each;
+
+	tinymce.create('tinymce.ui.SplitButton:tinymce.ui.MenuButton', {
+		SplitButton : function(id, s, ed) {
+			this.parent(id, s, ed);
+			this.classPrefix = 'mceSplitButton';
+		},
+
+		renderHTML : function() {
+			var h, t = this, s = t.settings, h1;
+
+			h = '<tbody><tr>';
+
+			if (s.image)
+				h1 = DOM.createHTML('img ', {src : s.image, role: 'presentation', 'class' : 'mceAction ' + s['class']});
+			else
+				h1 = DOM.createHTML('span', {'class' : 'mceAction ' + s['class']}, '');
+
+			h1 += DOM.createHTML('span', {'class': 'mceVoiceLabel mceIconOnly', id: t.id + '_voice', style: 'display:none;'}, s.title);
+			h += '<td >' + DOM.createHTML('a', {role: 'button', id : t.id + '_action', tabindex: '-1', href : 'javascript:;', 'class' : 'mceAction ' + s['class'], onclick : "return false;", onmousedown : 'return false;', title : s.title}, h1) + '</td>';
+	
+			h1 = DOM.createHTML('span', {'class' : 'mceOpen ' + s['class']}, '<span style="display:none;" class="mceIconOnly" aria-hidden="true">\u25BC</span>');
+			h += '<td >' + DOM.createHTML('a', {role: 'button', id : t.id + '_open', tabindex: '-1', href : 'javascript:;', 'class' : 'mceOpen ' + s['class'], onclick : "return false;", onmousedown : 'return false;', title : s.title}, h1) + '</td>';
+
+			h += '</tr></tbody>';
+			h = DOM.createHTML('table', { role: 'presentation',   'class' : 'mceSplitButton mceSplitButtonEnabled ' + s['class'], cellpadding : '0', cellspacing : '0', title : s.title}, h);
+			return DOM.createHTML('div', {id : t.id, role: 'button', tabindex: '0', 'aria-labelledby': t.id + '_voice', 'aria-haspopup': 'true'}, h);
+		},
+
+		postRender : function() {
+			var t = this, s = t.settings, activate;
+
+			if (s.onclick) {
+				activate = function(evt) {
+					if (!t.isDisabled()) {
+						s.onclick(t.value);
+						Event.cancel(evt);
+					}
+				};
+				Event.add(t.id + '_action', 'click', activate);
+				Event.add(t.id, ['click', 'keydown'], function(evt) {
+					var DOM_VK_SPACE = 32, DOM_VK_ENTER = 14, DOM_VK_RETURN = 13, DOM_VK_UP = 38, DOM_VK_DOWN = 40;
+					if ((evt.keyCode === 32 || evt.keyCode === 13 || evt.keyCode === 14) && !evt.altKey && !evt.ctrlKey && !evt.metaKey) {
+						activate();
+						Event.cancel(evt);
+					} else if (evt.type === 'click' || evt.keyCode === DOM_VK_DOWN) {
+						t.showMenu();
+						Event.cancel(evt);
+					}
+				});
+			}
+
+			Event.add(t.id + '_open', 'click', function (evt) {
+				t.showMenu();
+				Event.cancel(evt);
+			});
+			Event.add([t.id, t.id + '_open'], 'focus', function() {t._focused = 1;});
+			Event.add([t.id, t.id + '_open'], 'blur', function() {t._focused = 0;});
+
+			// Old IE doesn't have hover on all elements
+			if (tinymce.isIE6 || !DOM.boxModel) {
+				Event.add(t.id, 'mouseover', function() {
+					if (!DOM.hasClass(t.id, 'mceSplitButtonDisabled'))
+						DOM.addClass(t.id, 'mceSplitButtonHover');
+				});
+
+				Event.add(t.id, 'mouseout', function() {
+					if (!DOM.hasClass(t.id, 'mceSplitButtonDisabled'))
+						DOM.removeClass(t.id, 'mceSplitButtonHover');
+				});
+			}
+		},
+
+		destroy : function() {
+			this.parent();
+
+			Event.clear(this.id + '_action');
+			Event.clear(this.id + '_open');
+			Event.clear(this.id);
+		}
+	});
+})(tinymce);
+
+(function(tinymce) {
+	var DOM = tinymce.DOM, Event = tinymce.dom.Event, is = tinymce.is, each = tinymce.each;
+
+	tinymce.create('tinymce.ui.ColorSplitButton:tinymce.ui.SplitButton', {
+		ColorSplitButton : function(id, s, ed) {
+			var t = this;
+
+			t.parent(id, s, ed);
+
+			t.settings = s = tinymce.extend({
+				colors : '000000,993300,333300,003300,003366,000080,333399,333333,800000,FF6600,808000,008000,008080,0000FF,666699,808080,FF0000,FF9900,99CC00,339966,33CCCC,3366FF,800080,999999,FF00FF,FFCC00,FFFF00,00FF00,00FFFF,00CCFF,993366,C0C0C0,FF99CC,FFCC99,FFFF99,CCFFCC,CCFFFF,99CCFF,CC99FF,FFFFFF',
+				grid_width : 8,
+				default_color : '#888888'
+			}, t.settings);
+
+			t.onShowMenu = new tinymce.util.Dispatcher(t);
+
+			t.onHideMenu = new tinymce.util.Dispatcher(t);
+
+			t.value = s.default_color;
+		},
+
+		showMenu : function() {
+			var t = this, r, p, e, p2;
+
+			if (t.isDisabled())
+				return;
+
+			if (!t.isMenuRendered) {
+				t.renderMenu();
+				t.isMenuRendered = true;
+			}
+
+			if (t.isMenuVisible)
+				return t.hideMenu();
+
+			e = DOM.get(t.id);
+			DOM.show(t.id + '_menu');
+			DOM.addClass(e, 'mceSplitButtonSelected');
+			p2 = DOM.getPos(e);
+			DOM.setStyles(t.id + '_menu', {
+				left : p2.x,
+				top : p2.y + e.firstChild.clientHeight,
+				zIndex : 200000
+			});
+			e = 0;
+
+			Event.add(DOM.doc, 'mousedown', t.hideMenu, t);
+			t.onShowMenu.dispatch(t);
+
+			if (t._focused) {
+				t._keyHandler = Event.add(t.id + '_menu', 'keydown', function(e) {
+					if (e.keyCode == 27)
+						t.hideMenu();
+				});
+
+				DOM.select('a', t.id + '_menu')[0].focus(); // Select first link
+			}
+
+			t.keyboardNav = new tinymce.ui.KeyboardNavigation({
+				root: t.id + '_menu',
+				items: DOM.select('a', t.id + '_menu'),
+				onCancel: function() {
+					t.hideMenu();
+					t.focus();
+				}
+			});
+
+			t.keyboardNav.focus();
+			t.isMenuVisible = 1;
+		},
+
+		hideMenu : function(e) {
+			var t = this;
+
+			if (t.isMenuVisible) {
+				// Prevent double toogles by canceling the mouse click event to the button
+				if (e && e.type == "mousedown" && DOM.getParent(e.target, function(e) {return e.id === t.id + '_open';}))
+					return;
+
+				if (!e || !DOM.getParent(e.target, '.mceSplitButtonMenu')) {
+					DOM.removeClass(t.id, 'mceSplitButtonSelected');
+					Event.remove(DOM.doc, 'mousedown', t.hideMenu, t);
+					Event.remove(t.id + '_menu', 'keydown', t._keyHandler);
+					DOM.hide(t.id + '_menu');
+				}
+
+				t.isMenuVisible = 0;
+				t.onHideMenu.dispatch();
+				t.keyboardNav.destroy();
+			}
+		},
+
+		renderMenu : function() {
+			var t = this, m, i = 0, s = t.settings, n, tb, tr, w, context;
+
+			w = DOM.add(s.menu_container, 'div', {role: 'listbox', id : t.id + '_menu', 'class' : s.menu_class + ' ' + s['class'], style : 'position:absolute;left:0;top:-1000px;'});
+			m = DOM.add(w, 'div', {'class' : s['class'] + ' mceSplitButtonMenu'});
+			DOM.add(m, 'span', {'class' : 'mceMenuLine'});
+
+			n = DOM.add(m, 'table', {role: 'presentation', 'class' : 'mceColorSplitMenu'});
+			tb = DOM.add(n, 'tbody');
+
+			// Generate color grid
+			i = 0;
+			each(is(s.colors, 'array') ? s.colors : s.colors.split(','), function(c) {
+				c = c.replace(/^#/, '');
+
+				if (!i--) {
+					tr = DOM.add(tb, 'tr');
+					i = s.grid_width - 1;
+				}
+
+				n = DOM.add(tr, 'td');
+				var settings = {
+					href : 'javascript:;',
+					style : {
+						backgroundColor : '#' + c
+					},
+					'title': t.editor.getLang('colors.' + c, c),
+					'data-mce-color' : '#' + c
+				};
+
+				// adding a proper ARIA role = button causes JAWS to read things incorrectly on IE.
+				if (!tinymce.isIE ) {
+					settings.role = 'option';
+				}
+
+				n = DOM.add(n, 'a', settings);
+
+				if (t.editor.forcedHighContrastMode) {
+					n = DOM.add(n, 'canvas', { width: 16, height: 16, 'aria-hidden': 'true' });
+					if (n.getContext && (context = n.getContext("2d"))) {
+						context.fillStyle = '#' + c;
+						context.fillRect(0, 0, 16, 16);
+					} else {
+						// No point leaving a canvas element around if it's not supported for drawing on anyway.
+						DOM.remove(n);
+					}
+				}
+			});
+
+			if (s.more_colors_func) {
+				n = DOM.add(tb, 'tr');
+				n = DOM.add(n, 'td', {colspan : s.grid_width, 'class' : 'mceMoreColors'});
+				n = DOM.add(n, 'a', {role: 'option', id : t.id + '_more', href : 'javascript:;', onclick : 'return false;', 'class' : 'mceMoreColors'}, s.more_colors_title);
+
+				Event.add(n, 'click', function(e) {
+					s.more_colors_func.call(s.more_colors_scope || this);
+					return Event.cancel(e); // Cancel to fix onbeforeunload problem
+				});
+			}
+
+			DOM.addClass(m, 'mceColorSplitMenu');
+
+			// Prevent IE from scrolling and hindering click to occur #4019
+			Event.add(t.id + '_menu', 'mousedown', function(e) {return Event.cancel(e);});
+
+			Event.add(t.id + '_menu', 'click', function(e) {
+				var c;
+
+				e = DOM.getParent(e.target, 'a', tb);
+
+				if (e && e.nodeName.toLowerCase() == 'a' && (c = e.getAttribute('data-mce-color')))
+					t.setColor(c);
+
+				return false; // Prevent IE auto save warning
+			});
+
+			return w;
+		},
+
+		setColor : function(c) {
+			this.displayColor(c);
+			this.hideMenu();
+			this.settings.onselect(c);
+		},
+		
+		displayColor : function(c) {
+			var t = this;
+
+			DOM.setStyle(t.id + '_preview', 'backgroundColor', c);
+
+			t.value = c;
+		},
+
+		postRender : function() {
+			var t = this, id = t.id;
+
+			t.parent();
+			DOM.add(id + '_action', 'div', {id : id + '_preview', 'class' : 'mceColorPreview'});
+			DOM.setStyle(t.id + '_preview', 'backgroundColor', t.value);
+		},
+
+		destroy : function() {
+			var self = this;
+
+			self.parent();
+
+			Event.clear(self.id + '_menu');
+			Event.clear(self.id + '_more');
+			DOM.remove(self.id + '_menu');
+
+			if (self.keyboardNav) {
+				self.keyboardNav.destroy();
+			}
+		}
+	});
+})(tinymce);
+
+(function(tinymce) {
+// Shorten class names
+var dom = tinymce.DOM, each = tinymce.each, Event = tinymce.dom.Event;
+tinymce.create('tinymce.ui.ToolbarGroup:tinymce.ui.Container', {
+	renderHTML : function() {
+		var t = this, h = [], controls = t.controls, each = tinymce.each, settings = t.settings;
+
+		h.push('<div id="' + t.id + '" role="group" aria-labelledby="' + t.id + '_voice">');
+		//TODO: ACC test this out - adding a role = application for getting the landmarks working well.
+		h.push("<span role='application'>");
+		h.push('<span id="' + t.id + '_voice" class="mceVoiceLabel" style="display:none;">' + dom.encode(settings.name) + '</span>');
+		each(controls, function(toolbar) {
+			h.push(toolbar.renderHTML());
+		});
+		h.push("</span>");
+		h.push('</div>');
+
+		return h.join('');
+	},
+	
+	focus : function() {
+		var t = this;
+		dom.get(t.id).focus();
+	},
+	
+	postRender : function() {
+		var t = this, items = [];
+
+		each(t.controls, function(toolbar) {
+			each (toolbar.controls, function(control) {
+				if (control.id) {
+					items.push(control);
+				}
+			});
+		});
+
+		t.keyNav = new tinymce.ui.KeyboardNavigation({
+			root: t.id,
+			items: items,
+			onCancel: function() {
+				//Move focus if webkit so that navigation back will read the item.
+				if (tinymce.isWebKit) {
+					dom.get(t.editor.id+"_ifr").focus();
+				}
+				t.editor.focus();
+			},
+			excludeFromTabOrder: !t.settings.tab_focus_toolbar
+		});
+	},
+	
+	destroy : function() {
+		var self = this;
+
+		self.parent();
+		self.keyNav.destroy();
+		Event.clear(self.id);
+	}
+});
+})(tinymce);
+
+(function(tinymce) {
+// Shorten class names
+var dom = tinymce.DOM, each = tinymce.each;
+tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
+	renderHTML : function() {
+		var t = this, h = '', c, co, s = t.settings, i, pr, nx, cl;
+
+		cl = t.controls;
+		for (i=0; i<cl.length; i++) {
+			// Get current control, prev control, next control and if the control is a list box or not
+			co = cl[i];
+			pr = cl[i - 1];
+			nx = cl[i + 1];
+
+			// Add toolbar start
+			if (i === 0) {
+				c = 'mceToolbarStart';
+
+				if (co.Button)
+					c += ' mceToolbarStartButton';
+				else if (co.SplitButton)
+					c += ' mceToolbarStartSplitButton';
+				else if (co.ListBox)
+					c += ' mceToolbarStartListBox';
+
+				h += dom.createHTML('td', {'class' : c}, dom.createHTML('span', null, '<!-- IE -->'));
+			}
+
+			// Add toolbar end before list box and after the previous button
+			// This is to fix the o2k7 editor skins
+			if (pr && co.ListBox) {
+				if (pr.Button || pr.SplitButton)
+					h += dom.createHTML('td', {'class' : 'mceToolbarEnd'}, dom.createHTML('span', null, '<!-- IE -->'));
+			}
+
+			// Render control HTML
+
+			// IE 8 quick fix, needed to propertly generate a hit area for anchors
+			if (dom.stdMode)
+				h += '<td style="position: relative">' + co.renderHTML() + '</td>';
+			else
+				h += '<td>' + co.renderHTML() + '</td>';
+
+			// Add toolbar start after list box and before the next button
+			// This is to fix the o2k7 editor skins
+			if (nx && co.ListBox) {
+				if (nx.Button || nx.SplitButton)
+					h += dom.createHTML('td', {'class' : 'mceToolbarStart'}, dom.createHTML('span', null, '<!-- IE -->'));
+			}
+		}
+
+		c = 'mceToolbarEnd';
+
+		if (co.Button)
+			c += ' mceToolbarEndButton';
+		else if (co.SplitButton)
+			c += ' mceToolbarEndSplitButton';
+		else if (co.ListBox)
+			c += ' mceToolbarEndListBox';
+
+		h += dom.createHTML('td', {'class' : c}, dom.createHTML('span', null, '<!-- IE -->'));
+
+		return dom.createHTML('table', {id : t.id, 'class' : 'mceToolbar' + (s['class'] ? ' ' + s['class'] : ''), cellpadding : '0', cellspacing : '0', align : t.settings.align || '', role: 'presentation', tabindex: '-1'}, '<tbody><tr>' + h + '</tr></tbody>');
+	}
+});
+})(tinymce);
+
+(function(tinymce) {
+	var Dispatcher = tinymce.util.Dispatcher, each = tinymce.each;
+
+	tinymce.create('tinymce.AddOnManager', {
+		AddOnManager : function() {
+			var self = this;
+
+			self.items = [];
+			self.urls = {};
+			self.lookup = {};
+			self.onAdd = new Dispatcher(self);
+		},
+
+		get : function(n) {
+			if (this.lookup[n]) {
+				return this.lookup[n].instance;
+			} else {
+				return undefined;
+			}
+		},
+
+		dependencies : function(n) {
+			var result;
+			if (this.lookup[n]) {
+				result = this.lookup[n].dependencies;
+			}
+			return result || [];
+		},
+
+		requireLangPack : function(n) {
+			var s = tinymce.settings;
+
+			if (s && s.language && s.language_load !== false)
+				tinymce.ScriptLoader.add(this.urls[n] + '/langs/' + s.language + '.js');
+		},
+
+		add : function(id, o, dependencies) {
+			this.items.push(o);
+			this.lookup[id] = {instance:o, dependencies:dependencies};
+			this.onAdd.dispatch(this, id, o);
+
+			return o;
+		},
+		createUrl: function(baseUrl, dep) {
+			if (typeof dep === "object") {
+				return dep
+			} else {
+				return {prefix: baseUrl.prefix, resource: dep, suffix: baseUrl.suffix};
+			}
+		},
+
+		addComponents: function(pluginName, scripts) {
+			var pluginUrl = this.urls[pluginName];
+			tinymce.each(scripts, function(script){
+				tinymce.ScriptLoader.add(pluginUrl+"/"+script);	
+			});
+		},
+
+		load : function(n, u, cb, s) {
+			var t = this, url = u;
+
+			function loadDependencies() {
+				var dependencies = t.dependencies(n);
+				tinymce.each(dependencies, function(dep) {
+					var newUrl = t.createUrl(u, dep);
+					t.load(newUrl.resource, newUrl, undefined, undefined);
+				});
+				if (cb) {
+					if (s) {
+						cb.call(s);
+					} else {
+						cb.call(tinymce.ScriptLoader);
+					}
+				}
+			}
+
+			if (t.urls[n])
+				return;
+			if (typeof u === "object")
+				url = u.prefix + u.resource + u.suffix;
+
+			if (url.indexOf('/') !== 0 && url.indexOf('://') == -1)
+				url = tinymce.baseURL + '/' + url;
+
+			t.urls[n] = url.substring(0, url.lastIndexOf('/'));
+
+			if (t.lookup[n]) {
+				loadDependencies();
+			} else {
+				tinymce.ScriptLoader.add(url, loadDependencies, s);
+			}
+		}
+	});
+
+	// Create plugin and theme managers
+	tinymce.PluginManager = new tinymce.AddOnManager();
+	tinymce.ThemeManager = new tinymce.AddOnManager();
+}(tinymce));
+
+(function(tinymce) {
+	// Shorten names
+	var each = tinymce.each, extend = tinymce.extend,
+		DOM = tinymce.DOM, Event = tinymce.dom.Event,
+		ThemeManager = tinymce.ThemeManager, PluginManager = tinymce.PluginManager,
+		explode = tinymce.explode,
+		Dispatcher = tinymce.util.Dispatcher, undef, instanceCounter = 0;
+
+	// Setup some URLs where the editor API is located and where the document is
+	tinymce.documentBaseURL = window.location.href.replace(/[\?#].*$/, '').replace(/[\/\\][^\/]+$/, '');
+	if (!/[\/\\]$/.test(tinymce.documentBaseURL))
+		tinymce.documentBaseURL += '/';
+
+	tinymce.baseURL = new tinymce.util.URI(tinymce.documentBaseURL).toAbsolute(tinymce.baseURL);
+
+	tinymce.baseURI = new tinymce.util.URI(tinymce.baseURL);
+
+	// Add before unload listener
+	// This was required since IE was leaking memory if you added and removed beforeunload listeners
+	// with attachEvent/detatchEvent so this only adds one listener and instances can the attach to the onBeforeUnload event
+	tinymce.onBeforeUnload = new Dispatcher(tinymce);
+
+	// Must be on window or IE will leak if the editor is placed in frame or iframe
+	Event.add(window, 'beforeunload', function(e) {
+		tinymce.onBeforeUnload.dispatch(tinymce, e);
+	});
+
+	tinymce.onAddEditor = new Dispatcher(tinymce);
+
+	tinymce.onRemoveEditor = new Dispatcher(tinymce);
+
+	tinymce.EditorManager = extend(tinymce, {
+		editors : [],
+
+		i18n : {},
+
+		activeEditor : null,
+
+		init : function(s) {
+			var t = this, pl, sl = tinymce.ScriptLoader, e, el = [], ed;
+
+			function createId(elm) {
+				var id = elm.id;
+	
+				// Use element id, or unique name or generate a unique id
+				if (!id) {
+					id = elm.name;
+	
+					if (id && !DOM.get(id)) {
+						id = elm.name;
+					} else {
+						// Generate unique name
+						id = DOM.uniqueId();
+					}
+
+					elm.setAttribute('id', id);
+				}
+
+				return id;
+			};
+
+			function execCallback(se, n, s) {
+				var f = se[n];
+
+				if (!f)
+					return;
+
+				if (tinymce.is(f, 'string')) {
+					s = f.replace(/\.\w+$/, '');
+					s = s ? tinymce.resolve(s) : 0;
+					f = tinymce.resolve(f);
+				}
+
+				return f.apply(s || this, Array.prototype.slice.call(arguments, 2));
+			};
+
+			function hasClass(n, c) {
+				return c.constructor === RegExp ? c.test(n.className) : DOM.hasClass(n, c);
+			};
+
+			t.settings = s;
+
+			// Legacy call
+			Event.bind(window, 'ready', function() {
+				var l, co;
+
+				execCallback(s, 'onpageload');
+
+				switch (s.mode) {
+					case "exact":
+						l = s.elements || '';
+
+						if(l.length > 0) {
+							each(explode(l), function(v) {
+								if (DOM.get(v)) {
+									ed = new tinymce.Editor(v, s);
+									el.push(ed);
+									ed.render(1);
+								} else {
+									each(document.forms, function(f) {
+										each(f.elements, function(e) {
+											if (e.name === v) {
+												v = 'mce_editor_' + instanceCounter++;
+												DOM.setAttrib(e, 'id', v);
+
+												ed = new tinymce.Editor(v, s);
+												el.push(ed);
+												ed.render(1);
+											}
+										});
+									});
+								}
+							});
+						}
+						break;
+
+					case "textareas":
+					case "specific_textareas":
+						each(DOM.select('textarea'), function(elm) {
+							if (s.editor_deselector && hasClass(elm, s.editor_deselector))
+								return;
+
+							if (!s.editor_selector || hasClass(elm, s.editor_selector)) {
+								ed = new tinymce.Editor(createId(elm), s);
+								el.push(ed);
+								ed.render(1);
+							}
+						});
+						break;
+					
+					default:
+						if (s.types) {
+							// Process type specific selector
+							each(s.types, function(type) {
+								each(DOM.select(type.selector), function(elm) {
+									var editor = new tinymce.Editor(createId(elm), tinymce.extend({}, s, type));
+									el.push(editor);
+									editor.render(1);
+								});
+							});
+						} else if (s.selector) {
+							// Process global selector
+							each(DOM.select(s.selector), function(elm) {
+								var editor = new tinymce.Editor(createId(elm), s);
+								el.push(editor);
+								editor.render(1);
+							});
+						}
+				}
+
+				// Call onInit when all editors are initialized
+				if (s.oninit) {
+					l = co = 0;
+
+					each(el, function(ed) {
+						co++;
+
+						if (!ed.initialized) {
+							// Wait for it
+							ed.onInit.add(function() {
+								l++;
+
+								// All done
+								if (l == co)
+									execCallback(s, 'oninit');
+							});
+						} else
+							l++;
+
+						// All done
+						if (l == co)
+							execCallback(s, 'oninit');					
+					});
+				}
+			});
+		},
+
+		get : function(id) {
+			if (id === undef)
+				return this.editors;
+
+			if (!this.editors.hasOwnProperty(id))
+				return undef;
+
+			return this.editors[id];
+		},
+
+		getInstanceById : function(id) {
+			return this.get(id);
+		},
+
+		add : function(editor) {
+			var self = this, editors = self.editors;
+
+			// Add named and index editor instance
+			editors[editor.id] = editor;
+			editors.push(editor);
+
+			self._setActive(editor);
+			self.onAddEditor.dispatch(self, editor);
+
+
+			// Patch the tinymce.Editor instance with jQuery adapter logic
+			if (tinymce.adapter)
+				tinymce.adapter.patchEditor(editor);
+
+
+			return editor;
+		},
+
+		remove : function(editor) {
+			var t = this, i, editors = t.editors;
+
+			// Not in the collection
+			if (!editors[editor.id])
+				return null;
+
+			delete editors[editor.id];
+
+			for (i = 0; i < editors.length; i++) {
+				if (editors[i] == editor) {
+					editors.splice(i, 1);
+					break;
+				}
+			}
+
+			// Select another editor since the active one was removed
+			if (t.activeEditor == editor)
+				t._setActive(editors[0]);
+
+			editor.destroy();
+			t.onRemoveEditor.dispatch(t, editor);
+
+			return editor;
+		},
+
+		execCommand : function(c, u, v) {
+			var t = this, ed = t.get(v), w;
+
+			function clr() {
+				ed.destroy();
+				w.detachEvent('onunload', clr);
+				w = w.tinyMCE = w.tinymce = null; // IE leak
+			};
+
+			// Manager commands
+			switch (c) {
+				case "mceFocus":
+					ed.focus();
+					return true;
+
+				case "mceAddEditor":
+				case "mceAddControl":
+					if (!t.get(v))
+						new tinymce.Editor(v, t.settings).render();
+
+					return true;
+
+				case "mceAddFrameControl":
+					w = v.window;
+
+					// Add tinyMCE global instance and tinymce namespace to specified window
+					w.tinyMCE = tinyMCE;
+					w.tinymce = tinymce;
+
+					tinymce.DOM.doc = w.document;
+					tinymce.DOM.win = w;
+
+					ed = new tinymce.Editor(v.element_id, v);
+					ed.render();
+
+					// Fix IE memory leaks
+					if (tinymce.isIE && ! tinymce.isIE11) {
+						w.attachEvent('onunload', clr);
+					}
+
+					v.page_window = null;
+
+					return true;
+
+				case "mceRemoveEditor":
+				case "mceRemoveControl":
+					if (ed)
+						ed.remove();
+
+					return true;
+
+				case 'mceToggleEditor':
+					if (!ed) {
+						t.execCommand('mceAddControl', 0, v);
+						return true;
+					}
+
+					if (ed.isHidden())
+						ed.show();
+					else
+						ed.hide();
+
+					return true;
+			}
+
+			// Run command on active editor
+			if (t.activeEditor)
+				return t.activeEditor.execCommand(c, u, v);
+
+			return false;
+		},
+
+		execInstanceCommand : function(id, c, u, v) {
+			var ed = this.get(id);
+
+			if (ed)
+				return ed.execCommand(c, u, v);
+
+			return false;
+		},
+
+		triggerSave : function() {
+			each(this.editors, function(e) {
+				e.save();
+			});
+		},
+
+		addI18n : function(p, o) {
+			var lo, i18n = this.i18n;
+
+			if (!tinymce.is(p, 'string')) {
+				each(p, function(o, lc) {
+					each(o, function(o, g) {
+						each(o, function(o, k) {
+							if (g === 'common')
+								i18n[lc + '.' + k] = o;
+							else
+								i18n[lc + '.' + g + '.' + k] = o;
+						});
+					});
+				});
+			} else {
+				each(o, function(o, k) {
+					i18n[p + '.' + k] = o;
+				});
+			}
+		},
+
+		// Private methods
+
+		_setActive : function(editor) {
+			this.selectedInstance = this.activeEditor = editor;
+		}
+	});
+})(tinymce);
+
+(function(tinymce) {
+	// Shorten these names
+	var DOM = tinymce.DOM, Event = tinymce.dom.Event, extend = tinymce.extend,
+		each = tinymce.each, isGecko = tinymce.isGecko,
+		isIE = tinymce.isIE, isWebKit = tinymce.isWebKit, is = tinymce.is,
+		ThemeManager = tinymce.ThemeManager, PluginManager = tinymce.PluginManager,
+		explode = tinymce.explode;
+
+	tinymce.create('tinymce.Editor', {
+		Editor : function(id, settings) {
+			var self = this, TRUE = true;
+
+			self.settings = settings = extend({
+				id : id,
+				language : 'en',
+				theme : 'advanced',
+				skin : 'default',
+				delta_width : 0,
+				delta_height : 0,
+				popup_css : '',
+				plugins : '',
+				document_base_url : tinymce.documentBaseURL,
+				add_form_submit_trigger : TRUE,
+				submit_patch : TRUE,
+				add_unload_trigger : TRUE,
+				convert_urls : TRUE,
+				relative_urls : TRUE,
+				remove_script_host : TRUE,
+				table_inline_editing : false,
+				object_resizing : TRUE,
+				accessibility_focus : TRUE,
+				doctype : tinymce.isIE6 ? '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">' : '<!DOCTYPE>', // Use old doctype on IE 6 to avoid horizontal scroll
+				visual : TRUE,
+				font_size_style_values : 'xx-small,x-small,small,medium,large,x-large,xx-large',
+				font_size_legacy_values : 'xx-small,small,medium,large,x-large,xx-large,300%', // See: http://www.w3.org/TR/CSS2/fonts.html#propdef-font-size
+				apply_source_formatting : TRUE,
+				directionality : 'ltr',
+				forced_root_block : 'p',
+				hidden_input : TRUE,
+				padd_empty_editor : TRUE,
+				render_ui : TRUE,
+				indentation : '30px',
+				fix_table_elements : TRUE,
+				inline_styles : TRUE,
+				convert_fonts_to_spans : TRUE,
+				indent : 'simple',
+				indent_before : 'p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,ul,li,area,table,thead,tfoot,tbody,tr,section,article,hgroup,aside,figure,option,optgroup,datalist',
+				indent_after : 'p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,ul,li,area,table,thead,tfoot,tbody,tr,section,article,hgroup,aside,figure,option,optgroup,datalist',
+				validate : TRUE,
+				entity_encoding : 'named',
+				url_converter : self.convertURL,
+				url_converter_scope : self,
+				ie7_compat : TRUE
+			}, settings);
+
+			self.id = self.editorId = id;
+
+			self.isNotDirty = false;
+
+			self.plugins = {};
+
+			self.documentBaseURI = new tinymce.util.URI(settings.document_base_url || tinymce.documentBaseURL, {
+				base_uri : tinyMCE.baseURI
+			});
+
+			self.baseURI = tinymce.baseURI;
+
+			self.contentCSS = [];
+
+			self.contentStyles = [];
+
+			// Creates all events like onClick, onSetContent etc see Editor.Events.js for the actual logic
+			self.setupEvents();
+
+			// Internal command handler objects
+			self.execCommands = {};
+			self.queryStateCommands = {};
+			self.queryValueCommands = {};
+
+			// Call setup
+			self.execCallback('setup', self);
+		},
+
+		render : function(nst) {
+			var t = this, s = t.settings, id = t.id, sl = tinymce.ScriptLoader;
+
+			// Page is not loaded yet, wait for it
+			if (!Event.domLoaded) {
+				Event.add(window, 'ready', function() {
+					t.render();
+				});
+				return;
+			}
+
+			tinyMCE.settings = s;
+
+			// Element not found, then skip initialization
+			if (!t.getElement())
+				return;
+
+			// Is a iPad/iPhone and not on iOS5, then skip initialization. We need to sniff 
+			// here since the browser says it has contentEditable support but there is no visible caret.
+			if (tinymce.isIDevice && !tinymce.isIOS5)
+				return;
+
+			// Add hidden input for non input elements inside form elements
+			if (!/TEXTAREA|INPUT/i.test(t.getElement().nodeName) && s.hidden_input && DOM.getParent(id, 'form'))
+				DOM.insertAfter(DOM.create('input', {type : 'hidden', name : id}), id);
+
+			// Hide target element early to prevent content flashing
+			if (!s.content_editable) {
+				t.orgVisibility = t.getElement().style.visibility;
+				t.getElement().style.visibility = 'hidden';
+			}
+
+			if (tinymce.WindowManager)
+				t.windowManager = new tinymce.WindowManager(t);
+
+			if (s.encoding == 'xml') {
+				t.onGetContent.add(function(ed, o) {
+					if (o.save)
+						o.content = DOM.encode(o.content);
+				});
+			}
+
+			if (s.add_form_submit_trigger) {
+				t.onSubmit.addToTop(function() {
+					if (t.initialized) {
+						t.save();
+						t.isNotDirty = 1;
+					}
+				});
+			}
+
+			if (s.add_unload_trigger) {
+				t._beforeUnload = tinyMCE.onBeforeUnload.add(function() {
+					if (t.initialized && !t.destroyed && !t.isHidden())
+						t.save({format : 'raw', no_events : true});
+				});
+			}
+
+			tinymce.addUnload(t.destroy, t);
+
+			if (s.submit_patch) {
+				t.onBeforeRenderUI.add(function() {
+					var n = t.getElement().form;
+
+					if (!n)
+						return;
+
+					// Already patched
+					if (n._mceOldSubmit)
+						return;
+
+					// Check page uses id="submit" or name="submit" for it's submit button
+					if (!n.submit.nodeType && !n.submit.length) {
+						t.formElement = n;
+						n._mceOldSubmit = n.submit;
+						n.submit = function() {
+							// Save all instances
+							tinymce.triggerSave();
+							t.isNotDirty = 1;
+
+							return t.formElement._mceOldSubmit(t.formElement);
+						};
+					}
+
+					n = null;
+				});
+			}
+
+			// Load scripts
+			function loadScripts() {
+				if (s.language && s.language_load !== false)
+					sl.add(tinymce.baseURL + '/langs/' + s.language + '.js');
+
+				if (s.theme && typeof s.theme != "function" && s.theme.charAt(0) != '-' && !ThemeManager.urls[s.theme])
+					ThemeManager.load(s.theme, 'themes/' + s.theme + '/editor_template' + tinymce.suffix + '.js');
+
+				each(explode(s.plugins), function(p) {
+					if (p &&!PluginManager.urls[p]) {
+						if (p.charAt(0) == '-') {
+							p = p.substr(1, p.length);
+							var dependencies = PluginManager.dependencies(p);
+							each(dependencies, function(dep) {
+								var defaultSettings = {prefix:'plugins/', resource: dep, suffix:'/editor_plugin' + tinymce.suffix + '.js'};
+								dep = PluginManager.createUrl(defaultSettings, dep);
+								PluginManager.load(dep.resource, dep);
+							});
+						} else {
+							// Skip safari plugin, since it is removed as of 3.3b1
+							if (p == 'safari') {
+								return;
+							}
+							PluginManager.load(p, {prefix:'plugins/', resource: p, suffix:'/editor_plugin' + tinymce.suffix + '.js'});
+						}
+					}
+				});
+
+				// Init when que is loaded
+				sl.loadQueue(function() {
+					if (!t.removed)
+						t.init();
+				});
+			};
+
+			loadScripts();
+		},
+
+		init : function() {
+			var n, t = this, s = t.settings, w, h, mh, e = t.getElement(), o, ti, u, bi, bc, re, i, initializedPlugins = [];
+
+			tinymce.add(t);
+
+			s.aria_label = s.aria_label || DOM.getAttrib(e, 'aria-label', t.getLang('aria.rich_text_area'));
+
+			if (s.theme) {
+				if (typeof s.theme != "function") {
+					s.theme = s.theme.replace(/-/, '');
+					o = ThemeManager.get(s.theme);
+					t.theme = new o();
+
+					if (t.theme.init)
+						t.theme.init(t, ThemeManager.urls[s.theme] || tinymce.documentBaseURL.replace(/\/$/, ''));
+				} else {
+					t.theme = s.theme;
+				}
+			}
+
+			function initPlugin(p) {
+				var c = PluginManager.get(p), u = PluginManager.urls[p] || tinymce.documentBaseURL.replace(/\/$/, ''), po;
+				if (c && tinymce.inArray(initializedPlugins,p) === -1) {
+					each(PluginManager.dependencies(p), function(dep){
+						initPlugin(dep);
+					});
+					po = new c(t, u);
+
+					t.plugins[p] = po;
+
+					if (po.init) {
+						po.init(t, u);
+						initializedPlugins.push(p);
+					}
+				}
+			}
+			
+			// Create all plugins
+			each(explode(s.plugins.replace(/\-/g, '')), initPlugin);
+
+			// Setup popup CSS path(s)
+			if (s.popup_css !== false) {
+				if (s.popup_css)
+					s.popup_css = t.documentBaseURI.toAbsolute(s.popup_css);
+				else
+					s.popup_css = t.baseURI.toAbsolute("themes/" + s.theme + "/skins/" + s.skin + "/dialog.css");
+			}
+
+			if (s.popup_css_add)
+				s.popup_css += ',' + t.documentBaseURI.toAbsolute(s.popup_css_add);
+
+			t.controlManager = new tinymce.ControlManager(t);
+
+			// Enables users to override the control factory
+			t.onBeforeRenderUI.dispatch(t, t.controlManager);
+
+			// Measure box
+			if (s.render_ui && t.theme) {
+				t.orgDisplay = e.style.display;
+
+				if (typeof s.theme != "function") {
+					w = s.width || e.style.width || e.offsetWidth;
+					h = s.height || e.style.height || e.offsetHeight;
+					mh = s.min_height || 100;
+					re = /^[0-9\.]+(|px)$/i;
+
+					if (re.test('' + w))
+						w = Math.max(parseInt(w, 10) + (o.deltaWidth || 0), 100);
+
+					if (re.test('' + h))
+						h = Math.max(parseInt(h, 10) + (o.deltaHeight || 0), mh);
+
+					// Render UI
+					o = t.theme.renderUI({
+						targetNode : e,
+						width : w,
+						height : h,
+						deltaWidth : s.delta_width,
+						deltaHeight : s.delta_height
+					});
+
+					// Resize editor
+					DOM.setStyles(o.sizeContainer || o.editorContainer, {
+						width : w,
+						height : h
+					});
+
+					h = (o.iframeHeight || h) + (typeof(h) == 'number' ? (o.deltaHeight || 0) : '');
+					if (h < mh)
+						h = mh;
+				} else {
+					o = s.theme(t, e);
+
+					// Convert element type to id:s
+					if (o.editorContainer.nodeType) {
+						o.editorContainer = o.editorContainer.id = o.editorContainer.id || t.id + "_parent";
+					}
+
+					// Convert element type to id:s
+					if (o.iframeContainer.nodeType) {
+						o.iframeContainer = o.iframeContainer.id = o.iframeContainer.id || t.id + "_iframecontainer";
+					}
+
+					// Use specified iframe height or the targets offsetHeight
+					h = o.iframeHeight || e.offsetHeight;
+
+					// Store away the selection when it's changed to it can be restored later with a editor.focus() call
+					if (isIE) {
+						t.onInit.add(function(ed) {
+							ed.dom.bind(ed.getBody(), 'beforedeactivate keydown keyup', function() {
+								ed.bookmark = ed.selection.getBookmark(1);
+							});
+						});
+
+						t.onNodeChange.add(function(ed) {
+							if (document.activeElement.id == ed.id + "_ifr") {
+								ed.bookmark = ed.selection.getBookmark(1);
+							}
+						});
+					}
+				}
+
+				t.editorContainer = o.editorContainer;
+			}
+
+			// Load specified content CSS last
+			if (s.content_css) {
+				each(explode(s.content_css), function(u) {
+					t.contentCSS.push(t.documentBaseURI.toAbsolute(u));
+				});
+			}
+
+			// Load specified content CSS last
+			if (s.content_style) {
+				t.contentStyles.push(s.content_style);
+			}
+
+			// Content editable mode ends here
+			if (s.content_editable) {
+				e = n = o = null; // Fix IE leak
+				return t.initContentBody();
+			}
+
+			// User specified a document.domain value
+			if (document.domain && location.hostname != document.domain)
+				tinymce.relaxedDomain = document.domain;
+
+			t.iframeHTML = s.doctype + '<html><head xmlns="http://www.w3.org/1999/xhtml">';
+
+			// We only need to override paths if we have to
+			// IE has a bug where it remove site absolute urls to relative ones if this is specified
+			if (s.document_base_url != tinymce.documentBaseURL)
+				t.iframeHTML += '<base href="' + t.documentBaseURI.getURI() + '" />';
+
+			// IE8 doesn't support carets behind images setting ie7_compat would force IE8+ to run in IE7 compat mode.
+			if (tinymce.isIE8) {
+				if (s.ie7_compat)
+					t.iframeHTML += '<meta http-equiv="X-UA-Compatible" content="IE=7" />';
+				else
+					t.iframeHTML += '<meta http-equiv="X-UA-Compatible" content="IE=edge" />';
+			}
+
+			t.iframeHTML += '<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />';
+
+			// Load the CSS by injecting them into the HTML this will reduce "flicker"
+			for (i = 0; i < t.contentCSS.length; i++) {
+				t.iframeHTML += '<link type="text/css" rel="stylesheet" href="' + t.contentCSS[i] + '" />';
+			}
+
+			t.contentCSS = [];
+
+			bi = s.body_id || 'tinymce';
+			if (bi.indexOf('=') != -1) {
+				bi = t.getParam('body_id', '', 'hash');
+				bi = bi[t.id] || bi;
+			}
+
+			bc = s.body_class || '';
+			if (bc.indexOf('=') != -1) {
+				bc = t.getParam('body_class', '', 'hash');
+				bc = bc[t.id] || '';
+			}
+
+			t.iframeHTML += '</head><body id="' + bi + '" class="mceContentBody ' + bc + '" onload="window.parent.tinyMCE.get(\'' + t.id + '\').onLoad.dispatch();"><br></body></html>';
+
+			// Domain relaxing enabled, then set document domain
+			if (tinymce.relaxedDomain && (isIE || (tinymce.isOpera && parseFloat(opera.version()) < 11))) {
+				// We need to write the contents here in IE since multiple writes messes up refresh button and back button
+				u = 'javascript:(function(){document.open();document.domain="' + document.domain + '";var ed = window.parent.tinyMCE.get("' + t.id + '");document.write(ed.iframeHTML);document.close();ed.initContentBody();})()';
+			}
+
+			// Create iframe
+			// TODO: ACC add the appropriate description on this.
+			n = DOM.add(o.iframeContainer, 'iframe', { 
+				id : t.id + "_ifr",
+				src : u || 'javascript:""', // Workaround for HTTPS warning in IE6/7
+				frameBorder : '0',
+				allowTransparency : "true",
+				title : s.aria_label,
+				style : {
+					width : '100%',
+					height : h,
+					display : 'block' // Important for Gecko to render the iframe correctly
+				}
+			});
+
+			t.contentAreaContainer = o.iframeContainer;
+
+			if (o.editorContainer) {
+				DOM.get(o.editorContainer).style.display = t.orgDisplay;
+			}
+
+			// Restore visibility on target element
+			e.style.visibility = t.orgVisibility;
+
+			DOM.get(t.id).style.display = 'none';
+			DOM.setAttrib(t.id, 'aria-hidden', true);
+
+			if (!tinymce.relaxedDomain || !u)
+				t.initContentBody();
+
+			e = n = o = null; // Cleanup
+		},
+
+		initContentBody : function() {
+			var self = this, settings = self.settings, targetElm = DOM.get(self.id), doc = self.getDoc(), html, body, contentCssText;
+
+			// Setup iframe body
+			if ((!isIE || !tinymce.relaxedDomain) && !settings.content_editable) {
+				doc.open();
+				doc.write(self.iframeHTML);
+				doc.close();
+
+				if (tinymce.relaxedDomain)
+					doc.domain = tinymce.relaxedDomain;
+			}
+
+			if (settings.content_editable) {
+				DOM.addClass(targetElm, 'mceContentBody');
+				self.contentDocument = doc = settings.content_document || document;
+				self.contentWindow = settings.content_window || window;
+				self.bodyElement = targetElm;
+
+				// Prevent leak in IE
+				settings.content_document = settings.content_window = null;
+			}
+
+			// It will not steal focus while setting contentEditable
+			body = self.getBody();
+			body.disabled = true;
+
+			if (!settings.readonly)
+				body.contentEditable = self.getParam('content_editable_state', true);
+
+			body.disabled = false;
+
+			self.schema = new tinymce.html.Schema(settings);
+
+			self.dom = new tinymce.dom.DOMUtils(doc, {
+				keep_values : true,
+				url_converter : self.convertURL,
+				url_converter_scope : self,
+				hex_colors : settings.force_hex_style_colors,
+				class_filter : settings.class_filter,
+				update_styles : true,
+				root_element : settings.content_editable ? self.id : null,
+				schema : self.schema
+			});
+
+			self.parser = new tinymce.html.DomParser(settings, self.schema);
+
+			// Convert src and href into data-mce-src, data-mce-href and data-mce-style
+			self.parser.addAttributeFilter('src,href,style', function(nodes, name) {
+				var i = nodes.length, node, dom = self.dom, value, internalName;
+
+				while (i--) {
+					node = nodes[i];
+					value = node.attr(name);
+					internalName = 'data-mce-' + name;
+
+					// Add internal attribute if we need to we don't on a refresh of the document
+					if (!node.attributes.map[internalName]) {	
+						if (name === "style")
+							node.attr(internalName, dom.serializeStyle(dom.parseStyle(value), node.name));
+						else
+							node.attr(internalName, self.convertURL(value, name, node.name));
+					}
+				}
+			});
+
+			// Keep scripts from executing
+			self.parser.addNodeFilter('script', function(nodes, name) {
+				var i = nodes.length, node;
+
+				while (i--) {
+					node = nodes[i];
+					node.attr('type', 'mce-' + (node.attr('type') || 'text/javascript'));
+				}
+			});
+
+			self.parser.addNodeFilter('#cdata', function(nodes, name) {
+				var i = nodes.length, node;
+
+				while (i--) {
+					node = nodes[i];
+					node.type = 8;
+					node.name = '#comment';
+					node.value = '[CDATA[' + node.value + ']]';
+				}
+			});
+
+			self.parser.addNodeFilter('p,h1,h2,h3,h4,h5,h6,div', function(nodes, name) {
+				var i = nodes.length, node, nonEmptyElements = self.schema.getNonEmptyElements();
+
+				while (i--) {
+					node = nodes[i];
+
+					if (node.isEmpty(nonEmptyElements))
+						node.empty().append(new tinymce.html.Node('br', 1)).shortEnded = true;
+				}
+			});
+
+			self.serializer = new tinymce.dom.Serializer(settings, self.dom, self.schema);
+
+			self.selection = new tinymce.dom.Selection(self.dom, self.getWin(), self.serializer, self);
+
+			self.formatter = new tinymce.Formatter(self);
+
+			self.undoManager = new tinymce.UndoManager(self);
+
+			self.forceBlocks = new tinymce.ForceBlocks(self);
+			self.enterKey = new tinymce.EnterKey(self);
+			self.editorCommands = new tinymce.EditorCommands(self);
+
+			self.onExecCommand.add(function(editor, command) {
+				// Don't refresh the select lists until caret move
+				if (!/^(FontName|FontSize)$/.test(command))
+					self.nodeChanged();
+			});
+
+			// Pass through
+			self.serializer.onPreProcess.add(function(se, o) {
+				return self.onPreProcess.dispatch(self, o, se);
+			});
+
+			self.serializer.onPostProcess.add(function(se, o) {
+				return self.onPostProcess.dispatch(self, o, se);
+			});
+
+			self.onPreInit.dispatch(self);
+
+			if (!settings.browser_spellcheck && !settings.gecko_spellcheck)
+				doc.body.spellcheck = false;
+
+			if (!settings.readonly) {
+				self.bindNativeEvents();
+			}
+
+			self.controlManager.onPostRender.dispatch(self, self.controlManager);
+			self.onPostRender.dispatch(self);
+
+			self.quirks = tinymce.util.Quirks(self);
+
+			if (settings.directionality)
+				body.dir = settings.directionality;
+
+			if (settings.nowrap)
+				body.style.whiteSpace = "nowrap";
+
+			if (settings.protect) {
+				self.onBeforeSetContent.add(function(ed, o) {
+					each(settings.protect, function(pattern) {
+						o.content = o.content.replace(pattern, function(str) {
+							return '<!--mce:protected ' + escape(str) + '-->';
+						});
+					});
+				});
+			}
+
+			// Add visual aids when new contents is added
+			self.onSetContent.add(function() {
+				self.addVisual(self.getBody());
+			});
+
+			// Remove empty contents
+			if (settings.padd_empty_editor) {
+				self.onPostProcess.add(function(ed, o) {
+					o.content = o.content.replace(/^(<p[^>]*>(&nbsp;|&#160;|\s|\u00a0|)<\/p>[\r\n]*|<br \/>[\r\n]*)$/, '');
+				});
+			}
+
+			self.load({initial : true, format : 'html'});
+			self.startContent = self.getContent({format : 'raw'});
+
+			self.initialized = true;
+
+			self.onInit.dispatch(self);
+			self.execCallback('setupcontent_callback', self.id, body, doc);
+			self.execCallback('init_instance_callback', self);
+			self.focus(true);
+			self.nodeChanged({initial : true});
+
+			// Add editor specific CSS styles
+			if (self.contentStyles.length > 0) {
+				contentCssText = '';
+
+				each(self.contentStyles, function(style) {
+					contentCssText += style + "\r\n";
+				});
+
+				self.dom.addStyle(contentCssText);
+			}
+
+			// Load specified content CSS last
+			each(self.contentCSS, function(url) {
+				self.dom.loadCSS(url);
+			});
+
+			// Handle auto focus
+			if (settings.auto_focus) {
+				setTimeout(function () {
+					var ed = tinymce.get(settings.auto_focus);
+
+					ed.selection.select(ed.getBody(), 1);
+					ed.selection.collapse(1);
+					ed.getBody().focus();
+					ed.getWin().focus();
+				}, 100);
+			}
+
+			// Clean up references for IE
+			targetElm = doc = body = null;
+		},
+
+		focus : function(skip_focus) {
+			var oed, self = this, selection = self.selection, contentEditable = self.settings.content_editable, ieRng, controlElm, doc = self.getDoc(), body;
+
+			if (!skip_focus) {
+				if (self.bookmark) {
+					selection.moveToBookmark(self.bookmark);
+					self.bookmark = null;
+				}
+
+				// Get selected control element
+				ieRng = selection.getRng();
+				if (ieRng.item) {
+					controlElm = ieRng.item(0);
+				}
+
+				self._refreshContentEditable();
+
+				// Focus the window iframe
+				if (!contentEditable) {
+					self.getWin().focus();
+				}
+
+				// Focus the body as well since it's contentEditable
+				if (tinymce.isGecko || contentEditable) {
+					body = self.getBody();
+
+					// Check for setActive since it doesn't scroll to the element
+					if (body.setActive && ! tinymce.isIE11) {
+						body.setActive();
+					} else {
+						body.focus();
+					}
+
+					if (contentEditable) {
+						selection.normalize();
+					}
+				}
+
+				// Restore selected control element
+				// This is needed when for example an image is selected within a
+				// layer a call to focus will then remove the control selection
+				if (controlElm && controlElm.ownerDocument == doc) {
+					ieRng = doc.body.createControlRange();
+					ieRng.addElement(controlElm);
+					ieRng.select();
+				}
+			}
+
+			if (tinymce.activeEditor != self) {
+				if ((oed = tinymce.activeEditor) != null)
+					oed.onDeactivate.dispatch(oed, self);
+
+				self.onActivate.dispatch(self, oed);
+			}
+
+			tinymce._setActive(self);
+		},
+
+		execCallback : function(n) {
+			var t = this, f = t.settings[n], s;
+
+			if (!f)
+				return;
+
+			// Look through lookup
+			if (t.callbackLookup && (s = t.callbackLookup[n])) {
+				f = s.func;
+				s = s.scope;
+			}
+
+			if (is(f, 'string')) {
+				s = f.replace(/\.\w+$/, '');
+				s = s ? tinymce.resolve(s) : 0;
+				f = tinymce.resolve(f);
+				t.callbackLookup = t.callbackLookup || {};
+				t.callbackLookup[n] = {func : f, scope : s};
+			}
+
+			return f.apply(s || t, Array.prototype.slice.call(arguments, 1));
+		},
+
+		translate : function(s) {
+			var c = this.settings.language || 'en', i18n = tinymce.i18n;
+
+			if (!s)
+				return '';
+
+			return i18n[c + '.' + s] || s.replace(/\{\#([^\}]+)\}/g, function(a, b) {
+				return i18n[c + '.' + b] || '{#' + b + '}';
+			});
+		},
+
+		getLang : function(n, dv) {
+			return tinymce.i18n[(this.settings.language || 'en') + '.' + n] || (is(dv) ? dv : '{#' + n + '}');
+		},
+
+		getParam : function(n, dv, ty) {
+			var tr = tinymce.trim, v = is(this.settings[n]) ? this.settings[n] : dv, o;
+
+			if (ty === 'hash') {
+				o = {};
+
+				if (is(v, 'string')) {
+					each(v.indexOf('=') > 0 ? v.split(/[;,](?![^=;,]*(?:[;,]|$))/) : v.split(','), function(v) {
+						v = v.split('=');
+
+						if (v.length > 1)
+							o[tr(v[0])] = tr(v[1]);
+						else
+							o[tr(v[0])] = tr(v);
+					});
+				} else
+					o = v;
+
+				return o;
+			}
+
+			return v;
+		},
+
+		nodeChanged : function(o) {
+			var self = this, selection = self.selection, node;
+
+			// Fix for bug #1896577 it seems that this can not be fired while the editor is loading
+			if (self.initialized) {
+				o = o || {};
+
+				// Get start node
+				node = selection.getStart() || self.getBody();
+				node = isIE && node.ownerDocument != self.getDoc() ? self.getBody() : node; // Fix for IE initial state
+
+				// Get parents and add them to object
+				o.parents = [];
+				self.dom.getParent(node, function(node) {
+					if (node.nodeName == 'BODY')
+						return true;
+
+					o.parents.push(node);
+				});
+
+				self.onNodeChange.dispatch(
+					self,
+					o ? o.controlManager || self.controlManager : self.controlManager,
+					node,
+					selection.isCollapsed(),
+					o
+				);
+			}
+		},
+
+		addButton : function(name, settings) {
+			var self = this;
+
+			self.buttons = self.buttons || {};
+			self.buttons[name] = settings;
+		},
+
+		addCommand : function(name, callback, scope) {
+			this.execCommands[name] = {func : callback, scope : scope || this};
+		},
+
+		addQueryStateHandler : function(name, callback, scope) {
+			this.queryStateCommands[name] = {func : callback, scope : scope || this};
+		},
+
+		addQueryValueHandler : function(name, callback, scope) {
+			this.queryValueCommands[name] = {func : callback, scope : scope || this};
+		},
+
+		addShortcut : function(pa, desc, cmd_func, sc) {
+			var t = this, c;
+
+			if (t.settings.custom_shortcuts === false)
+				return false;
+
+			t.shortcuts = t.shortcuts || {};
+
+			if (is(cmd_func, 'string')) {
+				c = cmd_func;
+
+				cmd_func = function() {
+					t.execCommand(c, false, null);
+				};
+			}
+
+			if (is(cmd_func, 'object')) {
+				c = cmd_func;
+
+				cmd_func = function() {
+					t.execCommand(c[0], c[1], c[2]);
+				};
+			}
+
+			each(explode(pa), function(pa) {
+				var o = {
+					func : cmd_func,
+					scope : sc || this,
+					desc : t.translate(desc),
+					alt : false,
+					ctrl : false,
+					shift : false
+				};
+
+				each(explode(pa, '+'), function(v) {
+					switch (v) {
+						case 'alt':
+						case 'ctrl':
+						case 'shift':
+							o[v] = true;
+							break;
+
+						default:
+							o.charCode = v.charCodeAt(0);
+							o.keyCode = v.toUpperCase().charCodeAt(0);
+					}
+				});
+
+				t.shortcuts[(o.ctrl ? 'ctrl' : '') + ',' + (o.alt ? 'alt' : '') + ',' + (o.shift ? 'shift' : '') + ',' + o.keyCode] = o;
+			});
+
+			return true;
+		},
+
+		execCommand : function(cmd, ui, val, a) {
+			var t = this, s = 0, o, st;
+
+			if (!/^(mceAddUndoLevel|mceEndUndoLevel|mceBeginUndoLevel|mceRepaint|SelectAll)$/.test(cmd) && (!a || !a.skip_focus))
+				t.focus();
+
+			a = extend({}, a);
+			t.onBeforeExecCommand.dispatch(t, cmd, ui, val, a);
+			if (a.terminate)
+				return false;
+
+			// Command callback
+			if (t.execCallback('execcommand_callback', t.id, t.selection.getNode(), cmd, ui, val)) {
+				t.onExecCommand.dispatch(t, cmd, ui, val, a);
+				return true;
+			}
+
+			// Registred commands
+			if (o = t.execCommands[cmd]) {
+				st = o.func.call(o.scope, ui, val);
+
+				// Fall through on true
+				if (st !== true) {
+					t.onExecCommand.dispatch(t, cmd, ui, val, a);
+					return st;
+				}
+			}
+
+			// Plugin commands
+			each(t.plugins, function(p) {
+				if (p.execCommand && p.execCommand(cmd, ui, val)) {
+					t.onExecCommand.dispatch(t, cmd, ui, val, a);
+					s = 1;
+					return false;
+				}
+			});
+
+			if (s)
+				return true;
+
+			// Theme commands
+			if (t.theme && t.theme.execCommand && t.theme.execCommand(cmd, ui, val)) {
+				t.onExecCommand.dispatch(t, cmd, ui, val, a);
+				return true;
+			}
+
+			// Editor commands
+			if (t.editorCommands.execCommand(cmd, ui, val)) {
+				t.onExecCommand.dispatch(t, cmd, ui, val, a);
+				return true;
+			}
+
+			// Browser commands
+			t.getDoc().execCommand(cmd, ui, val);
+			t.onExecCommand.dispatch(t, cmd, ui, val, a);
+		},
+
+		queryCommandState : function(cmd) {
+			var t = this, o, s;
+
+			// Is hidden then return undefined
+			if (t._isHidden())
+				return;
+
+			// Registred commands
+			if (o = t.queryStateCommands[cmd]) {
+				s = o.func.call(o.scope);
+
+				// Fall though on true
+				if (s !== true)
+					return s;
+			}
+
+			// Registred commands
+			o = t.editorCommands.queryCommandState(cmd);
+			if (o !== -1)
+				return o;
+
+			// Browser commands
+			try {
+				return this.getDoc().queryCommandState(cmd);
+			} catch (ex) {
+				// Fails sometimes see bug: 1896577
+			}
+		},
+
+		queryCommandValue : function(c) {
+			var t = this, o, s;
+
+			// Is hidden then return undefined
+			if (t._isHidden())
+				return;
+
+			// Registred commands
+			if (o = t.queryValueCommands[c]) {
+				s = o.func.call(o.scope);
+
+				// Fall though on true
+				if (s !== true)
+					return s;
+			}
+
+			// Registred commands
+			o = t.editorCommands.queryCommandValue(c);
+			if (is(o))
+				return o;
+
+			// Browser commands
+			try {
+				return this.getDoc().queryCommandValue(c);
+			} catch (ex) {
+				// Fails sometimes see bug: 1896577
+			}
+		},
+
+		show : function() {
+			var self = this;
+
+			DOM.show(self.getContainer());
+			DOM.hide(self.id);
+			self.load();
+		},
+
+		hide : function() {
+			var self = this, doc = self.getDoc();
+
+			// Fixed bug where IE has a blinking cursor left from the editor
+			if (isIE && doc)
+				doc.execCommand('SelectAll');
+
+			// We must save before we hide so Safari doesn't crash
+			self.save();
+
+			// defer the call to hide to prevent an IE9 crash #4921
+			DOM.hide(self.getContainer());
+			DOM.setStyle(self.id, 'display', self.orgDisplay);
+		},
+
+		isHidden : function() {
+			return !DOM.isHidden(this.id);
+		},
+
+		setProgressState : function(b, ti, o) {
+			this.onSetProgressState.dispatch(this, b, ti, o);
+
+			return b;
+		},
+
+		load : function(o) {
+			var t = this, e = t.getElement(), h;
+
+			if (e) {
+				o = o || {};
+				o.load = true;
+
+				// Double encode existing entities in the value
+				h = t.setContent(is(e.value) ? e.value : e.innerHTML, o);
+				o.element = e;
+
+				if (!o.no_events)
+					t.onLoadContent.dispatch(t, o);
+
+				o.element = e = null;
+
+				return h;
+			}
+		},
+
+		save : function(o) {
+			var t = this, e = t.getElement(), h, f;
+
+			if (!e || !t.initialized)
+				return;
+
+			o = o || {};
+			o.save = true;
+
+			o.element = e;
+			h = o.content = t.getContent(o);
+
+			if (!o.no_events)
+				t.onSaveContent.dispatch(t, o);
+
+			h = o.content;
+
+			if (!/TEXTAREA|INPUT/i.test(e.nodeName)) {
+				e.innerHTML = h;
+
+				// Update hidden form element
+				if (f = DOM.getParent(t.id, 'form')) {
+					each(f.elements, function(e) {
+						if (e.name == t.id) {
+							e.value = h;
+							return false;
+						}
+					});
+				}
+			} else
+				e.value = h;
+
+			o.element = e = null;
+
+			return h;
+		},
+
+		setContent : function(content, args) {
+			var self = this, rootNode, body = self.getBody(), forcedRootBlockName;
+
+			// Setup args object
+			args = args || {};
+			args.format = args.format || 'html';
+			args.set = true;
+			args.content = content;
+
+			// Do preprocessing
+			if (!args.no_events)
+				self.onBeforeSetContent.dispatch(self, args);
+
+			content = args.content;
+
+			// Padd empty content in Gecko and Safari. Commands will otherwise fail on the content
+			// It will also be impossible to place the caret in the editor unless there is a BR element present
+			if (!tinymce.isIE && (content.length === 0 || /^\s+$/.test(content))) {
+				forcedRootBlockName = self.settings.forced_root_block;
+				if (forcedRootBlockName)
+					content = '<' + forcedRootBlockName + '><br data-mce-bogus="1"></' + forcedRootBlockName + '>';
+				else
+					content = '<br data-mce-bogus="1">';
+
+				body.innerHTML = content;
+				self.selection.select(body, true);
+				self.selection.collapse(true);
+				return;
+			}
+
+			// Parse and serialize the html
+			if (args.format !== 'raw') {
+				content = new tinymce.html.Serializer({}, self.schema).serialize(
+					self.parser.parse(content)
+				);
+			}
+
+			// Set the new cleaned contents to the editor
+			args.content = tinymce.trim(content);
+			self.dom.setHTML(body, args.content);
+
+			// Do post processing
+			if (!args.no_events)
+				self.onSetContent.dispatch(self, args);
+
+			// Don't normalize selection if the focused element isn't the body in content editable mode since it will steal focus otherwise
+			if (!self.settings.content_editable || document.activeElement === self.getBody()) {
+				self.selection.normalize();
+			}
+
+			return args.content;
+		},
+
+		getContent : function(args) {
+			var self = this, content, body = self.getBody();
+
+			// Setup args object
+			args = args || {};
+			args.format = args.format || 'html';
+			args.get = true;
+			args.getInner = true;
+
+			// Do preprocessing
+			if (!args.no_events)
+				self.onBeforeGetContent.dispatch(self, args);
+
+			// Get raw contents or by default the cleaned contents
+			if (args.format == 'raw')
+				content = body.innerHTML;
+			else if (args.format == 'text')
+				content = body.innerText || body.textContent;
+			else
+				content = self.serializer.serialize(body, args);
+
+			// Trim whitespace in beginning/end of HTML
+			if (args.format != 'text') {
+				args.content = tinymce.trim(content);
+			} else {
+				args.content = content;
+			}
+
+			// Do post processing
+			if (!args.no_events)
+				self.onGetContent.dispatch(self, args);
+
+			return args.content;
+		},
+
+		isDirty : function() {
+			var self = this;
+
+			return tinymce.trim(self.startContent) != tinymce.trim(self.getContent({format : 'raw', no_events : 1})) && !self.isNotDirty;
+		},
+
+		getContainer : function() {
+			var self = this;
+
+			if (!self.container)
+				self.container = DOM.get(self.editorContainer || self.id + '_parent');
+
+			return self.container;
+		},
+
+		getContentAreaContainer : function() {
+			return this.contentAreaContainer;
+		},
+
+		getElement : function() {
+			return DOM.get(this.settings.content_element || this.id);
+		},
+
+		getWin : function() {
+			var self = this, elm;
+
+			if (!self.contentWindow) {
+				elm = DOM.get(self.id + "_ifr");
+
+				if (elm)
+					self.contentWindow = elm.contentWindow;
+			}
+
+			return self.contentWindow;
+		},
+
+		getDoc : function() {
+			var self = this, win;
+
+			if (!self.contentDocument) {
+				win = self.getWin();
+
+				if (win)
+					self.contentDocument = win.document;
+			}
+
+			return self.contentDocument;
+		},
+
+		getBody : function() {
+			return this.bodyElement || this.getDoc().body;
+		},
+
+		convertURL : function(url, name, elm) {
+			var self = this, settings = self.settings;
+
+			// Use callback instead
+			if (settings.urlconverter_callback)
+				return self.execCallback('urlconverter_callback', url, elm, true, name);
+
+			// Don't convert link href since thats the CSS files that gets loaded into the editor also skip local file URLs
+			if (!settings.convert_urls || (elm && elm.nodeName == 'LINK') || url.indexOf('file:') === 0)
+				return url;
+
+			// Convert to relative
+			if (settings.relative_urls)
+				return self.documentBaseURI.toRelative(url);
+
+			// Convert to absolute
+			url = self.documentBaseURI.toAbsolute(url, settings.remove_script_host);
+
+			return url;
+		},
+
+		addVisual : function(elm) {
+			var self = this, settings = self.settings, dom = self.dom, cls;
+
+			elm = elm || self.getBody();
+
+			if (!is(self.hasVisual))
+				self.hasVisual = settings.visual;
+
+			each(dom.select('table,a', elm), function(elm) {
+				var value;
+
+				switch (elm.nodeName) {
+					case 'TABLE':
+						cls = settings.visual_table_class || 'mceItemTable';
+						value = dom.getAttrib(elm, 'border');
+
+						if (!value || value == '0') {
+							if (self.hasVisual)
+								dom.addClass(elm, cls);
+							else
+								dom.removeClass(elm, cls);
+						}
+
+						return;
+
+					case 'A':
+						if (!dom.getAttrib(elm, 'href', false)) {
+							value = dom.getAttrib(elm, 'name') || elm.id;
+							cls = 'mceItemAnchor';
+
+							if (value) {
+								if (self.hasVisual)
+									dom.addClass(elm, cls);
+								else
+									dom.removeClass(elm, cls);
+							}
+						}
+
+						return;
+				}
+			});
+
+			self.onVisualAid.dispatch(self, elm, self.hasVisual);
+		},
+
+		remove : function() {
+			var self = this, elm = self.getContainer(), doc = self.getDoc();
+
+			if (!self.removed) {
+				self.removed = 1; // Cancels post remove event execution
+
+				// Fixed bug where IE has a blinking cursor left from the editor
+				if (isIE && doc)
+					doc.execCommand('SelectAll');
+
+				// We must save before we hide so Safari doesn't crash
+				self.save();
+
+				DOM.setStyle(self.id, 'display', self.orgDisplay);
+
+				// Don't clear the window or document if content editable
+				// is enabled since other instances might still be present
+				if (!self.settings.content_editable) {
+					Event.unbind(self.getWin());
+					Event.unbind(self.getDoc());
+				}
+
+				Event.unbind(self.getBody());
+				Event.clear(elm);
+
+				self.execCallback('remove_instance_callback', self);
+				self.onRemove.dispatch(self);
+
+				// Clear all execCommand listeners this is required to avoid errors if the editor was removed inside another command
+				self.onExecCommand.listeners = [];
+
+				tinymce.remove(self);
+				DOM.remove(elm);
+			}
+		},
+
+		destroy : function(s) {
+			var t = this;
+
+			// One time is enough
+			if (t.destroyed)
+				return;
+
+			// We must unbind on Gecko since it would otherwise produce the pesky "attempt to run compile-and-go script on a cleared scope" message
+			if (isGecko) {
+				Event.unbind(t.getDoc());
+				Event.unbind(t.getWin());
+				Event.unbind(t.getBody());
+			}
+
+			if (!s) {
+				tinymce.removeUnload(t.destroy);
+				tinyMCE.onBeforeUnload.remove(t._beforeUnload);
+
+				// Manual destroy
+				if (t.theme && t.theme.destroy)
+					t.theme.destroy();
+
+				// Destroy controls, selection and dom
+				t.controlManager.destroy();
+				t.selection.destroy();
+				t.dom.destroy();
+			}
+
+			if (t.formElement) {
+				t.formElement.submit = t.formElement._mceOldSubmit;
+				t.formElement._mceOldSubmit = null;
+			}
+
+			t.contentAreaContainer = t.formElement = t.container = t.settings.content_element = t.bodyElement = t.contentDocument = t.contentWindow = null;
+
+			if (t.selection)
+				t.selection = t.selection.win = t.selection.dom = t.selection.dom.doc = null;
+
+			t.destroyed = 1;
+		},
+
+		// Internal functions
+
+		_refreshContentEditable : function() {
+			var self = this, body, parent;
+
+			// Check if the editor was hidden and the re-initalize contentEditable mode by removing and adding the body again
+			if (self._isHidden()) {
+				body = self.getBody();
+				parent = body.parentNode;
+
+				parent.removeChild(body);
+				parent.appendChild(body);
+
+				body.focus();
+			}
+		},
+
+		_isHidden : function() {
+			var s;
+
+			if (!isGecko)
+				return 0;
+
+			// Weird, wheres that cursor selection?
+			s = this.selection.getSel();
+			return (!s || !s.rangeCount || s.rangeCount === 0);
+		}
+	});
+})(tinymce);
+(function(tinymce) {
+	var each = tinymce.each;
+
+	tinymce.Editor.prototype.setupEvents = function() {
+		var self = this, settings = self.settings;
+
+		// Add events to the editor
+		each([
+			'onPreInit',
+
+			'onBeforeRenderUI',
+
+			'onPostRender',
+
+			'onLoad',
+
+			'onInit',
+
+			'onRemove',
+
+			'onActivate',
+
+			'onDeactivate',
+
+			'onClick',
+
+			'onEvent',
+
+			'onMouseUp',
+
+			'onMouseDown',
+
+			'onDblClick',
+
+			'onKeyDown',
+
+			'onKeyUp',
+
+			'onKeyPress',
+
+			'onContextMenu',
+
+			'onSubmit',
+
+			'onReset',
+
+			'onPaste',
+
+			'onPreProcess',
+
+			'onPostProcess',
+
+			'onBeforeSetContent',
+
+			'onBeforeGetContent',
+
+			'onSetContent',
+
+			'onGetContent',
+
+			'onLoadContent',
+
+			'onSaveContent',
+
+			'onNodeChange',
+
+			'onChange',
+
+			'onBeforeExecCommand',
+
+			'onExecCommand',
+
+			'onUndo',
+
+			'onRedo',
+
+			'onVisualAid',
+
+			'onSetProgressState',
+
+			'onSetAttrib'
+		], function(name) {
+			self[name] = new tinymce.util.Dispatcher(self);
+		});
+
+		// Handle legacy cleanup_callback option
+		if (settings.cleanup_callback) {
+			self.onBeforeSetContent.add(function(ed, o) {
+				o.content = ed.execCallback('cleanup_callback', 'insert_to_editor', o.content, o);
+			});
+
+			self.onPreProcess.add(function(ed, o) {
+				if (o.set)
+					ed.execCallback('cleanup_callback', 'insert_to_editor_dom', o.node, o);
+
+				if (o.get)
+					ed.execCallback('cleanup_callback', 'get_from_editor_dom', o.node, o);
+			});
+
+			self.onPostProcess.add(function(ed, o) {
+				if (o.set)
+					o.content = ed.execCallback('cleanup_callback', 'insert_to_editor', o.content, o);
+
+				if (o.get)						
+					o.content = ed.execCallback('cleanup_callback', 'get_from_editor', o.content, o);
+			});
+		}
+
+		// Handle legacy save_callback option
+		if (settings.save_callback) {
+			self.onGetContent.add(function(ed, o) {
+				if (o.save)
+					o.content = ed.execCallback('save_callback', ed.id, o.content, ed.getBody());
+			});
+		}
+
+		// Handle legacy handle_event_callback option
+		if (settings.handle_event_callback) {
+			self.onEvent.add(function(ed, e, o) {
+				if (self.execCallback('handle_event_callback', e, ed, o) === false) {
+					e.preventDefault();
+					e.stopPropagation();
+				}
+			});
+		}
+
+		// Handle legacy handle_node_change_callback option
+		if (settings.handle_node_change_callback) {
+			self.onNodeChange.add(function(ed, cm, n) {
+				ed.execCallback('handle_node_change_callback', ed.id, n, -1, -1, true, ed.selection.isCollapsed());
+			});
+		}
+
+		// Handle legacy save_callback option
+		if (settings.save_callback) {
+			self.onSaveContent.add(function(ed, o) {
+				var h = ed.execCallback('save_callback', ed.id, o.content, ed.getBody());
+
+				if (h)
+					o.content = h;
+			});
+		}
+
+		// Handle legacy onchange_callback option
+		if (settings.onchange_callback) {
+			self.onChange.add(function(ed, l) {
+				ed.execCallback('onchange_callback', ed, l);
+			});
+		}
+	};
+
+	tinymce.Editor.prototype.bindNativeEvents = function() {
+		// 'focus', 'blur', 'dblclick', 'beforedeactivate', submit, reset
+		var self = this, i, settings = self.settings, dom = self.dom, nativeToDispatcherMap;
+
+		nativeToDispatcherMap = {
+			mouseup : 'onMouseUp',
+			mousedown : 'onMouseDown',
+			click : 'onClick',
+			keyup : 'onKeyUp',
+			keydown : 'onKeyDown',
+			keypress : 'onKeyPress',
+			submit : 'onSubmit',
+			reset : 'onReset',
+			contextmenu : 'onContextMenu',
+			dblclick : 'onDblClick',
+			paste : 'onPaste' // Doesn't work in all browsers yet
+		};
+
+		// Handler that takes a native event and sends it out to a dispatcher like onKeyDown
+		function eventHandler(evt, args) {
+			var type = evt.type;
+
+			// Don't fire events when it's removed
+			if (self.removed)
+				return;
+
+			// Sends the native event out to a global dispatcher then to the specific event dispatcher
+			if (self.onEvent.dispatch(self, evt, args) !== false) {
+				self[nativeToDispatcherMap[evt.fakeType || evt.type]].dispatch(self, evt, args);
+			}
+		};
+
+		// Opera doesn't support focus event for contentEditable elements so we need to fake it
+		function doOperaFocus(e) {
+			self.focus(true);
+		};
+
+		function nodeChanged(ed, e) {
+			// Normalize selection for example <b>a</b><i>|a</i> becomes <b>a|</b><i>a</i> except for Ctrl+A since it selects everything
+			if (e.keyCode != 65 || !tinymce.VK.metaKeyPressed(e)) {
+				self.selection.normalize();
+			}
+
+			self.nodeChanged();
+		}
+
+		// Add DOM events
+		each(nativeToDispatcherMap, function(dispatcherName, nativeName) {
+			var root = settings.content_editable ? self.getBody() : self.getDoc();
+
+			switch (nativeName) {
+				case 'contextmenu':
+					dom.bind(root, nativeName, eventHandler);
+					break;
+
+				case 'paste':
+					dom.bind(self.getBody(), nativeName, eventHandler);
+					break;
+
+				case 'submit':
+				case 'reset':
+					dom.bind(self.getElement().form || tinymce.DOM.getParent(self.id, 'form'), nativeName, eventHandler);
+					break;
+
+				default:
+					dom.bind(root, nativeName, eventHandler);
+			}
+		});
+
+		// Set the editor as active when focused
+		dom.bind(settings.content_editable ? self.getBody() : (tinymce.isGecko ? self.getDoc() : self.getWin()), 'focus', function(e) {
+			self.focus(true);
+		});
+
+		if (settings.content_editable && tinymce.isOpera) {
+			dom.bind(self.getBody(), 'click', doOperaFocus);
+			dom.bind(self.getBody(), 'keydown', doOperaFocus);
+		}
+
+		// Add node change handler
+		self.onMouseUp.add(nodeChanged);
+
+		self.onKeyUp.add(function(ed, e) {
+			var keyCode = e.keyCode;
+
+			if ((keyCode >= 33 && keyCode <= 36) || (keyCode >= 37 && keyCode <= 40) || keyCode == 13 || keyCode == 45 || keyCode == 46 || keyCode == 8 || (tinymce.isMac && (keyCode == 91 || keyCode == 93)) || e.ctrlKey)
+				nodeChanged(ed, e);
+		});
+
+		// Add reset handler
+		self.onReset.add(function() {
+			self.setContent(self.startContent, {format : 'raw'});
+		});
+
+		// Add shortcuts
+		function handleShortcut(e, execute) {
+			if (e.altKey || e.ctrlKey || e.metaKey) {
+				each(self.shortcuts, function(shortcut) {
+					var ctrlState = tinymce.isMac ? e.metaKey : e.ctrlKey;
+
+					if (shortcut.ctrl != ctrlState || shortcut.alt != e.altKey || shortcut.shift != e.shiftKey)
+						return;
+
+					if (e.keyCode == shortcut.keyCode || (e.charCode && e.charCode == shortcut.charCode)) {
+						e.preventDefault();
+
+						if (execute) {
+							shortcut.func.call(shortcut.scope);
+						}
+
+						return true;
+					}
+				});
+			}
+		};
+
+		self.onKeyUp.add(function(ed, e) {
+			handleShortcut(e);
+		});
+
+		self.onKeyPress.add(function(ed, e) {
+			handleShortcut(e);
+		});
+
+		self.onKeyDown.add(function(ed, e) {
+			handleShortcut(e, true);
+		});
+
+		if (tinymce.isOpera) {
+			self.onClick.add(function(ed, e) {
+				e.preventDefault();
+			});
+		}
+	};
+})(tinymce);
+(function(tinymce) {
+	// Added for compression purposes
+	var each = tinymce.each, undef, TRUE = true, FALSE = false;
+
+	tinymce.EditorCommands = function(editor) {
+		var dom = editor.dom,
+			selection = editor.selection,
+			commands = {state: {}, exec : {}, value : {}},
+			settings = editor.settings,
+			formatter = editor.formatter,
+			bookmark;
+
+		function execCommand(command, ui, value) {
+			var func;
+
+			command = command.toLowerCase();
+			if (func = commands.exec[command]) {
+				func(command, ui, value);
+				return TRUE;
+			}
+
+			return FALSE;
+		};
+
+		function queryCommandState(command) {
+			var func;
+
+			command = command.toLowerCase();
+			if (func = commands.state[command])
+				return func(command);
+
+			return -1;
+		};
+
+		function queryCommandValue(command) {
+			var func;
+
+			command = command.toLowerCase();
+			if (func = commands.value[command])
+				return func(command);
+
+			return FALSE;
+		};
+
+		function addCommands(command_list, type) {
+			type = type || 'exec';
+
+			each(command_list, function(callback, command) {
+				each(command.toLowerCase().split(','), function(command) {
+					commands[type][command] = callback;
+				});
+			});
+		};
+
+		// Expose public methods
+		tinymce.extend(this, {
+			execCommand : execCommand,
+			queryCommandState : queryCommandState,
+			queryCommandValue : queryCommandValue,
+			addCommands : addCommands
+		});
+
+		// Private methods
+
+		function execNativeCommand(command, ui, value) {
+			if (ui === undef)
+				ui = FALSE;
+
+			if (value === undef)
+				value = null;
+
+			return editor.getDoc().execCommand(command, ui, value);
+		};
+
+		function isFormatMatch(name) {
+			return formatter.match(name);
+		};
+
+		function toggleFormat(name, value) {
+			formatter.toggle(name, value ? {value : value} : undef);
+		};
+
+		function storeSelection(type) {
+			bookmark = selection.getBookmark(type);
+		};
+
+		function restoreSelection() {
+			selection.moveToBookmark(bookmark);
+		};
+
+		// Add execCommand overrides
+		addCommands({
+			// Ignore these, added for compatibility
+			'mceResetDesignMode,mceBeginUndoLevel' : function() {},
+
+			// Add undo manager logic
+			'mceEndUndoLevel,mceAddUndoLevel' : function() {
+				editor.undoManager.add();
+			},
+
+			'Cut,Copy,Paste' : function(command) {
+				var doc = editor.getDoc(), failed;
+
+				// Try executing the native command
+				try {
+					execNativeCommand(command);
+				} catch (ex) {
+					// Command failed
+					failed = TRUE;
+				}
+
+				// Present alert message about clipboard access not being available
+				if (failed || !doc.queryCommandSupported(command)) {
+					if (tinymce.isGecko) {
+						editor.windowManager.confirm(editor.getLang('clipboard_msg'), function(state) {
+							if (state)
+								open('http://www.mozilla.org/editor/midasdemo/securityprefs.html', '_blank');
+						});
+					} else
+						editor.windowManager.alert(editor.getLang('clipboard_no_support'));
+				}
+			},
+
+			// Override unlink command
+			unlink : function(command) {
+				if (selection.isCollapsed())
+					selection.select(selection.getNode());
+
+				execNativeCommand(command);
+				selection.collapse(FALSE);
+			},
+
+			// Override justify commands to use the text formatter engine
+			'JustifyLeft,JustifyCenter,JustifyRight,JustifyFull' : function(command) {
+				var align = command.substring(7);
+
+				// Remove all other alignments first
+				each('left,center,right,full'.split(','), function(name) {
+					if (align != name)
+						formatter.remove('align' + name);
+				});
+
+				toggleFormat('align' + align);
+				execCommand('mceRepaint');
+			},
+
+			// Override list commands to fix WebKit bug
+			'InsertUnorderedList,InsertOrderedList' : function(command) {
+				var listElm, listParent;
+
+				execNativeCommand(command);
+
+				// WebKit produces lists within block elements so we need to split them
+				// we will replace the native list creation logic to custom logic later on
+				// TODO: Remove this when the list creation logic is removed
+				listElm = dom.getParent(selection.getNode(), 'ol,ul');
+				if (listElm) {
+					listParent = listElm.parentNode;
+
+					// If list is within a text block then split that block
+					if (/^(H[1-6]|P|ADDRESS|PRE)$/.test(listParent.nodeName)) {
+						storeSelection();
+						dom.split(listParent, listElm);
+						restoreSelection();
+					}
+				}
+			},
+
+			// Override commands to use the text formatter engine
+			'Bold,Italic,Underline,Strikethrough,Superscript,Subscript' : function(command) {
+				toggleFormat(command);
+			},
+
+			// Override commands to use the text formatter engine
+			'ForeColor,HiliteColor,FontName' : function(command, ui, value) {
+				toggleFormat(command, value);
+			},
+
+			FontSize : function(command, ui, value) {
+				var fontClasses, fontSizes;
+
+				// Convert font size 1-7 to styles
+				if (value >= 1 && value <= 7) {
+					fontSizes = tinymce.explode(settings.font_size_style_values);
+					fontClasses = tinymce.explode(settings.font_size_classes);
+
+					if (fontClasses)
+						value = fontClasses[value - 1] || value;
+					else
+						value = fontSizes[value - 1] || value;
+				}
+
+				toggleFormat(command, value);
+			},
+
+			RemoveFormat : function(command) {
+				formatter.remove(command);
+			},
+
+			mceBlockQuote : function(command) {
+				toggleFormat('blockquote');
+			},
+
+			FormatBlock : function(command, ui, value) {
+				return toggleFormat(value || 'p');
+			},
+
+			mceCleanup : function() {
+				var bookmark = selection.getBookmark();
+
+				editor.setContent(editor.getContent({cleanup : TRUE}), {cleanup : TRUE});
+
+				selection.moveToBookmark(bookmark);
+			},
+
+			mceRemoveNode : function(command, ui, value) {
+				var node = value || selection.getNode();
+
+				// Make sure that the body node isn't removed
+				if (node != editor.getBody()) {
+					storeSelection();
+					editor.dom.remove(node, TRUE);
+					restoreSelection();
+				}
+			},
+
+			mceSelectNodeDepth : function(command, ui, value) {
+				var counter = 0;
+
+				dom.getParent(selection.getNode(), function(node) {
+					if (node.nodeType == 1 && counter++ == value) {
+						selection.select(node);
+						return FALSE;
+					}
+				}, editor.getBody());
+			},
+
+			mceSelectNode : function(command, ui, value) {
+				selection.select(value);
+			},
+
+			mceInsertContent : function(command, ui, value) {
+				var parser, serializer, parentNode, rootNode, fragment, args,
+					marker, nodeRect, viewPortRect, rng, node, node2, bookmarkHtml, viewportBodyElement;
+
+				//selection.normalize();
+
+				// Setup parser and serializer
+				parser = editor.parser;
+				serializer = new tinymce.html.Serializer({}, editor.schema);
+				bookmarkHtml = '<span id="mce_marker" data-mce-type="bookmark">\uFEFF</span>';
+
+				// Run beforeSetContent handlers on the HTML to be inserted
+				args = {content: value, format: 'html'};
+				selection.onBeforeSetContent.dispatch(selection, args);
+				value = args.content;
+
+				// Add caret at end of contents if it's missing
+				if (value.indexOf('{$caret}') == -1)
+					value += '{$caret}';
+
+				// Replace the caret marker with a span bookmark element
+				value = value.replace(/\{\$caret\}/, bookmarkHtml);
+
+				// Insert node maker where we will insert the new HTML and get it's parent
+				if (!selection.isCollapsed())
+					editor.getDoc().execCommand('Delete', false, null);
+
+				parentNode = selection.getNode();
+
+				// Parse the fragment within the context of the parent node
+				args = {context : parentNode.nodeName.toLowerCase()};
+				fragment = parser.parse(value, args);
+
+				// Move the caret to a more suitable location
+				node = fragment.lastChild;
+				if (node.attr('id') == 'mce_marker') {
+					marker = node;
+
+					for (node = node.prev; node; node = node.walk(true)) {
+						if (node.type == 3 || !dom.isBlock(node.name)) {
+							node.parent.insert(marker, node, node.name === 'br');
+							break;
+						}
+					}
+				}
+
+				// If parser says valid we can insert the contents into that parent
+				if (!args.invalid) {
+					value = serializer.serialize(fragment);
+
+					// Check if parent is empty or only has one BR element then set the innerHTML of that parent
+					node = parentNode.firstChild;
+					node2 = parentNode.lastChild;
+					if (!node || (node === node2 && node.nodeName === 'BR'))
+						dom.setHTML(parentNode, value);
+					else
+						selection.setContent(value);
+				} else {
+					// If the fragment was invalid within that context then we need
+					// to parse and process the parent it's inserted into
+
+					// Insert bookmark node and get the parent
+					selection.setContent(bookmarkHtml);
+					parentNode = selection.getNode();
+					rootNode = editor.getBody();
+
+					// Opera will return the document node when selection is in root
+					if (parentNode.nodeType == 9)
+						parentNode = node = rootNode;
+					else
+						node = parentNode;
+
+					// Find the ancestor just before the root element
+					while (node !== rootNode) {
+						parentNode = node;
+						node = node.parentNode;
+					}
+
+					// Get the outer/inner HTML depending on if we are in the root and parser and serialize that
+					value = parentNode == rootNode ? rootNode.innerHTML : dom.getOuterHTML(parentNode);
+					value = serializer.serialize(
+						parser.parse(
+							// Need to replace by using a function since $ in the contents would otherwise be a problem
+							value.replace(/<span (id="mce_marker"|id=mce_marker).+?<\/span>/i, function() {
+								return serializer.serialize(fragment);
+							})
+						)
+					);
+
+					// Set the inner/outer HTML depending on if we are in the root or not
+					if (parentNode == rootNode)
+						dom.setHTML(rootNode, value);
+					else
+						dom.setOuterHTML(parentNode, value);
+				}
+
+				marker = dom.get('mce_marker');
+
+				// Scroll range into view scrollIntoView on element can't be used since it will scroll the main view port as well
+				nodeRect = dom.getRect(marker);
+				viewPortRect = dom.getViewPort(editor.getWin());
+
+				// Check if node is out side the viewport if it is then scroll to it
+				if ((nodeRect.y + nodeRect.h > viewPortRect.y + viewPortRect.h || nodeRect.y < viewPortRect.y) ||
+					(nodeRect.x > viewPortRect.x + viewPortRect.w || nodeRect.x < viewPortRect.x)) {
+					viewportBodyElement = tinymce.isIE ? editor.getDoc().documentElement : editor.getBody();
+					viewportBodyElement.scrollLeft = nodeRect.x;
+					viewportBodyElement.scrollTop = nodeRect.y - viewPortRect.h + 25;
+				}
+
+				// Move selection before marker and remove it
+				rng = dom.createRng();
+
+				// If previous sibling is a text node set the selection to the end of that node
+				node = marker.previousSibling;
+				if (node && node.nodeType == 3) {
+					rng.setStart(node, node.nodeValue.length);
+				} else {
+					// If the previous sibling isn't a text node or doesn't exist set the selection before the marker node
+					rng.setStartBefore(marker);
+					rng.setEndBefore(marker);
+				}
+
+				// Remove the marker node and set the new range
+				dom.remove(marker);
+				selection.setRng(rng);
+
+				// Dispatch after event and add any visual elements needed
+				selection.onSetContent.dispatch(selection, args);
+				editor.addVisual();
+			},
+
+			mceInsertRawHTML : function(command, ui, value) {
+				selection.setContent('tiny_mce_marker');
+				editor.setContent(editor.getContent().replace(/tiny_mce_marker/g, function() { return value }));
+			},
+
+			mceToggleFormat : function(command, ui, value) {
+				toggleFormat(value);
+			},
+
+			mceSetContent : function(command, ui, value) {
+				editor.setContent(value);
+			},
+
+			'Indent,Outdent' : function(command) {
+				var intentValue, indentUnit, value;
+
+				// Setup indent level
+				intentValue = settings.indentation;
+				indentUnit = /[a-z%]+$/i.exec(intentValue);
+				intentValue = parseInt(intentValue);
+
+				if (!queryCommandState('InsertUnorderedList') && !queryCommandState('InsertOrderedList')) {
+					// If forced_root_blocks is set to false we don't have a block to indent so lets create a div
+					if (!settings.forced_root_block && !dom.getParent(selection.getNode(), dom.isBlock)) {
+						formatter.apply('div');
+					}
+
+					each(selection.getSelectedBlocks(), function(element) {
+						if (command == 'outdent') {
+							value = Math.max(0, parseInt(element.style.paddingLeft || 0) - intentValue);
+							dom.setStyle(element, 'paddingLeft', value ? value + indentUnit : '');
+						} else
+							dom.setStyle(element, 'paddingLeft', (parseInt(element.style.paddingLeft || 0) + intentValue) + indentUnit);
+					});
+				} else
+					execNativeCommand(command);
+			},
+
+			mceRepaint : function() {
+				var bookmark;
+
+				if (tinymce.isGecko) {
+					try {
+						storeSelection(TRUE);
+
+						if (selection.getSel())
+							selection.getSel().selectAllChildren(editor.getBody());
+
+						selection.collapse(TRUE);
+						restoreSelection();
+					} catch (ex) {
+						// Ignore
+					}
+				}
+			},
+
+			mceToggleFormat : function(command, ui, value) {
+				formatter.toggle(value);
+			},
+
+			InsertHorizontalRule : function() {
+				editor.execCommand('mceInsertContent', false, '<hr />');
+			},
+
+			mceToggleVisualAid : function() {
+				editor.hasVisual = !editor.hasVisual;
+				editor.addVisual();
+			},
+
+			mceReplaceContent : function(command, ui, value) {
+				editor.execCommand('mceInsertContent', false, value.replace(/\{\$selection\}/g, selection.getContent({format : 'text'})));
+			},
+
+			mceInsertLink : function(command, ui, value) {
+				var anchor;
+
+				if (typeof(value) == 'string')
+					value = {href : value};
+
+				anchor = dom.getParent(selection.getNode(), 'a');
+
+				// Spaces are never valid in URLs and it's a very common mistake for people to make so we fix it here.
+				value.href = value.href.replace(' ', '%20');
+
+				// Remove existing links if there could be child links or that the href isn't specified
+				if (!anchor || !value.href) {
+					formatter.remove('link');
+				}		
+
+				// Apply new link to selection
+				if (value.href) {
+					formatter.apply('link', value, anchor);
+				}
+			},
+
+			selectAll : function() {
+				var root = dom.getRoot(), rng = dom.createRng();
+
+				// Old IE does a better job with selectall than new versions
+				if (selection.getRng().setStart) {
+					rng.setStart(root, 0);
+					rng.setEnd(root, root.childNodes.length);
+
+					selection.setRng(rng);
+				} else {
+					execNativeCommand('SelectAll');
+				}
+			}
+		});
+
+		// Add queryCommandState overrides
+		addCommands({
+			// Override justify commands
+			'JustifyLeft,JustifyCenter,JustifyRight,JustifyFull' : function(command) {
+				var name = 'align' + command.substring(7);
+				var nodes = selection.isCollapsed() ? [dom.getParent(selection.getNode(), dom.isBlock)] : selection.getSelectedBlocks();
+				var matches = tinymce.map(nodes, function(node) {
+					return !!formatter.matchNode(node, name);
+				});
+				return tinymce.inArray(matches, TRUE) !== -1;
+			},
+
+			'Bold,Italic,Underline,Strikethrough,Superscript,Subscript' : function(command) {
+				return isFormatMatch(command);
+			},
+
+			mceBlockQuote : function() {
+				return isFormatMatch('blockquote');
+			},
+
+			Outdent : function() {
+				var node;
+
+				if (settings.inline_styles) {
+					if ((node = dom.getParent(selection.getStart(), dom.isBlock)) && parseInt(node.style.paddingLeft) > 0)
+						return TRUE;
+
+					if ((node = dom.getParent(selection.getEnd(), dom.isBlock)) && parseInt(node.style.paddingLeft) > 0)
+						return TRUE;
+				}
+
+				return queryCommandState('InsertUnorderedList') || queryCommandState('InsertOrderedList') || (!settings.inline_styles && !!dom.getParent(selection.getNode(), 'BLOCKQUOTE'));
+			},
+
+			'InsertUnorderedList,InsertOrderedList' : function(command) {
+				var list = dom.getParent(selection.getNode(), 'ul,ol');
+				return list && 
+				     (command === 'insertunorderedlist' && list.tagName === 'UL'
+				   || command === 'insertorderedlist' && list.tagName === 'OL');
+			}
+		}, 'state');
+
+		// Add queryCommandValue overrides
+		addCommands({
+			'FontSize,FontName' : function(command) {
+				var value = 0, parent;
+
+				if (parent = dom.getParent(selection.getNode(), 'span')) {
+					if (command == 'fontsize')
+						value = parent.style.fontSize;
+					else
+						value = parent.style.fontFamily.replace(/, /g, ',').replace(/[\'\"]/g, '').toLowerCase();
+				}
+
+				return value;
+			}
+		}, 'value');
+
+		// Add undo manager logic
+		addCommands({
+			Undo : function() {
+				editor.undoManager.undo();
+			},
+
+			Redo : function() {
+				editor.undoManager.redo();
+			}
+		});
+	};
+})(tinymce);
+
+(function(tinymce) {
+	var Dispatcher = tinymce.util.Dispatcher;
+
+	tinymce.UndoManager = function(editor) {
+		var self, index = 0, data = [], beforeBookmark, onAdd, onUndo, onRedo;
+
+		function getContent() {
+			// Remove whitespace before/after and remove pure bogus nodes
+			return tinymce.trim(editor.getContent({format : 'raw', no_events : 1}).replace(/<span[^>]+data-mce-bogus[^>]+>[\u200B\uFEFF]+<\/span>/g, ''));
+		};
+
+		function addNonTypingUndoLevel() {
+			self.typing = false;
+			self.add();
+		};
+
+		// Create event instances
+		onBeforeAdd = new Dispatcher(self);
+		onAdd       = new Dispatcher(self);
+		onUndo      = new Dispatcher(self);
+		onRedo      = new Dispatcher(self);
+
+		// Pass though onAdd event from UndoManager to Editor as onChange
+		onAdd.add(function(undoman, level) {
+			if (undoman.hasUndo())
+				return editor.onChange.dispatch(editor, level, undoman);
+		});
+
+		// Pass though onUndo event from UndoManager to Editor
+		onUndo.add(function(undoman, level) {
+			return editor.onUndo.dispatch(editor, level, undoman);
+		});
+
+		// Pass though onRedo event from UndoManager to Editor
+		onRedo.add(function(undoman, level) {
+			return editor.onRedo.dispatch(editor, level, undoman);
+		});
+
+		// Add initial undo level when the editor is initialized
+		editor.onInit.add(function() {
+			self.add();
+		});
+
+		// Get position before an execCommand is processed
+		editor.onBeforeExecCommand.add(function(ed, cmd, ui, val, args) {
+			if (cmd != 'Undo' && cmd != 'Redo' && cmd != 'mceRepaint' && (!args || !args.skip_undo)) {
+				self.beforeChange();
+			}
+		});
+
+		// Add undo level after an execCommand call was made
+		editor.onExecCommand.add(function(ed, cmd, ui, val, args) {
+			if (cmd != 'Undo' && cmd != 'Redo' && cmd != 'mceRepaint' && (!args || !args.skip_undo)) {
+				self.add();
+			}
+		});
+
+		// Add undo level on save contents, drag end and blur/focusout
+		editor.onSaveContent.add(addNonTypingUndoLevel);
+		editor.dom.bind(editor.dom.getRoot(), 'dragend', addNonTypingUndoLevel);
+		editor.dom.bind(editor.getBody(), 'focusout', function(e) {
+			if (!editor.removed && self.typing) {
+				addNonTypingUndoLevel();
+			}
+		});
+
+		editor.onKeyUp.add(function(editor, e) {
+			var keyCode = e.keyCode;
+
+			if ((keyCode >= 33 && keyCode <= 36) || (keyCode >= 37 && keyCode <= 40) || keyCode == 45 || keyCode == 13 || e.ctrlKey) {
+				addNonTypingUndoLevel();
+			}
+		});
+
+		editor.onKeyDown.add(function(editor, e) {
+			var keyCode = e.keyCode;
+
+			// Is caracter positon keys left,right,up,down,home,end,pgdown,pgup,enter
+			if ((keyCode >= 33 && keyCode <= 36) || (keyCode >= 37 && keyCode <= 40) || keyCode == 45) {
+				if (self.typing) {
+					addNonTypingUndoLevel();
+				}
+
+				return;
+			}
+
+			// If key isn't shift,ctrl,alt,capslock,metakey
+			if ((keyCode < 16 || keyCode > 20) && keyCode != 224 && keyCode != 91 && !self.typing) {
+				self.beforeChange();
+				self.typing = true;
+				self.add();
+			}
+		});
+
+		editor.onMouseDown.add(function(editor, e) {
+			if (self.typing) {
+				addNonTypingUndoLevel();
+			}
+		});
+
+		// Add keyboard shortcuts for undo/redo keys
+		editor.addShortcut('ctrl+z', 'undo_desc', 'Undo');
+		editor.addShortcut('ctrl+y', 'redo_desc', 'Redo');
+
+		self = {
+			// Explose for debugging reasons
+			data : data,
+
+			typing : false,
+			
+			onBeforeAdd: onBeforeAdd,
+
+			onAdd : onAdd,
+
+			onUndo : onUndo,
+
+			onRedo : onRedo,
+
+			beforeChange : function() {
+				beforeBookmark = editor.selection.getBookmark(2, true);
+			},
+
+			add : function(level) {
+				var i, settings = editor.settings, lastLevel;
+
+				level = level || {};
+				level.content = getContent();
+				
+				self.onBeforeAdd.dispatch(self, level);
+
+				// Add undo level if needed
+				lastLevel = data[index];
+				if (lastLevel && lastLevel.content == level.content)
+					return null;
+
+				// Set before bookmark on previous level
+				if (data[index])
+					data[index].beforeBookmark = beforeBookmark;
+
+				// Time to compress
+				if (settings.custom_undo_redo_levels) {
+					if (data.length > settings.custom_undo_redo_levels) {
+						for (i = 0; i < data.length - 1; i++)
+							data[i] = data[i + 1];
+
+						data.length--;
+						index = data.length;
+					}
+				}
+
+				// Get a non intrusive normalized bookmark
+				level.bookmark = editor.selection.getBookmark(2, true);
+
+				// Crop array if needed
+				if (index < data.length - 1)
+					data.length = index + 1;
+
+				data.push(level);
+				index = data.length - 1;
+
+				self.onAdd.dispatch(self, level);
+				editor.isNotDirty = 0;
+
+				return level;
+			},
+
+			undo : function() {
+				var level, i;
+
+				if (self.typing) {
+					self.add();
+					self.typing = false;
+				}
+
+				if (index > 0) {
+					level = data[--index];
+
+					editor.setContent(level.content, {format : 'raw'});
+					editor.selection.moveToBookmark(level.beforeBookmark);
+
+					self.onUndo.dispatch(self, level);
+				}
+
+				return level;
+			},
+
+			redo : function() {
+				var level;
+
+				if (index < data.length - 1) {
+					level = data[++index];
+
+					editor.setContent(level.content, {format : 'raw'});
+					editor.selection.moveToBookmark(level.bookmark);
+
+					self.onRedo.dispatch(self, level);
+				}
+
+				return level;
+			},
+
+			clear : function() {
+				data = [];
+				index = 0;
+				self.typing = false;
+			},
+
+			hasUndo : function() {
+				return index > 0 || this.typing;
+			},
+
+			hasRedo : function() {
+				return index < data.length - 1 && !this.typing;
+			}
+		};
+
+		return self;
+	};
+})(tinymce);
+
+tinymce.ForceBlocks = function(editor) {
+	var settings = editor.settings, dom = editor.dom, selection = editor.selection, blockElements = editor.schema.getBlockElements();
+
+	function addRootBlocks() {
+		var node = selection.getStart(), rootNode = editor.getBody(), rng, startContainer, startOffset, endContainer, endOffset, rootBlockNode, tempNode, offset = -0xFFFFFF, wrapped, isInEditorDocument;
+
+		if (!node || node.nodeType !== 1 || !settings.forced_root_block)
+			return;
+
+		// Check if node is wrapped in block
+		while (node && node != rootNode) {
+			if (blockElements[node.nodeName])
+				return;
+
+			node = node.parentNode;
+		}
+
+		// Get current selection
+		rng = selection.getRng();
+		if (rng.setStart) {
+			startContainer = rng.startContainer;
+			startOffset = rng.startOffset;
+			endContainer = rng.endContainer;
+			endOffset = rng.endOffset;
+		} else {
+			// Force control range into text range
+			if (rng.item) {
+				node = rng.item(0);
+				rng = editor.getDoc().body.createTextRange();
+				rng.moveToElementText(node);
+			}
+
+			isInEditorDocument = rng.parentElement().ownerDocument === editor.getDoc();
+			tmpRng = rng.duplicate();
+			tmpRng.collapse(true);
+			startOffset = tmpRng.move('character', offset) * -1;
+
+			if (!tmpRng.collapsed) {
+				tmpRng = rng.duplicate();
+				tmpRng.collapse(false);
+				endOffset = (tmpRng.move('character', offset) * -1) - startOffset;
+			}
+		}
+
+		// Wrap non block elements and text nodes
+		node = rootNode.firstChild;
+		while (node) {
+			if (node.nodeType === 3 || (node.nodeType == 1 && !blockElements[node.nodeName])) {
+				// Remove empty text nodes
+				if (node.nodeType === 3 && node.nodeValue.length == 0) {
+					tempNode = node;
+					node = node.nextSibling;
+					dom.remove(tempNode);
+					continue;
+				}
+
+				if (!rootBlockNode) {
+					rootBlockNode = dom.create(settings.forced_root_block);
+					node.parentNode.insertBefore(rootBlockNode, node);
+					wrapped = true;
+				}
+
+				tempNode = node;
+				node = node.nextSibling;
+				rootBlockNode.appendChild(tempNode);
+			} else {
+				rootBlockNode = null;
+				node = node.nextSibling;
+			}
+		}
+
+		if (wrapped) {
+			if (rng.setStart) {
+				rng.setStart(startContainer, startOffset);
+				rng.setEnd(endContainer, endOffset);
+				selection.setRng(rng);
+			} else {
+				// Only select if the previous selection was inside the document to prevent auto focus in quirks mode
+				if (isInEditorDocument) {
+					try {
+						rng = editor.getDoc().body.createTextRange();
+						rng.moveToElementText(rootNode);
+						rng.collapse(true);
+						rng.moveStart('character', startOffset);
+
+						if (endOffset > 0)
+							rng.moveEnd('character', endOffset);
+
+						rng.select();
+					} catch (ex) {
+						// Ignore
+					}
+				}
+			}
+
+			editor.nodeChanged();
+		}
+	};
+
+	// Force root blocks
+	if (settings.forced_root_block) {
+		editor.onKeyUp.add(addRootBlocks);
+		editor.onNodeChange.add(addRootBlocks);
+	}
+};
+
+(function(tinymce) {
+	// Shorten names
+	var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each, extend = tinymce.extend;
+
+	tinymce.create('tinymce.ControlManager', {
+		ControlManager : function(ed, s) {
+			var t = this, i;
+
+			s = s || {};
+			t.editor = ed;
+			t.controls = {};
+			t.onAdd = new tinymce.util.Dispatcher(t);
+			t.onPostRender = new tinymce.util.Dispatcher(t);
+			t.prefix = s.prefix || ed.id + '_';
+			t._cls = {};
+
+			t.onPostRender.add(function() {
+				each(t.controls, function(c) {
+					c.postRender();
+				});
+			});
+		},
+
+		get : function(id) {
+			return this.controls[this.prefix + id] || this.controls[id];
+		},
+
+		setActive : function(id, s) {
+			var c = null;
+
+			if (c = this.get(id))
+				c.setActive(s);
+
+			return c;
+		},
+
+		setDisabled : function(id, s) {
+			var c = null;
+
+			if (c = this.get(id))
+				c.setDisabled(s);
+
+			return c;
+		},
+
+		add : function(c) {
+			var t = this;
+
+			if (c) {
+				t.controls[c.id] = c;
+				t.onAdd.dispatch(c, t);
+			}
+
+			return c;
+		},
+
+		createControl : function(name) {
+			var ctrl, i, l, self = this, editor = self.editor, factories, ctrlName;
+
+			// Build control factory cache
+			if (!self.controlFactories) {
+				self.controlFactories = [];
+				each(editor.plugins, function(plugin) {
+					if (plugin.createControl) {
+						self.controlFactories.push(plugin);
+					}
+				});
+			}
+
+			// Create controls by asking cached factories
+			factories = self.controlFactories;
+			for (i = 0, l = factories.length; i < l; i++) {
+				ctrl = factories[i].createControl(name, self);
+
+				if (ctrl) {
+					return self.add(ctrl);
+				}
+			}
+
+			// Create sepearator
+			if (name === "|" || name === "separator") {
+				return self.createSeparator();
+			}
+
+			// Create control from button collection
+			if (editor.buttons && (ctrl = editor.buttons[name])) {
+				return self.createButton(name, ctrl);
+			}
+
+			return self.add(ctrl);
+		},
+
+		createDropMenu : function(id, s, cc) {
+			var t = this, ed = t.editor, c, bm, v, cls;
+
+			s = extend({
+				'class' : 'mceDropDown',
+				constrain : ed.settings.constrain_menus
+			}, s);
+
+			s['class'] = s['class'] + ' ' + ed.getParam('skin') + 'Skin';
+			if (v = ed.getParam('skin_variant'))
+				s['class'] += ' ' + ed.getParam('skin') + 'Skin' + v.substring(0, 1).toUpperCase() + v.substring(1);
+
+			s['class'] += ed.settings.directionality == "rtl" ? ' mceRtl' : '';
+
+			id = t.prefix + id;
+			cls = cc || t._cls.dropmenu || tinymce.ui.DropMenu;
+			c = t.controls[id] = new cls(id, s);
+			c.onAddItem.add(function(c, o) {
+				var s = o.settings;
+
+				s.title = ed.getLang(s.title, s.title);
+
+				if (!s.onclick) {
+					s.onclick = function(v) {
+						if (s.cmd)
+							ed.execCommand(s.cmd, s.ui || false, s.value);
+					};
+				}
+			});
+
+			ed.onRemove.add(function() {
+				c.destroy();
+			});
+
+			// Fix for bug #1897785, #1898007
+			if (tinymce.isIE) {
+				c.onShowMenu.add(function() {
+					// IE 8 needs focus in order to store away a range with the current collapsed caret location
+					ed.focus();
+
+					bm = ed.selection.getBookmark(1);
+				});
+
+				c.onHideMenu.add(function() {
+					if (bm) {
+						ed.selection.moveToBookmark(bm);
+						bm = 0;
+					}
+				});
+			}
+
+			return t.add(c);
+		},
+
+		createListBox : function(id, s, cc) {
+			var t = this, ed = t.editor, cmd, c, cls;
+
+			if (t.get(id))
+				return null;
+
+			s.title = ed.translate(s.title);
+			s.scope = s.scope || ed;
+
+			if (!s.onselect) {
+				s.onselect = function(v) {
+					ed.execCommand(s.cmd, s.ui || false, v || s.value);
+				};
+			}
+
+			s = extend({
+				title : s.title,
+				'class' : 'mce_' + id,
+				scope : s.scope,
+				control_manager : t
+			}, s);
+
+			id = t.prefix + id;
+
+
+			function useNativeListForAccessibility(ed) {
+				return ed.settings.use_accessible_selects && !tinymce.isGecko
+			}
+
+			if (ed.settings.use_native_selects || useNativeListForAccessibility(ed))
+				c = new tinymce.ui.NativeListBox(id, s);
+			else {
+				cls = cc || t._cls.listbox || tinymce.ui.ListBox;
+				c = new cls(id, s, ed);
+			}
+
+			t.controls[id] = c;
+
+			// Fix focus problem in Safari
+			if (tinymce.isWebKit) {
+				c.onPostRender.add(function(c, n) {
+					// Store bookmark on mousedown
+					Event.add(n, 'mousedown', function() {
+						ed.bookmark = ed.selection.getBookmark(1);
+					});
+
+					// Restore on focus, since it might be lost
+					Event.add(n, 'focus', function() {
+						ed.selection.moveToBookmark(ed.bookmark);
+						ed.bookmark = null;
+					});
+				});
+			}
+
+			if (c.hideMenu)
+				ed.onMouseDown.add(c.hideMenu, c);
+
+			return t.add(c);
+		},
+
+		createButton : function(id, s, cc) {
+			var t = this, ed = t.editor, o, c, cls;
+
+			if (t.get(id))
+				return null;
+
+			s.title = ed.translate(s.title);
+			s.label = ed.translate(s.label);
+			s.scope = s.scope || ed;
+
+			if (!s.onclick && !s.menu_button) {
+				s.onclick = function() {
+					ed.execCommand(s.cmd, s.ui || false, s.value);
+				};
+			}
+
+			s = extend({
+				title : s.title,
+				'class' : 'mce_' + id,
+				unavailable_prefix : ed.getLang('unavailable', ''),
+				scope : s.scope,
+				control_manager : t
+			}, s);
+
+			id = t.prefix + id;
+
+			if (s.menu_button) {
+				cls = cc || t._cls.menubutton || tinymce.ui.MenuButton;
+				c = new cls(id, s, ed);
+				ed.onMouseDown.add(c.hideMenu, c);
+			} else {
+				cls = t._cls.button || tinymce.ui.Button;
+				c = new cls(id, s, ed);
+			}
+
+			return t.add(c);
+		},
+
+		createMenuButton : function(id, s, cc) {
+			s = s || {};
+			s.menu_button = 1;
+
+			return this.createButton(id, s, cc);
+		},
+
+		createSplitButton : function(id, s, cc) {
+			var t = this, ed = t.editor, cmd, c, cls;
+
+			if (t.get(id))
+				return null;
+
+			s.title = ed.translate(s.title);
+			s.scope = s.scope || ed;
+
+			if (!s.onclick) {
+				s.onclick = function(v) {
+					ed.execCommand(s.cmd, s.ui || false, v || s.value);
+				};
+			}
+
+			if (!s.onselect) {
+				s.onselect = function(v) {
+					ed.execCommand(s.cmd, s.ui || false, v || s.value);
+				};
+			}
+
+			s = extend({
+				title : s.title,
+				'class' : 'mce_' + id,
+				scope : s.scope,
+				control_manager : t
+			}, s);
+
+			id = t.prefix + id;
+			cls = cc || t._cls.splitbutton || tinymce.ui.SplitButton;
+			c = t.add(new cls(id, s, ed));
+			ed.onMouseDown.add(c.hideMenu, c);
+
+			return c;
+		},
+
+		createColorSplitButton : function(id, s, cc) {
+			var t = this, ed = t.editor, cmd, c, cls, bm;
+
+			if (t.get(id))
+				return null;
+
+			s.title = ed.translate(s.title);
+			s.scope = s.scope || ed;
+
+			if (!s.onclick) {
+				s.onclick = function(v) {
+					if (tinymce.isIE)
+						bm = ed.selection.getBookmark(1);
+
+					ed.execCommand(s.cmd, s.ui || false, v || s.value);
+				};
+			}
+
+			if (!s.onselect) {
+				s.onselect = function(v) {
+					ed.execCommand(s.cmd, s.ui || false, v || s.value);
+				};
+			}
+
+			s = extend({
+				title : s.title,
+				'class' : 'mce_' + id,
+				'menu_class' : ed.getParam('skin') + 'Skin',
+				scope : s.scope,
+				more_colors_title : ed.getLang('more_colors')
+			}, s);
+
+			id = t.prefix + id;
+			cls = cc || t._cls.colorsplitbutton || tinymce.ui.ColorSplitButton;
+			c = new cls(id, s, ed);
+			ed.onMouseDown.add(c.hideMenu, c);
+
+			// Remove the menu element when the editor is removed
+			ed.onRemove.add(function() {
+				c.destroy();
+			});
+
+			// Fix for bug #1897785, #1898007
+			if (tinymce.isIE) {
+				c.onShowMenu.add(function() {
+					// IE 8 needs focus in order to store away a range with the current collapsed caret location
+					ed.focus();
+					bm = ed.selection.getBookmark(1);
+				});
+
+				c.onHideMenu.add(function() {
+					if (bm) {
+						ed.selection.moveToBookmark(bm);
+						bm = 0;
+					}
+				});
+			}
+
+			return t.add(c);
+		},
+
+		createToolbar : function(id, s, cc) {
+			var c, t = this, cls;
+
+			id = t.prefix + id;
+			cls = cc || t._cls.toolbar || tinymce.ui.Toolbar;
+			c = new cls(id, s, t.editor);
+
+			if (t.get(id))
+				return null;
+
+			return t.add(c);
+		},
+		
+		createToolbarGroup : function(id, s, cc) {
+			var c, t = this, cls;
+			id = t.prefix + id;
+			cls = cc || this._cls.toolbarGroup || tinymce.ui.ToolbarGroup;
+			c = new cls(id, s, t.editor);
+			
+			if (t.get(id))
+				return null;
+			
+			return t.add(c);
+		},
+
+		createSeparator : function(cc) {
+			var cls = cc || this._cls.separator || tinymce.ui.Separator;
+
+			return new cls();
+		},
+
+		setControlType : function(n, c) {
+			return this._cls[n.toLowerCase()] = c;
+		},
+	
+		destroy : function() {
+			each(this.controls, function(c) {
+				c.destroy();
+			});
+
+			this.controls = null;
+		}
+	});
+})(tinymce);
+
+(function(tinymce) {
+	var Dispatcher = tinymce.util.Dispatcher, each = tinymce.each, isIE = tinymce.isIE, isOpera = tinymce.isOpera;
+
+	tinymce.create('tinymce.WindowManager', {
+		WindowManager : function(ed) {
+			var t = this;
+
+			t.editor = ed;
+			t.onOpen = new Dispatcher(t);
+			t.onClose = new Dispatcher(t);
+			t.params = {};
+			t.features = {};
+		},
+
+		open : function(s, p) {
+			var t = this, f = '', x, y, mo = t.editor.settings.dialog_type == 'modal', w, sw, sh, vp = tinymce.DOM.getViewPort(), u;
+
+			// Default some options
+			s = s || {};
+			p = p || {};
+			sw = isOpera ? vp.w : screen.width; // Opera uses windows inside the Opera window
+			sh = isOpera ? vp.h : screen.height;
+			s.name = s.name || 'mc_' + new Date().getTime();
+			s.width = parseInt(s.width || 320);
+			s.height = parseInt(s.height || 240);
+			s.resizable = true;
+			s.left = s.left || parseInt(sw / 2.0) - (s.width / 2.0);
+			s.top = s.top || parseInt(sh / 2.0) - (s.height / 2.0);
+			p.inline = false;
+			p.mce_width = s.width;
+			p.mce_height = s.height;
+			p.mce_auto_focus = s.auto_focus;
+
+			if (mo) {
+				if (isIE) {
+					s.center = true;
+					s.help = false;
+					s.dialogWidth = s.width + 'px';
+					s.dialogHeight = s.height + 'px';
+					s.scroll = s.scrollbars || false;
+				}
+			}
+
+			// Build features string
+			each(s, function(v, k) {
+				if (tinymce.is(v, 'boolean'))
+					v = v ? 'yes' : 'no';
+
+				if (!/^(name|url)$/.test(k)) {
+					if (isIE && mo)
+						f += (f ? ';' : '') + k + ':' + v;
+					else
+						f += (f ? ',' : '') + k + '=' + v;
+				}
+			});
+
+			t.features = s;
+			t.params = p;
+			t.onOpen.dispatch(t, s, p);
+
+			u = s.url || s.file;
+			u = tinymce._addVer(u);
+
+			try {
+				if (isIE && mo) {
+					w = 1;
+					window.showModalDialog(u, window, f);
+				} else
+					w = window.open(u, s.name, f);
+			} catch (ex) {
+				// Ignore
+			}
+
+			if (!w)
+				alert(t.editor.getLang('popup_blocked'));
+		},
+
+		close : function(w) {
+			w.close();
+			this.onClose.dispatch(this);
+		},
+
+		createInstance : function(cl, a, b, c, d, e) {
+			var f = tinymce.resolve(cl);
+
+			return new f(a, b, c, d, e);
+		},
+
+		confirm : function(t, cb, s, w) {
+			w = w || window;
+
+			cb.call(s || this, w.confirm(this._decode(this.editor.getLang(t, t))));
+		},
+
+		alert : function(tx, cb, s, w) {
+			var t = this;
+
+			w = w || window;
+			w.alert(t._decode(t.editor.getLang(tx, tx)));
+
+			if (cb)
+				cb.call(s || t);
+		},
+
+		resizeBy : function(dw, dh, win) {
+			win.resizeBy(dw, dh);
+		},
+
+		// Internal functions
+
+		_decode : function(s) {
+			return tinymce.DOM.decode(s).replace(/\\n/g, '\n');
+		}
+	});
+}(tinymce));
+(function(tinymce) {
+	tinymce.Formatter = function(ed) {
+		var formats = {},
+			each = tinymce.each,
+			dom = ed.dom,
+			selection = ed.selection,
+			TreeWalker = tinymce.dom.TreeWalker,
+			rangeUtils = new tinymce.dom.RangeUtils(dom),
+			isValid = ed.schema.isValidChild,
+			isArray = tinymce.isArray,
+			isBlock = dom.isBlock,
+			forcedRootBlock = ed.settings.forced_root_block,
+			nodeIndex = dom.nodeIndex,
+			INVISIBLE_CHAR = '\uFEFF',
+			MCE_ATTR_RE = /^(src|href|style)$/,
+			FALSE = false,
+			TRUE = true,
+			formatChangeData,
+			undef,
+			getContentEditable = dom.getContentEditable;
+
+		function isTextBlock(name) {
+			if (name.nodeType) {
+				name = name.nodeName;
+			}
+
+			return !!ed.schema.getTextBlockElements()[name.toLowerCase()];
+		}
+
+		function getParents(node, selector) {
+			return dom.getParents(node, selector, dom.getRoot());
+		};
+
+		function isCaretNode(node) {
+			return node.nodeType === 1 && node.id === '_mce_caret';
+		};
+
+		function defaultFormats() {
+			register({
+				alignleft : [
+					{selector : 'figure,p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles : {textAlign : 'left'}, defaultBlock: 'div'},
+					{selector : 'img,table', collapsed : false, styles : {'float' : 'left'}}
+				],
+
+				aligncenter : [
+					{selector : 'figure,p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles : {textAlign : 'center'}, defaultBlock: 'div'},
+					{selector : 'img', collapsed : false, styles : {display : 'block', marginLeft : 'auto', marginRight : 'auto'}},
+					{selector : 'table', collapsed : false, styles : {marginLeft : 'auto', marginRight : 'auto'}}
+				],
+
+				alignright : [
+					{selector : 'figure,p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles : {textAlign : 'right'}, defaultBlock: 'div'},
+					{selector : 'img,table', collapsed : false, styles : {'float' : 'right'}}
+				],
+
+				alignfull : [
+					{selector : 'figure,p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles : {textAlign : 'justify'}, defaultBlock: 'div'}
+				],
+
+				bold : [
+					{inline : 'strong', remove : 'all'},
+					{inline : 'span', styles : {fontWeight : 'bold'}},
+					{inline : 'b', remove : 'all'}
+				],
+
+				italic : [
+					{inline : 'em', remove : 'all'},
+					{inline : 'span', styles : {fontStyle : 'italic'}},
+					{inline : 'i', remove : 'all'}
+				],
+
+				underline : [
+					{inline : 'span', styles : {textDecoration : 'underline'}, exact : true},
+					{inline : 'u', remove : 'all'}
+				],
+
+				strikethrough : [
+					{inline : 'span', styles : {textDecoration : 'line-through'}, exact : true},
+					{inline : 'strike', remove : 'all'}
+				],
+
+				forecolor : {inline : 'span', styles : {color : '%value'}, wrap_links : false},
+				hilitecolor : {inline : 'span', styles : {backgroundColor : '%value'}, wrap_links : false},
+				fontname : {inline : 'span', styles : {fontFamily : '%value'}},
+				fontsize : {inline : 'span', styles : {fontSize : '%value'}},
+				fontsize_class : {inline : 'span', attributes : {'class' : '%value'}},
+				blockquote : {block : 'blockquote', wrapper : 1, remove : 'all'},
+				subscript : {inline : 'sub'},
+				superscript : {inline : 'sup'},
+
+				link : {inline : 'a', selector : 'a', remove : 'all', split : true, deep : true,
+					onmatch : function(node) {
+						return true;
+					},
+
+					onformat : function(elm, fmt, vars) {
+						each(vars, function(value, key) {
+							dom.setAttrib(elm, key, value);
+						});
+					}
+				},
+
+				removeformat : [
+					{selector : 'b,strong,em,i,font,u,strike', remove : 'all', split : true, expand : false, block_expand : true, deep : true},
+					{selector : 'span', attributes : ['style', 'class'], remove : 'empty', split : true, expand : false, deep : true},
+					{selector : '*', attributes : ['style', 'class'], split : false, expand : false, deep : true}
+				]
+			});
+
+			// Register default block formats
+			each('p h1 h2 h3 h4 h5 h6 div address pre div code dt dd samp'.split(/\s/), function(name) {
+				register(name, {block : name, remove : 'all'});
+			});
+
+			// Register user defined formats
+			register(ed.settings.formats);
+		};
+
+		function addKeyboardShortcuts() {
+			// Add some inline shortcuts
+			ed.addShortcut('ctrl+b', 'bold_desc', 'Bold');
+			ed.addShortcut('ctrl+i', 'italic_desc', 'Italic');
+			ed.addShortcut('ctrl+u', 'underline_desc', 'Underline');
+
+			// BlockFormat shortcuts keys
+			for (var i = 1; i <= 6; i++) {
+				ed.addShortcut('ctrl+' + i, '', ['FormatBlock', false, 'h' + i]);
+			}
+
+			ed.addShortcut('ctrl+7', '', ['FormatBlock', false, 'p']);
+			ed.addShortcut('ctrl+8', '', ['FormatBlock', false, 'div']);
+			ed.addShortcut('ctrl+9', '', ['FormatBlock', false, 'address']);
+		};
+
+		// Public functions
+
+		function get(name) {
+			return name ? formats[name] : formats;
+		};
+
+		function register(name, format) {
+			if (name) {
+				if (typeof(name) !== 'string') {
+					each(name, function(format, name) {
+						register(name, format);
+					});
+				} else {
+					// Force format into array and add it to internal collection
+					format = format.length ? format : [format];
+
+					each(format, function(format) {
+						// Set deep to false by default on selector formats this to avoid removing
+						// alignment on images inside paragraphs when alignment is changed on paragraphs
+						if (format.deep === undef)
+							format.deep = !format.selector;
+
+						// Default to true
+						if (format.split === undef)
+							format.split = !format.selector || format.inline;
+
+						// Default to true
+						if (format.remove === undef && format.selector && !format.inline)
+							format.remove = 'none';
+
+						// Mark format as a mixed format inline + block level
+						if (format.selector && format.inline) {
+							format.mixed = true;
+							format.block_expand = true;
+						}
+
+						// Split classes if needed
+						if (typeof(format.classes) === 'string')
+							format.classes = format.classes.split(/\s+/);
+					});
+
+					formats[name] = format;
+				}
+			}
+		};
+
+		var getTextDecoration = function(node) {
+			var decoration;
+
+			ed.dom.getParent(node, function(n) {
+				decoration = ed.dom.getStyle(n, 'text-decoration');
+				return decoration && decoration !== 'none';
+			});
+
+			return decoration;
+		};
+
+		var processUnderlineAndColor = function(node) {
+			var textDecoration;
+			if (node.nodeType === 1 && node.parentNode && node.parentNode.nodeType === 1) {
+				textDecoration = getTextDecoration(node.parentNode);
+				if (ed.dom.getStyle(node, 'color') && textDecoration) {
+					ed.dom.setStyle(node, 'text-decoration', textDecoration);
+				} else if (ed.dom.getStyle(node, 'textdecoration') === textDecoration) {
+					ed.dom.setStyle(node, 'text-decoration', null);
+				}
+			}
+		};
+
+		function apply(name, vars, node) {
+			var formatList = get(name), format = formatList[0], bookmark, rng, i, isCollapsed = selection.isCollapsed();
+
+			function setElementFormat(elm, fmt) {
+				fmt = fmt || format;
+
+				if (elm) {
+					if (fmt.onformat) {
+						fmt.onformat(elm, fmt, vars, node);
+					}
+
+					each(fmt.styles, function(value, name) {
+						dom.setStyle(elm, name, replaceVars(value, vars));
+					});
+
+					each(fmt.attributes, function(value, name) {
+						dom.setAttrib(elm, name, replaceVars(value, vars));
+					});
+
+					each(fmt.classes, function(value) {
+						value = replaceVars(value, vars);
+
+						if (!dom.hasClass(elm, value))
+							dom.addClass(elm, value);
+					});
+				}
+			};
+			function adjustSelectionToVisibleSelection() {
+				function findSelectionEnd(start, end) {
+					var walker = new TreeWalker(end);
+					for (node = walker.current(); node; node = walker.prev()) {
+						if (node.childNodes.length > 1 || node == start || node.tagName == 'BR') {
+							return node;
+						}
+					}
+				};
+
+				// Adjust selection so that a end container with a end offset of zero is not included in the selection
+				// as this isn't visible to the user.
+				var rng = ed.selection.getRng();
+				var start = rng.startContainer;
+				var end = rng.endContainer;
+
+				if (start != end && rng.endOffset === 0) {
+					var newEnd = findSelectionEnd(start, end);
+					var endOffset = newEnd.nodeType == 3 ? newEnd.length : newEnd.childNodes.length;
+
+					rng.setEnd(newEnd, endOffset);
+				}
+
+				return rng;
+			}
+			
+			function applyStyleToList(node, bookmark, wrapElm, newWrappers, process){
+				var nodes = [], listIndex = -1, list, startIndex = -1, endIndex = -1, currentWrapElm;
+				
+				// find the index of the first child list.
+				each(node.childNodes, function(n, index) {
+					if (n.nodeName === "UL" || n.nodeName === "OL") {
+						listIndex = index;
+						list = n;
+						return false;
+					}
+				});
+				
+				// get the index of the bookmarks
+				each(node.childNodes, function(n, index) {
+					if (n.nodeName === "SPAN" && dom.getAttrib(n, "data-mce-type") == "bookmark") {
+						if (n.id == bookmark.id + "_start") {
+							startIndex = index;
+						} else if (n.id == bookmark.id + "_end") {
+							endIndex = index;
+						}
+					}
+				});
+				
+				// if the selection spans across an embedded list, or there isn't an embedded list - handle processing normally
+				if (listIndex <= 0 || (startIndex < listIndex && endIndex > listIndex)) {
+					each(tinymce.grep(node.childNodes), process);
+					return 0;
+				} else {
+					currentWrapElm = dom.clone(wrapElm, FALSE);
+
+					// create a list of the nodes on the same side of the list as the selection
+					each(tinymce.grep(node.childNodes), function(n, index) {
+						if ((startIndex < listIndex && index < listIndex) || (startIndex > listIndex && index > listIndex)) {
+							nodes.push(n); 
+							n.parentNode.removeChild(n);
+						}
+					});
+
+					// insert the wrapping element either before or after the list.
+					if (startIndex < listIndex) {
+						node.insertBefore(currentWrapElm, list);
+					} else if (startIndex > listIndex) {
+						node.insertBefore(currentWrapElm, list.nextSibling);
+					}
+					
+					// add the new nodes to the list.
+					newWrappers.push(currentWrapElm);
+
+					each(nodes, function(node) {
+						currentWrapElm.appendChild(node);
+					});
+
+					return currentWrapElm;
+				}
+			};
+
+			function applyRngStyle(rng, bookmark, node_specific) {
+				var newWrappers = [], wrapName, wrapElm, contentEditable = true;
+
+				// Setup wrapper element
+				wrapName = format.inline || format.block;
+				wrapElm = dom.create(wrapName);
+				setElementFormat(wrapElm);
+
+				rangeUtils.walk(rng, function(nodes) {
+					var currentWrapElm;
+
+					function process(node) {
+						var nodeName, parentName, found, hasContentEditableState, lastContentEditable;
+
+						lastContentEditable = contentEditable;
+						nodeName = node.nodeName.toLowerCase();
+						parentName = node.parentNode.nodeName.toLowerCase();
+
+						// Node has a contentEditable value
+						if (node.nodeType === 1 && getContentEditable(node)) {
+							lastContentEditable = contentEditable;
+							contentEditable = getContentEditable(node) === "true";
+							hasContentEditableState = true; // We don't want to wrap the container only it's children
+						}
+
+						// Stop wrapping on br elements
+						if (isEq(nodeName, 'br')) {
+							currentWrapElm = 0;
+
+							// Remove any br elements when we wrap things
+							if (format.block)
+								dom.remove(node);
+
+							return;
+						}
+
+						// If node is wrapper type
+						if (format.wrapper && matchNode(node, name, vars)) {
+							currentWrapElm = 0;
+							return;
+						}
+
+						// Can we rename the block
+						if (contentEditable && !hasContentEditableState && format.block && !format.wrapper && isTextBlock(nodeName)) {
+							node = dom.rename(node, wrapName);
+							setElementFormat(node);
+							newWrappers.push(node);
+							currentWrapElm = 0;
+							return;
+						}
+
+						// Handle selector patterns
+						if (format.selector) {
+							// Look for matching formats
+							each(formatList, function(format) {
+								// Check collapsed state if it exists
+								if ('collapsed' in format && format.collapsed !== isCollapsed) {
+									return;
+								}
+
+								if (dom.is(node, format.selector) && !isCaretNode(node)) {
+									setElementFormat(node, format);
+									found = true;
+								}
+							});
+
+							// Continue processing if a selector match wasn't found and a inline element is defined
+							if (!format.inline || found) {
+								currentWrapElm = 0;
+								return;
+							}
+						}
+
+						// Is it valid to wrap this item
+						if (contentEditable && !hasContentEditableState && isValid(wrapName, nodeName) && isValid(parentName, wrapName) &&
+								!(!node_specific && node.nodeType === 3 && node.nodeValue.length === 1 && node.nodeValue.charCodeAt(0) === 65279) && !isCaretNode(node) && (!format.inline || !isBlock(node))) {
+							// Start wrapping
+							if (!currentWrapElm) {
+								// Wrap the node
+								currentWrapElm = dom.clone(wrapElm, FALSE);
+								node.parentNode.insertBefore(currentWrapElm, node);
+								newWrappers.push(currentWrapElm);
+							}
+
+							currentWrapElm.appendChild(node);
+						} else if (nodeName == 'li' && bookmark) {
+							// Start wrapping - if we are in a list node and have a bookmark, then we will always begin by wrapping in a new element.
+							currentWrapElm = applyStyleToList(node, bookmark, wrapElm, newWrappers, process);
+						} else {
+							// Start a new wrapper for possible children
+							currentWrapElm = 0;
+							
+							each(tinymce.grep(node.childNodes), process);
+
+							if (hasContentEditableState) {
+								contentEditable = lastContentEditable; // Restore last contentEditable state from stack
+							}
+
+							// End the last wrapper
+							currentWrapElm = 0;
+						}
+					};
+
+					// Process siblings from range
+					each(nodes, process);
+				});
+
+				// Wrap links inside as well, for example color inside a link when the wrapper is around the link
+				if (format.wrap_links === false) {
+					each(newWrappers, function(node) {
+						function process(node) {
+							var i, currentWrapElm, children;
+
+							if (node.nodeName === 'A') {
+								currentWrapElm = dom.clone(wrapElm, FALSE);
+								newWrappers.push(currentWrapElm);
+
+								children = tinymce.grep(node.childNodes);
+								for (i = 0; i < children.length; i++)
+									currentWrapElm.appendChild(children[i]);
+
+								node.appendChild(currentWrapElm);
+							}
+
+							each(tinymce.grep(node.childNodes), process);
+						};
+
+						process(node);
+					});
+				}
+
+				// Cleanup
+				
+				each(newWrappers, function(node) {
+					var childCount;
+
+					function getChildCount(node) {
+						var count = 0;
+
+						each(node.childNodes, function(node) {
+							if (!isWhiteSpaceNode(node) && !isBookmarkNode(node))
+								count++;
+						});
+
+						return count;
+					};
+
+					function mergeStyles(node) {
+						var child, clone;
+
+						each(node.childNodes, function(node) {
+							if (node.nodeType == 1 && !isBookmarkNode(node) && !isCaretNode(node)) {
+								child = node;
+								return FALSE; // break loop
+							}
+						});
+
+						// If child was found and of the same type as the current node
+						if (child && matchName(child, format)) {
+							clone = dom.clone(child, FALSE);
+							setElementFormat(clone);
+
+							dom.replace(clone, node, TRUE);
+							dom.remove(child, 1);
+						}
+
+						return clone || node;
+					};
+
+					childCount = getChildCount(node);
+
+					// Remove empty nodes but only if there is multiple wrappers and they are not block
+					// elements so never remove single <h1></h1> since that would remove the currrent empty block element where the caret is at
+					if ((newWrappers.length > 1 || !isBlock(node)) && childCount === 0) {
+						dom.remove(node, 1);
+						return;
+					}
+
+					if (format.inline || format.wrapper) {
+						// Merges the current node with it's children of similar type to reduce the number of elements
+						if (!format.exact && childCount === 1)
+							node = mergeStyles(node);
+
+						// Remove/merge children
+						each(formatList, function(format) {
+							// Merge all children of similar type will move styles from child to parent
+							// this: <span style="color:red"><b><span style="color:red; font-size:10px">text</span></b></span>
+							// will become: <span style="color:red"><b><span style="font-size:10px">text</span></b></span>
+							each(dom.select(format.inline, node), function(child) {
+								var parent;
+
+								// When wrap_links is set to false we don't want
+								// to remove the format on children within links
+								if (format.wrap_links === false) {
+									parent = child.parentNode;
+
+									do {
+										if (parent.nodeName === 'A')
+											return;
+									} while (parent = parent.parentNode);
+								}
+
+								removeFormat(format, vars, child, format.exact ? child : null);
+							});
+						});
+
+						// Remove child if direct parent is of same type
+						if (matchNode(node.parentNode, name, vars)) {
+							dom.remove(node, 1);
+							node = 0;
+							return TRUE;
+						}
+
+						// Look for parent with similar style format
+						if (format.merge_with_parents) {
+							dom.getParent(node.parentNode, function(parent) {
+								if (matchNode(parent, name, vars)) {
+									dom.remove(node, 1);
+									node = 0;
+									return TRUE;
+								}
+							});
+						}
+
+						// Merge next and previous siblings if they are similar <b>text</b><b>text</b> becomes <b>texttext</b>
+						if (node && format.merge_siblings !== false) {
+							node = mergeSiblings(getNonWhiteSpaceSibling(node), node);
+							node = mergeSiblings(node, getNonWhiteSpaceSibling(node, TRUE));
+						}
+					}
+				});
+			};
+
+			if (format) {
+				if (node) {
+					if (node.nodeType) {
+						rng = dom.createRng();
+						rng.setStartBefore(node);
+						rng.setEndAfter(node);
+						applyRngStyle(expandRng(rng, formatList), null, true);
+					} else {
+						applyRngStyle(node, null, true);
+					}
+				} else {
+					if (!isCollapsed || !format.inline || dom.select('td.mceSelected,th.mceSelected').length) {
+						// Obtain selection node before selection is unselected by applyRngStyle()
+						var curSelNode = ed.selection.getNode();
+
+						// If the formats have a default block and we can't find a parent block then start wrapping it with a DIV this is for forced_root_blocks: false
+						// It's kind of a hack but people should be using the default block type P since all desktop editors work that way
+						if (!forcedRootBlock && formatList[0].defaultBlock && !dom.getParent(curSelNode, dom.isBlock)) {
+							apply(formatList[0].defaultBlock);
+						}
+
+						// Apply formatting to selection
+						ed.selection.setRng(adjustSelectionToVisibleSelection());
+						bookmark = selection.getBookmark();
+						applyRngStyle(expandRng(selection.getRng(TRUE), formatList), bookmark);
+
+						// Colored nodes should be underlined so that the color of the underline matches the text color.
+						if (format.styles && (format.styles.color || format.styles.textDecoration)) {
+							tinymce.walk(curSelNode, processUnderlineAndColor, 'childNodes');
+							processUnderlineAndColor(curSelNode);
+						}
+
+						selection.moveToBookmark(bookmark);
+						moveStart(selection.getRng(TRUE));
+						ed.nodeChanged();
+					} else
+						performCaretAction('apply', name, vars);
+				}
+			}
+		};
+
+		function remove(name, vars, node) {
+			var formatList = get(name), format = formatList[0], bookmark, i, rng, contentEditable = true;
+
+			// Merges the styles for each node
+			function process(node) {
+				var children, i, l, localContentEditable, lastContentEditable, hasContentEditableState;
+
+				// Skip on text nodes as they have neither format to remove nor children
+				if (node.nodeType === 3) {
+					return;
+				}
+
+				// Node has a contentEditable value
+				if (node.nodeType === 1 && getContentEditable(node)) {
+					lastContentEditable = contentEditable;
+					contentEditable = getContentEditable(node) === "true";
+					hasContentEditableState = true; // We don't want to wrap the container only it's children
+				}
+
+				// Grab the children first since the nodelist might be changed
+				children = tinymce.grep(node.childNodes);
+
+				// Process current node
+				if (contentEditable && !hasContentEditableState) {
+					for (i = 0, l = formatList.length; i < l; i++) {
+						if (removeFormat(formatList[i], vars, node, node))
+							break;
+					}
+				}
+
+				// Process the children
+				if (format.deep) {
+					if (children.length) {					
+						for (i = 0, l = children.length; i < l; i++)
+							process(children[i]);
+
+						if (hasContentEditableState) {
+							contentEditable = lastContentEditable; // Restore last contentEditable state from stack
+						}
+					}
+				}
+			};
+
+			function findFormatRoot(container) {
+				var formatRoot;
+
+				// Find format root
+				each(getParents(container.parentNode).reverse(), function(parent) {
+					var format;
+
+					// Find format root element
+					if (!formatRoot && parent.id != '_start' && parent.id != '_end') {
+						// Is the node matching the format we are looking for
+						format = matchNode(parent, name, vars);
+						if (format && format.split !== false)
+							formatRoot = parent;
+					}
+				});
+
+				return formatRoot;
+			};
+
+			function wrapAndSplit(format_root, container, target, split) {
+				var parent, clone, lastClone, firstClone, i, formatRootParent;
+
+				// Format root found then clone formats and split it
+				if (format_root) {
+					formatRootParent = format_root.parentNode;
+
+					for (parent = container.parentNode; parent && parent != formatRootParent; parent = parent.parentNode) {
+						clone = dom.clone(parent, FALSE);
+
+						for (i = 0; i < formatList.length; i++) {
+							if (removeFormat(formatList[i], vars, clone, clone)) {
+								clone = 0;
+								break;
+							}
+						}
+
+						// Build wrapper node
+						if (clone) {
+							if (lastClone)
+								clone.appendChild(lastClone);
+
+							if (!firstClone)
+								firstClone = clone;
+
+							lastClone = clone;
+						}
+					}
+
+					// Never split block elements if the format is mixed
+					if (split && (!format.mixed || !isBlock(format_root)))
+						container = dom.split(format_root, container);
+
+					// Wrap container in cloned formats
+					if (lastClone) {
+						target.parentNode.insertBefore(lastClone, target);
+						firstClone.appendChild(target);
+					}
+				}
+
+				return container;
+			};
+
+			function splitToFormatRoot(container) {
+				return wrapAndSplit(findFormatRoot(container), container, container, true);
+			};
+
+			function unwrap(start) {
+				var node = dom.get(start ? '_start' : '_end'),
+					out = node[start ? 'firstChild' : 'lastChild'];
+
+				// If the end is placed within the start the result will be removed
+				// So this checks if the out node is a bookmark node if it is it
+				// checks for another more suitable node
+				if (isBookmarkNode(out))
+					out = out[start ? 'firstChild' : 'lastChild'];
+
+				dom.remove(node, true);
+
+				return out;
+			};
+
+			function removeRngStyle(rng) {
+				var startContainer, endContainer, node;
+
+				rng = expandRng(rng, formatList, TRUE);
+
+				if (format.split) {
+					startContainer = getContainer(rng, TRUE);
+					endContainer = getContainer(rng);
+
+					if (startContainer != endContainer) {
+						// WebKit will render the table incorrectly if we wrap a TD in a SPAN so lets see if the can use the first child instead
+						// This will happen if you tripple click a table cell and use remove formatting
+						if (/^(TR|TD)$/.test(startContainer.nodeName) && startContainer.firstChild) {
+							startContainer = (startContainer.nodeName == "TD" ? startContainer.firstChild : startContainer.firstChild.firstChild) || startContainer;
+						}
+
+						// Wrap start/end nodes in span element since these might be cloned/moved
+						startContainer = wrap(startContainer, 'span', {id : '_start', 'data-mce-type' : 'bookmark'});
+						endContainer = wrap(endContainer, 'span', {id : '_end', 'data-mce-type' : 'bookmark'});
+
+						// Split start/end
+						splitToFormatRoot(startContainer);
+						splitToFormatRoot(endContainer);
+
+						// Unwrap start/end to get real elements again
+						startContainer = unwrap(TRUE);
+						endContainer = unwrap();
+					} else
+						startContainer = endContainer = splitToFormatRoot(startContainer);
+
+					// Update range positions since they might have changed after the split operations
+					rng.startContainer = startContainer.parentNode;
+					rng.startOffset = nodeIndex(startContainer);
+					rng.endContainer = endContainer.parentNode;
+					rng.endOffset = nodeIndex(endContainer) + 1;
+				}
+
+				// Remove items between start/end
+				rangeUtils.walk(rng, function(nodes) {
+					each(nodes, function(node) {
+						process(node);
+
+						// Remove parent span if it only contains text-decoration: underline, yet a parent node is also underlined.
+						if (node.nodeType === 1 && ed.dom.getStyle(node, 'text-decoration') === 'underline' && node.parentNode && getTextDecoration(node.parentNode) === 'underline') {
+							removeFormat({'deep': false, 'exact': true, 'inline': 'span', 'styles': {'textDecoration' : 'underline'}}, null, node);
+						}
+					});
+				});
+			};
+
+			// Handle node
+			if (node) {
+				if (node.nodeType) {
+					rng = dom.createRng();
+					rng.setStartBefore(node);
+					rng.setEndAfter(node);
+					removeRngStyle(rng);
+				} else {
+					removeRngStyle(node);
+				}
+
+				return;
+			}
+
+			if (!selection.isCollapsed() || !format.inline || dom.select('td.mceSelected,th.mceSelected').length) {
+				bookmark = selection.getBookmark();
+				removeRngStyle(selection.getRng(TRUE));
+				selection.moveToBookmark(bookmark);
+
+				// Check if start element still has formatting then we are at: "<b>text|</b>text" and need to move the start into the next text node
+				if (format.inline && match(name, vars, selection.getStart())) {
+					moveStart(selection.getRng(true));
+				}
+
+				ed.nodeChanged();
+			} else
+				performCaretAction('remove', name, vars);
+		};
+
+		function toggle(name, vars, node) {
+			var fmt = get(name);
+
+			if (match(name, vars, node) && (!('toggle' in fmt[0]) || fmt[0].toggle))
+				remove(name, vars, node);
+			else
+				apply(name, vars, node);
+		};
+
+		function matchNode(node, name, vars, similar) {
+			var formatList = get(name), format, i, classes;
+
+			function matchItems(node, format, item_name) {
+				var key, value, items = format[item_name], i;
+
+				// Custom match
+				if (format.onmatch) {
+					return format.onmatch(node, format, item_name);
+				}
+
+				// Check all items
+				if (items) {
+					// Non indexed object
+					if (items.length === undef) {
+						for (key in items) {
+							if (items.hasOwnProperty(key)) {
+								if (item_name === 'attributes')
+									value = dom.getAttrib(node, key);
+								else
+									value = getStyle(node, key);
+
+								if (similar && !value && !format.exact)
+									return;
+
+								if ((!similar || format.exact) && !isEq(value, replaceVars(items[key], vars)))
+									return;
+							}
+						}
+					} else {
+						// Only one match needed for indexed arrays
+						for (i = 0; i < items.length; i++) {
+							if (item_name === 'attributes' ? dom.getAttrib(node, items[i]) : getStyle(node, items[i]))
+								return format;
+						}
+					}
+				}
+
+				return format;
+			};
+
+			if (formatList && node) {
+				// Check each format in list
+				for (i = 0; i < formatList.length; i++) {
+					format = formatList[i];
+
+					// Name name, attributes, styles and classes
+					if (matchName(node, format) && matchItems(node, format, 'attributes') && matchItems(node, format, 'styles')) {
+						// Match classes
+						if (classes = format.classes) {
+							for (i = 0; i < classes.length; i++) {
+								if (!dom.hasClass(node, classes[i]))
+									return;
+							}
+						}
+
+						return format;
+					}
+				}
+			}
+		};
+
+		function match(name, vars, node) {
+			var startNode;
+
+			function matchParents(node) {
+				// Find first node with similar format settings
+				node = dom.getParent(node, function(node) {
+					return !!matchNode(node, name, vars, true);
+				});
+
+				// Do an exact check on the similar format element
+				return matchNode(node, name, vars);
+			};
+
+			// Check specified node
+			if (node)
+				return matchParents(node);
+
+			// Check selected node
+			node = selection.getNode();
+			if (matchParents(node))
+				return TRUE;
+
+			// Check start node if it's different
+			startNode = selection.getStart();
+			if (startNode != node) {
+				if (matchParents(startNode))
+					return TRUE;
+			}
+
+			return FALSE;
+		};
+
+		function matchAll(names, vars) {
+			var startElement, matchedFormatNames = [], checkedMap = {}, i, ni, name;
+
+			// Check start of selection for formats
+			startElement = selection.getStart();
+			dom.getParent(startElement, function(node) {
+				var i, name;
+
+				for (i = 0; i < names.length; i++) {
+					name = names[i];
+
+					if (!checkedMap[name] && matchNode(node, name, vars)) {
+						checkedMap[name] = true;
+						matchedFormatNames.push(name);
+					}
+				}
+			}, dom.getRoot());
+
+			return matchedFormatNames;
+		};
+
+		function canApply(name) {
+			var formatList = get(name), startNode, parents, i, x, selector;
+
+			if (formatList) {
+				startNode = selection.getStart();
+				parents = getParents(startNode);
+
+				for (x = formatList.length - 1; x >= 0; x--) {
+					selector = formatList[x].selector;
+
+					// Format is not selector based, then always return TRUE
+					if (!selector)
+						return TRUE;
+
+					for (i = parents.length - 1; i >= 0; i--) {
+						if (dom.is(parents[i], selector))
+							return TRUE;
+					}
+				}
+			}
+
+			return FALSE;
+		};
+
+		function formatChanged(formats, callback, similar) {
+			var currentFormats;
+
+			// Setup format node change logic
+			if (!formatChangeData) {
+				formatChangeData = {};
+				currentFormats = {};
+
+				ed.onNodeChange.addToTop(function(ed, cm, node) {
+					var parents = getParents(node), matchedFormats = {};
+
+					// Check for new formats
+					each(formatChangeData, function(callbacks, format) {
+						each(parents, function(node) {
+							if (matchNode(node, format, {}, callbacks.similar)) {
+								if (!currentFormats[format]) {
+									// Execute callbacks
+									each(callbacks, function(callback) {
+										callback(true, {node: node, format: format, parents: parents});
+									});
+
+									currentFormats[format] = callbacks;
+								}
+
+								matchedFormats[format] = callbacks;
+								return false;
+							}
+						});
+					});
+
+					// Check if current formats still match
+					each(currentFormats, function(callbacks, format) {
+						if (!matchedFormats[format]) {
+							delete currentFormats[format];
+
+							each(callbacks, function(callback) {
+								callback(false, {node: node, format: format, parents: parents});
+							});
+						}
+					});
+				});
+			}
+
+			// Add format listeners
+			each(formats.split(','), function(format) {
+				if (!formatChangeData[format]) {
+					formatChangeData[format] = [];
+					formatChangeData[format].similar = similar;
+				}
+
+				formatChangeData[format].push(callback);
+			});
+
+			return this;
+		};
+
+		// Expose to public
+		tinymce.extend(this, {
+			get : get,
+			register : register,
+			apply : apply,
+			remove : remove,
+			toggle : toggle,
+			match : match,
+			matchAll : matchAll,
+			matchNode : matchNode,
+			canApply : canApply,
+			formatChanged: formatChanged
+		});
+
+		// Initialize
+		defaultFormats();
+		addKeyboardShortcuts();
+
+		// Private functions
+
+		function matchName(node, format) {
+			// Check for inline match
+			if (isEq(node, format.inline))
+				return TRUE;
+
+			// Check for block match
+			if (isEq(node, format.block))
+				return TRUE;
+
+			// Check for selector match
+			if (format.selector)
+				return dom.is(node, format.selector);
+		};
+
+		function isEq(str1, str2) {
+			str1 = str1 || '';
+			str2 = str2 || '';
+
+			str1 = '' + (str1.nodeName || str1);
+			str2 = '' + (str2.nodeName || str2);
+
+			return str1.toLowerCase() == str2.toLowerCase();
+		};
+
+		function getStyle(node, name) {
+			var styleVal = dom.getStyle(node, name);
+
+			// Force the format to hex
+			if (name == 'color' || name == 'backgroundColor')
+				styleVal = dom.toHex(styleVal);
+
+			// Opera will return bold as 700
+			if (name == 'fontWeight' && styleVal == 700)
+				styleVal = 'bold';
+
+			return '' + styleVal;
+		};
+
+		function replaceVars(value, vars) {
+			if (typeof(value) != "string")
+				value = value(vars);
+			else if (vars) {
+				value = value.replace(/%(\w+)/g, function(str, name) {
+					return vars[name] || str;
+				});
+			}
+
+			return value;
+		};
+
+		function isWhiteSpaceNode(node) {
+			return node && node.nodeType === 3 && /^([\t \r\n]+|)$/.test(node.nodeValue);
+		};
+
+		function wrap(node, name, attrs) {
+			var wrapper = dom.create(name, attrs);
+
+			node.parentNode.insertBefore(wrapper, node);
+			wrapper.appendChild(node);
+
+			return wrapper;
+		};
+
+		function expandRng(rng, format, remove) {
+			var sibling, lastIdx, leaf, endPoint,
+				startContainer = rng.startContainer,
+				startOffset = rng.startOffset,
+				endContainer = rng.endContainer,
+				endOffset = rng.endOffset;
+
+			// This function walks up the tree if there is no siblings before/after the node
+			function findParentContainer(start) {
+				var container, parent, child, sibling, siblingName, root;
+
+				container = parent = start ? startContainer : endContainer;
+				siblingName = start ? 'previousSibling' : 'nextSibling';
+				root = dom.getRoot();
+
+				function isBogusBr(node) {
+					return node.nodeName == "BR" && node.getAttribute('data-mce-bogus') && !node.nextSibling;
+				};
+
+				// If it's a text node and the offset is inside the text
+				if (container.nodeType == 3 && !isWhiteSpaceNode(container)) {
+					if (start ? startOffset > 0 : endOffset < container.nodeValue.length) {
+						return container;
+					}
+				}
+
+				for (;;) {
+					// Stop expanding on block elements
+					if (!format[0].block_expand && isBlock(parent))
+						return parent;
+
+					// Walk left/right
+					for (sibling = parent[siblingName]; sibling; sibling = sibling[siblingName]) {
+						if (!isBookmarkNode(sibling) && !isWhiteSpaceNode(sibling) && !isBogusBr(sibling)) {
+							return parent;
+						}
+					}
+
+					// Check if we can move up are we at root level or body level
+					if (parent.parentNode == root) {
+						container = parent;
+						break;
+					}
+
+					parent = parent.parentNode;
+				}
+
+				return container;
+			};
+
+			// This function walks down the tree to find the leaf at the selection.
+			// The offset is also returned as if node initially a leaf, the offset may be in the middle of the text node.
+			function findLeaf(node, offset) {
+				if (offset === undef)
+					offset = node.nodeType === 3 ? node.length : node.childNodes.length;
+				while (node && node.hasChildNodes()) {
+					node = node.childNodes[offset];
+					if (node)
+						offset = node.nodeType === 3 ? node.length : node.childNodes.length;
+				}
+				return { node: node, offset: offset };
+			}
+
+			// If index based start position then resolve it
+			if (startContainer.nodeType == 1 && startContainer.hasChildNodes()) {
+				lastIdx = startContainer.childNodes.length - 1;
+				startContainer = startContainer.childNodes[startOffset > lastIdx ? lastIdx : startOffset];
+
+				if (startContainer.nodeType == 3)
+					startOffset = 0;
+			}
+
+			// If index based end position then resolve it
+			if (endContainer.nodeType == 1 && endContainer.hasChildNodes()) {
+				lastIdx = endContainer.childNodes.length - 1;
+				endContainer = endContainer.childNodes[endOffset > lastIdx ? lastIdx : endOffset - 1];
+
+				if (endContainer.nodeType == 3)
+					endOffset = endContainer.nodeValue.length;
+			}
+
+			// Expands the node to the closes contentEditable false element if it exists
+			function findParentContentEditable(node) {
+				var parent = node;
+
+				while (parent) {
+					if (parent.nodeType === 1 && getContentEditable(parent)) {
+						return getContentEditable(parent) === "false" ? parent : node;
+					}
+
+					parent = parent.parentNode;
+				}
+
+				return node;
+			};
+
+			function findWordEndPoint(container, offset, start) {
+				var walker, node, pos, lastTextNode;
+
+				function findSpace(node, offset) {
+					var pos, pos2, str = node.nodeValue;
+
+					if (typeof(offset) == "undefined") {
+						offset = start ? str.length : 0;
+					}
+
+					if (start) {
+						pos = str.lastIndexOf(' ', offset);
+						pos2 = str.lastIndexOf('\u00a0', offset);
+						pos = pos > pos2 ? pos : pos2;
+
+						// Include the space on remove to avoid tag soup
+						if (pos !== -1 && !remove) {
+							pos++;
+						}
+					} else {
+						pos = str.indexOf(' ', offset);
+						pos2 = str.indexOf('\u00a0', offset);
+						pos = pos !== -1 && (pos2 === -1 || pos < pos2) ? pos : pos2;
+					}
+
+					return pos;
+				};
+
+				if (container.nodeType === 3) {
+					pos = findSpace(container, offset);
+
+					if (pos !== -1) {
+						return {container : container, offset : pos};
+					}
+
+					lastTextNode = container;
+				}
+
+				// Walk the nodes inside the block
+				walker = new TreeWalker(container, dom.getParent(container, isBlock) || ed.getBody());
+				while (node = walker[start ? 'prev' : 'next']()) {
+					if (node.nodeType === 3) {
+						lastTextNode = node;
+						pos = findSpace(node);
+
+						if (pos !== -1) {
+							return {container : node, offset : pos};
+						}
+					} else if (isBlock(node)) {
+						break;
+					}
+				}
+
+				if (lastTextNode) {
+					if (start) {
+						offset = 0;
+					} else {
+						offset = lastTextNode.length;
+					}
+
+					return {container: lastTextNode, offset: offset};
+				}
+			};
+
+			function findSelectorEndPoint(container, sibling_name) {
+				var parents, i, y, curFormat;
+
+				if (container.nodeType == 3 && container.nodeValue.length === 0 && container[sibling_name])
+					container = container[sibling_name];
+
+				parents = getParents(container);
+				for (i = 0; i < parents.length; i++) {
+					for (y = 0; y < format.length; y++) {
+						curFormat = format[y];
+
+						// If collapsed state is set then skip formats that doesn't match that
+						if ("collapsed" in curFormat && curFormat.collapsed !== rng.collapsed)
+							continue;
+
+						if (dom.is(parents[i], curFormat.selector))
+							return parents[i];
+					}
+				}
+
+				return container;
+			};
+
+			function findBlockEndPoint(container, sibling_name, sibling_name2) {
+				var node;
+
+				// Expand to block of similar type
+				if (!format[0].wrapper)
+					node = dom.getParent(container, format[0].block);
+
+				// Expand to first wrappable block element or any block element
+				if (!node)
+					node = dom.getParent(container.nodeType == 3 ? container.parentNode : container, isTextBlock);
+
+				// Exclude inner lists from wrapping
+				if (node && format[0].wrapper)
+					node = getParents(node, 'ul,ol').reverse()[0] || node;
+
+				// Didn't find a block element look for first/last wrappable element
+				if (!node) {
+					node = container;
+
+					while (node[sibling_name] && !isBlock(node[sibling_name])) {
+						node = node[sibling_name];
+
+						// Break on BR but include it will be removed later on
+						// we can't remove it now since we need to check if it can be wrapped
+						if (isEq(node, 'br'))
+							break;
+					}
+				}
+
+				return node || container;
+			};
+
+			// Expand to closest contentEditable element
+			startContainer = findParentContentEditable(startContainer);
+			endContainer = findParentContentEditable(endContainer);
+
+			// Exclude bookmark nodes if possible
+			if (isBookmarkNode(startContainer.parentNode) || isBookmarkNode(startContainer)) {
+				startContainer = isBookmarkNode(startContainer) ? startContainer : startContainer.parentNode;
+				startContainer = startContainer.nextSibling || startContainer;
+
+				if (startContainer.nodeType == 3)
+					startOffset = 0;
+			}
+
+			if (isBookmarkNode(endContainer.parentNode) || isBookmarkNode(endContainer)) {
+				endContainer = isBookmarkNode(endContainer) ? endContainer : endContainer.parentNode;
+				endContainer = endContainer.previousSibling || endContainer;
+
+				if (endContainer.nodeType == 3)
+					endOffset = endContainer.length;
+			}
+
+			if (format[0].inline) {
+				if (rng.collapsed) {
+					// Expand left to closest word boundery
+					endPoint = findWordEndPoint(startContainer, startOffset, true);
+					if (endPoint) {
+						startContainer = endPoint.container;
+						startOffset = endPoint.offset;
+					}
+
+					// Expand right to closest word boundery
+					endPoint = findWordEndPoint(endContainer, endOffset);
+					if (endPoint) {
+						endContainer = endPoint.container;
+						endOffset = endPoint.offset;
+					}
+				}
+
+				// Avoid applying formatting to a trailing space.
+				leaf = findLeaf(endContainer, endOffset);
+				if (leaf.node) {
+					while (leaf.node && leaf.offset === 0 && leaf.node.previousSibling)
+						leaf = findLeaf(leaf.node.previousSibling);
+
+					if (leaf.node && leaf.offset > 0 && leaf.node.nodeType === 3 &&
+							leaf.node.nodeValue.charAt(leaf.offset - 1) === ' ') {
+
+						if (leaf.offset > 1) {
+							endContainer = leaf.node;
+							endContainer.splitText(leaf.offset - 1);
+						}
+					}
+				}
+			}
+
+			// Move start/end point up the tree if the leaves are sharp and if we are in different containers
+			// Example * becomes !: !<p><b><i>*text</i><i>text*</i></b></p>!
+			// This will reduce the number of wrapper elements that needs to be created
+			// Move start point up the tree
+			if (format[0].inline || format[0].block_expand) {
+				if (!format[0].inline || (startContainer.nodeType != 3 || startOffset === 0)) {
+					startContainer = findParentContainer(true);
+				}
+
+				if (!format[0].inline || (endContainer.nodeType != 3 || endOffset === endContainer.nodeValue.length)) {
+					endContainer = findParentContainer();
+				}
+			}
+
+			// Expand start/end container to matching selector
+			if (format[0].selector && format[0].expand !== FALSE && !format[0].inline) {
+				// Find new startContainer/endContainer if there is better one
+				startContainer = findSelectorEndPoint(startContainer, 'previousSibling');
+				endContainer = findSelectorEndPoint(endContainer, 'nextSibling');
+			}
+
+			// Expand start/end container to matching block element or text node
+			if (format[0].block || format[0].selector) {
+				// Find new startContainer/endContainer if there is better one
+				startContainer = findBlockEndPoint(startContainer, 'previousSibling');
+				endContainer = findBlockEndPoint(endContainer, 'nextSibling');
+
+				// Non block element then try to expand up the leaf
+				if (format[0].block) {
+					if (!isBlock(startContainer))
+						startContainer = findParentContainer(true);
+
+					if (!isBlock(endContainer))
+						endContainer = findParentContainer();
+				}
+			}
+
+			// Setup index for startContainer
+			if (startContainer.nodeType == 1) {
+				startOffset = nodeIndex(startContainer);
+				startContainer = startContainer.parentNode;
+			}
+
+			// Setup index for endContainer
+			if (endContainer.nodeType == 1) {
+				endOffset = nodeIndex(endContainer) + 1;
+				endContainer = endContainer.parentNode;
+			}
+
+			// Return new range like object
+			return {
+				startContainer : startContainer,
+				startOffset : startOffset,
+				endContainer : endContainer,
+				endOffset : endOffset
+			};
+		}
+
+		function removeFormat(format, vars, node, compare_node) {
+			var i, attrs, stylesModified;
+
+			// Check if node matches format
+			if (!matchName(node, format))
+				return FALSE;
+
+			// Should we compare with format attribs and styles
+			if (format.remove != 'all') {
+				// Remove styles
+				each(format.styles, function(value, name) {
+					value = replaceVars(value, vars);
+
+					// Indexed array
+					if (typeof(name) === 'number') {
+						name = value;
+						compare_node = 0;
+					}
+
+					if (!compare_node || isEq(getStyle(compare_node, name), value))
+						dom.setStyle(node, name, '');
+
+					stylesModified = 1;
+				});
+
+				// Remove style attribute if it's empty
+				if (stylesModified && dom.getAttrib(node, 'style') == '') {
+					node.removeAttribute('style');
+					node.removeAttribute('data-mce-style');
+				}
+
+				// Remove attributes
+				each(format.attributes, function(value, name) {
+					var valueOut;
+
+					value = replaceVars(value, vars);
+
+					// Indexed array
+					if (typeof(name) === 'number') {
+						name = value;
+						compare_node = 0;
+					}
+
+					if (!compare_node || isEq(dom.getAttrib(compare_node, name), value)) {
+						// Keep internal classes
+						if (name == 'class') {
+							value = dom.getAttrib(node, name);
+							if (value) {
+								// Build new class value where everything is removed except the internal prefixed classes
+								valueOut = '';
+								each(value.split(/\s+/), function(cls) {
+									if (/mce\w+/.test(cls))
+										valueOut += (valueOut ? ' ' : '') + cls;
+								});
+
+								// We got some internal classes left
+								if (valueOut) {
+									dom.setAttrib(node, name, valueOut);
+									return;
+								}
+							}
+						}
+
+						// IE6 has a bug where the attribute doesn't get removed correctly
+						if (name == "class")
+							node.removeAttribute('className');
+
+						// Remove mce prefixed attributes
+						if (MCE_ATTR_RE.test(name))
+							node.removeAttribute('data-mce-' + name);
+
+						node.removeAttribute(name);
+					}
+				});
+
+				// Remove classes
+				each(format.classes, function(value) {
+					value = replaceVars(value, vars);
+
+					if (!compare_node || dom.hasClass(compare_node, value))
+						dom.removeClass(node, value);
+				});
+
+				// Check for non internal attributes
+				attrs = dom.getAttribs(node);
+				for (i = 0; i < attrs.length; i++) {
+					if (attrs[i].nodeName.indexOf('_') !== 0)
+						return FALSE;
+				}
+			}
+
+			// Remove the inline child if it's empty for example <b> or <span>
+			if (format.remove != 'none') {
+				removeNode(node, format);
+				return TRUE;
+			}
+		};
+
+		function removeNode(node, format) {
+			var parentNode = node.parentNode, rootBlockElm;
+
+			function find(node, next, inc) {
+				node = getNonWhiteSpaceSibling(node, next, inc);
+
+				return !node || (node.nodeName == 'BR' || isBlock(node));
+			};
+
+			if (format.block) {
+				if (!forcedRootBlock) {
+					// Append BR elements if needed before we remove the block
+					if (isBlock(node) && !isBlock(parentNode)) {
+						if (!find(node, FALSE) && !find(node.firstChild, TRUE, 1))
+							node.insertBefore(dom.create('br'), node.firstChild);
+
+						if (!find(node, TRUE) && !find(node.lastChild, FALSE, 1))
+							node.appendChild(dom.create('br'));
+					}
+				} else {
+					// Wrap the block in a forcedRootBlock if we are at the root of document
+					if (parentNode == dom.getRoot()) {
+						if (!format.list_block || !isEq(node, format.list_block)) {
+							each(tinymce.grep(node.childNodes), function(node) {
+								if (isValid(forcedRootBlock, node.nodeName.toLowerCase())) {
+									if (!rootBlockElm)
+										rootBlockElm = wrap(node, forcedRootBlock);
+									else
+										rootBlockElm.appendChild(node);
+								} else
+									rootBlockElm = 0;
+							});
+						}
+					}
+				}
+			}
+
+			// Never remove nodes that isn't the specified inline element if a selector is specified too
+			if (format.selector && format.inline && !isEq(format.inline, node))
+				return;
+
+			dom.remove(node, 1);
+		};
+
+		function getNonWhiteSpaceSibling(node, next, inc) {
+			if (node) {
+				next = next ? 'nextSibling' : 'previousSibling';
+
+				for (node = inc ? node : node[next]; node; node = node[next]) {
+					if (node.nodeType == 1 || !isWhiteSpaceNode(node))
+						return node;
+				}
+			}
+		};
+
+		function isBookmarkNode(node) {
+			return node && node.nodeType == 1 && node.getAttribute('data-mce-type') == 'bookmark';
+		};
+
+		function mergeSiblings(prev, next) {
+			var marker, sibling, tmpSibling;
+
+			function compareElements(node1, node2) {
+				// Not the same name
+				if (node1.nodeName != node2.nodeName)
+					return FALSE;
+
+				function getAttribs(node) {
+					var attribs = {};
+
+					each(dom.getAttribs(node), function(attr) {
+						var name = attr.nodeName.toLowerCase();
+
+						// Don't compare internal attributes or style
+						if (name.indexOf('_') !== 0 && name !== 'style')
+							attribs[name] = dom.getAttrib(node, name);
+					});
+
+					return attribs;
+				};
+
+				function compareObjects(obj1, obj2) {
+					var value, name;
+
+					for (name in obj1) {
+						// Obj1 has item obj2 doesn't have
+						if (obj1.hasOwnProperty(name)) {
+							value = obj2[name];
+
+							// Obj2 doesn't have obj1 item
+							if (value === undef)
+								return FALSE;
+
+							// Obj2 item has a different value
+							if (obj1[name] != value)
+								return FALSE;
+
+							// Delete similar value
+							delete obj2[name];
+						}
+					}
+
+					// Check if obj 2 has something obj 1 doesn't have
+					for (name in obj2) {
+						// Obj2 has item obj1 doesn't have
+						if (obj2.hasOwnProperty(name))
+							return FALSE;
+					}
+
+					return TRUE;
+				};
+
+				// Attribs are not the same
+				if (!compareObjects(getAttribs(node1), getAttribs(node2)))
+					return FALSE;
+
+				// Styles are not the same
+				if (!compareObjects(dom.parseStyle(dom.getAttrib(node1, 'style')), dom.parseStyle(dom.getAttrib(node2, 'style'))))
+					return FALSE;
+
+				return TRUE;
+			};
+
+			function findElementSibling(node, sibling_name) {
+				for (sibling = node; sibling; sibling = sibling[sibling_name]) {
+					if (sibling.nodeType == 3 && sibling.nodeValue.length !== 0)
+						return node;
+
+					if (sibling.nodeType == 1 && !isBookmarkNode(sibling))
+						return sibling;
+				}
+
+				return node;
+			};
+
+			// Check if next/prev exists and that they are elements
+			if (prev && next) {
+				// If previous sibling is empty then jump over it
+				prev = findElementSibling(prev, 'previousSibling');
+				next = findElementSibling(next, 'nextSibling');
+
+				// Compare next and previous nodes
+				if (compareElements(prev, next)) {
+					// Append nodes between
+					for (sibling = prev.nextSibling; sibling && sibling != next;) {
+						tmpSibling = sibling;
+						sibling = sibling.nextSibling;
+						prev.appendChild(tmpSibling);
+					}
+
+					// Remove next node
+					dom.remove(next);
+
+					// Move children into prev node
+					each(tinymce.grep(next.childNodes), function(node) {
+						prev.appendChild(node);
+					});
+
+					return prev;
+				}
+			}
+
+			return next;
+		};
+
+		function getContainer(rng, start) {
+			var container, offset, lastIdx, walker;
+
+			container = rng[start ? 'startContainer' : 'endContainer'];
+			offset = rng[start ? 'startOffset' : 'endOffset'];
+
+			if (container.nodeType == 1) {
+				lastIdx = container.childNodes.length - 1;
+
+				if (!start && offset)
+					offset--;
+
+				container = container.childNodes[offset > lastIdx ? lastIdx : offset];
+			}
+
+			// If start text node is excluded then walk to the next node
+			if (container.nodeType === 3 && start && offset >= container.nodeValue.length) {
+				container = new TreeWalker(container, ed.getBody()).next() || container;
+			}
+
+			// If end text node is excluded then walk to the previous node
+			if (container.nodeType === 3 && !start && offset === 0) {
+				container = new TreeWalker(container, ed.getBody()).prev() || container;
+			}
+
+			return container;
+		};
+
+		function performCaretAction(type, name, vars) {
+			var caretContainerId = '_mce_caret', debug = ed.settings.caret_debug;
+
+			// Creates a caret container bogus element
+			function createCaretContainer(fill) {
+				var caretContainer = dom.create('span', {id: caretContainerId, 'data-mce-bogus': true, style: debug ? 'color:red' : ''});
+
+				if (fill) {
+					caretContainer.appendChild(ed.getDoc().createTextNode(INVISIBLE_CHAR));
+				}
+
+				return caretContainer;
+			};
+
+			function isCaretContainerEmpty(node, nodes) {
+				while (node) {
+					if ((node.nodeType === 3 && node.nodeValue !== INVISIBLE_CHAR) || node.childNodes.length > 1) {
+						return false;
+					}
+
+					// Collect nodes
+					if (nodes && node.nodeType === 1) {
+						nodes.push(node);
+					}
+
+					node = node.firstChild;
+				}
+
+				return true;
+			};
+			
+			// Returns any parent caret container element
+			function getParentCaretContainer(node) {
+				while (node) {
+					if (node.id === caretContainerId) {
+						return node;
+					}
+
+					node = node.parentNode;
+				}
+			};
+
+			// Finds the first text node in the specified node
+			function findFirstTextNode(node) {
+				var walker;
+
+				if (node) {
+					walker = new TreeWalker(node, node);
+
+					for (node = walker.current(); node; node = walker.next()) {
+						if (node.nodeType === 3) {
+							return node;
+						}
+					}
+				}
+			};
+
+			// Removes the caret container for the specified node or all on the current document
+			function removeCaretContainer(node, move_caret) {
+				var child, rng;
+
+				if (!node) {
+					node = getParentCaretContainer(selection.getStart());
+
+					if (!node) {
+						while (node = dom.get(caretContainerId)) {
+							removeCaretContainer(node, false);
+						}
+					}
+				} else {
+					rng = selection.getRng(true);
+
+					if (isCaretContainerEmpty(node)) {
+						if (move_caret !== false) {
+							rng.setStartBefore(node);
+							rng.setEndBefore(node);
+						}
+
+						dom.remove(node);
+					} else {
+						child = findFirstTextNode(node);
+
+						if (child.nodeValue.charAt(0) === INVISIBLE_CHAR) {
+							child = child.deleteData(0, 1);
+						}
+
+						dom.remove(node, 1);
+					}
+
+					selection.setRng(rng);
+				}
+			};
+			
+			// Applies formatting to the caret postion
+			function applyCaretFormat() {
+				var rng, caretContainer, textNode, offset, bookmark, container, text;
+
+				rng = selection.getRng(true);
+				offset = rng.startOffset;
+				container = rng.startContainer;
+				text = container.nodeValue;
+
+				caretContainer = getParentCaretContainer(selection.getStart());
+				if (caretContainer) {
+					textNode = findFirstTextNode(caretContainer);
+				}
+
+				// Expand to word is caret is in the middle of a text node and the char before/after is a alpha numeric character
+				if (text && offset > 0 && offset < text.length && /\w/.test(text.charAt(offset)) && /\w/.test(text.charAt(offset - 1))) {
+					// Get bookmark of caret position
+					bookmark = selection.getBookmark();
+
+					// Collapse bookmark range (WebKit)
+					rng.collapse(true);
+
+					// Expand the range to the closest word and split it at those points
+					rng = expandRng(rng, get(name));
+					rng = rangeUtils.split(rng);
+
+					// Apply the format to the range
+					apply(name, vars, rng);
+
+					// Move selection back to caret position
+					selection.moveToBookmark(bookmark);
+				} else {
+					if (!caretContainer || textNode.nodeValue !== INVISIBLE_CHAR) {
+						caretContainer = createCaretContainer(true);
+						textNode = caretContainer.firstChild;
+
+						rng.insertNode(caretContainer);
+						offset = 1;
+
+						apply(name, vars, caretContainer);
+					} else {
+						apply(name, vars, caretContainer);
+					}
+
+					// Move selection to text node
+					selection.setCursorLocation(textNode, offset);
+				}
+			};
+
+			function removeCaretFormat() {
+				var rng = selection.getRng(true), container, offset, bookmark,
+					hasContentAfter, node, formatNode, parents = [], i, caretContainer;
+
+				container = rng.startContainer;
+				offset = rng.startOffset;
+				node = container;
+
+				if (container.nodeType == 3) {
+					if (offset != container.nodeValue.length || container.nodeValue === INVISIBLE_CHAR) {
+						hasContentAfter = true;
+					}
+
+					node = node.parentNode;
+				}
+
+				while (node) {
+					if (matchNode(node, name, vars)) {
+						formatNode = node;
+						break;
+					}
+
+					if (node.nextSibling) {
+						hasContentAfter = true;
+					}
+
+					parents.push(node);
+					node = node.parentNode;
+				}
+
+				// Node doesn't have the specified format
+				if (!formatNode) {
+					return;
+				}
+
+				// Is there contents after the caret then remove the format on the element
+				if (hasContentAfter) {
+					// Get bookmark of caret position
+					bookmark = selection.getBookmark();
+
+					// Collapse bookmark range (WebKit)
+					rng.collapse(true);
+
+					// Expand the range to the closest word and split it at those points
+					rng = expandRng(rng, get(name), true);
+					rng = rangeUtils.split(rng);
+
+					// Remove the format from the range
+					remove(name, vars, rng);
+
+					// Move selection back to caret position
+					selection.moveToBookmark(bookmark);
+				} else {
+					caretContainer = createCaretContainer();
+
+					node = caretContainer;
+					for (i = parents.length - 1; i >= 0; i--) {
+						node.appendChild(dom.clone(parents[i], false));
+						node = node.firstChild;
+					}
+
+					// Insert invisible character into inner most format element
+					node.appendChild(dom.doc.createTextNode(INVISIBLE_CHAR));
+					node = node.firstChild;
+
+					var block = dom.getParent(formatNode, isTextBlock);
+
+					if (block && dom.isEmpty(block)) {
+						// Replace formatNode with caretContainer when removing format from empty block like <p><b>|</b></p>
+						formatNode.parentNode.replaceChild(caretContainer, formatNode);
+					} else {
+						// Insert caret container after the formated node
+						dom.insertAfter(caretContainer, formatNode);
+					}
+
+					// Move selection to text node
+					selection.setCursorLocation(node, 1);
+
+					// If the formatNode is empty, we can remove it safely. 
+					if (dom.isEmpty(formatNode)) {
+						dom.remove(formatNode);
+					}
+				}
+			};
+
+			// Checks if the parent caret container node isn't empty if that is the case it
+			// will remove the bogus state on all children that isn't empty
+			function unmarkBogusCaretParents() {
+				var i, caretContainer, node;
+
+				caretContainer = getParentCaretContainer(selection.getStart());
+				if (caretContainer && !dom.isEmpty(caretContainer)) {
+					tinymce.walk(caretContainer, function(node) {
+						if (node.nodeType == 1 && node.id !== caretContainerId && !dom.isEmpty(node)) {
+							dom.setAttrib(node, 'data-mce-bogus', null);
+						}
+					}, 'childNodes');
+				}
+			};
+
+			// Only bind the caret events once
+			if (!self._hasCaretEvents) {
+				// Mark current caret container elements as bogus when getting the contents so we don't end up with empty elements
+				ed.onBeforeGetContent.addToTop(function() {
+					var nodes = [], i;
+
+					if (isCaretContainerEmpty(getParentCaretContainer(selection.getStart()), nodes)) {
+						// Mark children
+						i = nodes.length;
+						while (i--) {
+							dom.setAttrib(nodes[i], 'data-mce-bogus', '1');
+						}
+					}
+				});
+
+				// Remove caret container on mouse up and on key up
+				tinymce.each('onMouseUp onKeyUp'.split(' '), function(name) {
+					ed[name].addToTop(function() {
+						removeCaretContainer();
+						unmarkBogusCaretParents();
+					});
+				});
+
+				// Remove caret container on keydown and it's a backspace, enter or left/right arrow keys
+				ed.onKeyDown.addToTop(function(ed, e) {
+					var keyCode = e.keyCode;
+
+					if (keyCode == 8 || keyCode == 37 || keyCode == 39) {
+						removeCaretContainer(getParentCaretContainer(selection.getStart()));
+					}
+
+					unmarkBogusCaretParents();
+				});
+
+				// Remove bogus state if they got filled by contents using editor.selection.setContent
+				selection.onSetContent.add(unmarkBogusCaretParents);
+
+				self._hasCaretEvents = true;
+			}
+
+			// Do apply or remove caret format
+			if (type == "apply") {
+				applyCaretFormat();
+			} else {
+				removeCaretFormat();
+			}
+		};
+
+		function moveStart(rng) {
+			var container = rng.startContainer,
+					offset = rng.startOffset, isAtEndOfText,
+					walker, node, nodes, tmpNode;
+
+			// Convert text node into index if possible
+			if (container.nodeType == 3 && offset >= container.nodeValue.length) {
+				// Get the parent container location and walk from there
+				offset = nodeIndex(container);
+				container = container.parentNode;
+				isAtEndOfText = true;
+			}
+
+			// Move startContainer/startOffset in to a suitable node
+			if (container.nodeType == 1) {
+				nodes = container.childNodes;
+				container = nodes[Math.min(offset, nodes.length - 1)];
+				walker = new TreeWalker(container, dom.getParent(container, dom.isBlock));
+
+				// If offset is at end of the parent node walk to the next one
+				if (offset > nodes.length - 1 || isAtEndOfText)
+					walker.next();
+
+				for (node = walker.current(); node; node = walker.next()) {
+					if (node.nodeType == 3 && !isWhiteSpaceNode(node)) {
+						// IE has a "neat" feature where it moves the start node into the closest element
+						// we can avoid this by inserting an element before it and then remove it after we set the selection
+						tmpNode = dom.create('a', null, INVISIBLE_CHAR);
+						node.parentNode.insertBefore(tmpNode, node);
+
+						// Set selection and remove tmpNode
+						rng.setStart(node, 0);
+						selection.setRng(rng);
+						dom.remove(tmpNode);
+
+						return;
+					}
+				}
+			}
+		};
+	};
+})(tinymce);
+
+tinymce.onAddEditor.add(function(tinymce, ed) {
+	var filters, fontSizes, dom, settings = ed.settings;
+
+	function replaceWithSpan(node, styles) {
+		tinymce.each(styles, function(value, name) {
+			if (value)
+				dom.setStyle(node, name, value);
+		});
+
+		dom.rename(node, 'span');
+	};
+
+	function convert(editor, params) {
+		dom = editor.dom;
+
+		if (settings.convert_fonts_to_spans) {
+			tinymce.each(dom.select('font,u,strike', params.node), function(node) {
+				filters[node.nodeName.toLowerCase()](ed.dom, node);
+			});
+		}
+	};
+
+	if (settings.inline_styles) {
+		fontSizes = tinymce.explode(settings.font_size_legacy_values);
+
+		filters = {
+			font : function(dom, node) {
+				replaceWithSpan(node, {
+					backgroundColor : node.style.backgroundColor,
+					color : node.color,
+					fontFamily : node.face,
+					fontSize : fontSizes[parseInt(node.size, 10) - 1]
+				});
+			},
+
+			u : function(dom, node) {
+				replaceWithSpan(node, {
+					textDecoration : 'underline'
+				});
+			},
+
+			strike : function(dom, node) {
+				replaceWithSpan(node, {
+					textDecoration : 'line-through'
+				});
+			}
+		};
+
+		ed.onPreProcess.add(convert);
+		ed.onSetContent.add(convert);
+
+		ed.onInit.add(function() {
+			ed.selection.onSetContent.add(convert);
+		});
+	}
+});
+
+(function(tinymce) {
+	var TreeWalker = tinymce.dom.TreeWalker;
+
+	tinymce.EnterKey = function(editor) {
+		var dom = editor.dom, selection = editor.selection, settings = editor.settings, undoManager = editor.undoManager, nonEmptyElementsMap = editor.schema.getNonEmptyElements();
+
+		function handleEnterKey(evt) {
+			var rng = selection.getRng(true), tmpRng, editableRoot, container, offset, parentBlock, documentMode, shiftKey,
+				newBlock, fragment, containerBlock, parentBlockName, containerBlockName, newBlockName, isAfterLastNodeInContainer;
+
+			// Returns true if the block can be split into two blocks or not
+			function canSplitBlock(node) {
+				return node &&
+					dom.isBlock(node) &&
+					!/^(TD|TH|CAPTION|FORM)$/.test(node.nodeName) &&
+					!/^(fixed|absolute)/i.test(node.style.position) && 
+					dom.getContentEditable(node) !== "true";
+			};
+
+			// Renders empty block on IE
+			function renderBlockOnIE(block) {
+				var oldRng;
+
+				if (tinymce.isIE && !tinymce.isIE11 && dom.isBlock(block)) {
+					oldRng = selection.getRng();
+					block.appendChild(dom.create('span', null, '\u00a0'));
+					selection.select(block);
+					block.lastChild.outerHTML = '';
+					selection.setRng(oldRng);
+				}
+			};
+
+			// Remove the first empty inline element of the block so this: <p><b><em></em></b>x</p> becomes this: <p>x</p>
+			function trimInlineElementsOnLeftSideOfBlock(block) {
+				var node = block, firstChilds = [], i;
+
+				// Find inner most first child ex: <p><i><b>*</b></i></p>
+				while (node = node.firstChild) {
+					if (dom.isBlock(node)) {
+						return;
+					}
+
+					if (node.nodeType == 1 && !nonEmptyElementsMap[node.nodeName.toLowerCase()]) {
+						firstChilds.push(node);
+					}
+				}
+
+				i = firstChilds.length;
+				while (i--) {
+					node = firstChilds[i];
+					if (!node.hasChildNodes() || (node.firstChild == node.lastChild && node.firstChild.nodeValue === '')) {
+						dom.remove(node);
+					} else {
+						// Remove <a> </a> see #5381
+						if (node.nodeName == "A" && (node.innerText || node.textContent) === ' ') {
+							dom.remove(node);
+						}
+					}
+				}
+			};
+			
+			// Moves the caret to a suitable position within the root for example in the first non pure whitespace text node or before an image
+			function moveToCaretPosition(root) {
+				var walker, node, rng, y, viewPort, lastNode = root, tempElm;
+
+				rng = dom.createRng();
+
+				if (root.hasChildNodes()) {
+					walker = new TreeWalker(root, root);
+
+					while (node = walker.current()) {
+						if (node.nodeType == 3) {
+							rng.setStart(node, 0);
+							rng.setEnd(node, 0);
+							break;
+						}
+
+						if (nonEmptyElementsMap[node.nodeName.toLowerCase()]) {
+							rng.setStartBefore(node);
+							rng.setEndBefore(node);
+							break;
+						}
+
+						lastNode = node;
+						node = walker.next();
+					}
+
+					if (!node) {
+						rng.setStart(lastNode, 0);
+						rng.setEnd(lastNode, 0);
+					}
+				} else {
+					if (root.nodeName == 'BR') {
+						if (root.nextSibling && dom.isBlock(root.nextSibling)) {
+							// Trick on older IE versions to render the caret before the BR between two lists
+							if (!documentMode || documentMode < 9) {
+								tempElm = dom.create('br');
+								root.parentNode.insertBefore(tempElm, root);
+							}
+
+							rng.setStartBefore(root);
+							rng.setEndBefore(root);
+						} else {
+							rng.setStartAfter(root);
+							rng.setEndAfter(root);
+						}
+					} else {
+						rng.setStart(root, 0);
+						rng.setEnd(root, 0);
+					}
+				}
+
+				selection.setRng(rng);
+
+				// Remove tempElm created for old IE:s
+				dom.remove(tempElm);
+
+				viewPort = dom.getViewPort(editor.getWin());
+
+				// scrollIntoView seems to scroll the parent window in most browsers now including FF 3.0b4 so it's time to stop using it and do it our selfs
+				y = dom.getPos(root).y;
+				if (y < viewPort.y || y + 25 > viewPort.y + viewPort.h) {
+					editor.getWin().scrollTo(0, y < viewPort.y ? y : y - viewPort.h + 25); // Needs to be hardcoded to roughly one line of text if a huge text block is broken into two blocks
+				}
+			};
+
+			// Creates a new block element by cloning the current one or creating a new one if the name is specified
+			// This function will also copy any text formatting from the parent block and add it to the new one
+			function createNewBlock(name) {
+				var node = container, block, clonedNode, caretNode;
+
+				block = name || parentBlockName == "TABLE" ? dom.create(name || newBlockName) : parentBlock.cloneNode(false);
+				caretNode = block;
+
+				// Clone any parent styles
+				if (settings.keep_styles !== false) {
+					do {
+						if (/^(SPAN|STRONG|B|EM|I|FONT|STRIKE|U)$/.test(node.nodeName)) {
+							// Never clone a caret containers
+							if (node.id == '_mce_caret') {
+								continue;
+							}
+
+							clonedNode = node.cloneNode(false);
+							dom.setAttrib(clonedNode, 'id', ''); // Remove ID since it needs to be document unique
+
+							if (block.hasChildNodes()) {
+								clonedNode.appendChild(block.firstChild);
+								block.appendChild(clonedNode);
+							} else {
+								caretNode = clonedNode;
+								block.appendChild(clonedNode);
+							}
+						}
+					} while (node = node.parentNode);
+				}
+
+				// BR is needed in empty blocks on non IE browsers
+				if (!tinymce.isIE || tinymce.isIE11) {
+					caretNode.innerHTML = '<br data-mce-bogus="1">';
+				}
+
+				return block;
+			};
+
+			// Returns true/false if the caret is at the start/end of the parent block element
+			function isCaretAtStartOrEndOfBlock(start) {
+				var walker, node, name;
+
+				// Caret is in the middle of a text node like "a|b"
+				if (container.nodeType == 3 && (start ? offset > 0 : offset < container.nodeValue.length)) {
+					return false;
+				}
+
+				// If after the last element in block node edge case for #5091
+				if (container.parentNode == parentBlock && isAfterLastNodeInContainer && !start) {
+					return true;
+				}
+
+				// If the caret if before the first element in parentBlock
+				if (start && container.nodeType == 1 && container == parentBlock.firstChild) {
+					return true;
+				}
+
+				// Caret can be before/after a table
+				if (container.nodeName === "TABLE" || (container.previousSibling && container.previousSibling.nodeName == "TABLE")) {
+					return (isAfterLastNodeInContainer && !start) || (!isAfterLastNodeInContainer && start);
+				}
+
+				// Walk the DOM and look for text nodes or non empty elements
+				walker = new TreeWalker(container, parentBlock);
+	
+				// If caret is in beginning or end of a text block then jump to the next/previous node
+				if (container.nodeType == 3) {
+					if (start && offset == 0) {
+						walker.prev();
+					} else if (!start && offset == container.nodeValue.length) {
+						walker.next();
+					}
+				}
+
+				while (node = walker.current()) {
+					if (node.nodeType === 1) {
+						// Ignore bogus elements
+						if (!node.getAttribute('data-mce-bogus')) {
+							// Keep empty elements like <img /> <input /> but not trailing br:s like <p>text|<br></p>
+							name = node.nodeName.toLowerCase();
+							if (nonEmptyElementsMap[name] && name !== 'br') {
+								return false;
+							}
+						}
+					} else if (node.nodeType === 3 && !/^[ \t\r\n]*$/.test(node.nodeValue)) {
+						return false;
+					}
+
+					if (start) {
+						walker.prev();
+					} else {
+						walker.next();
+					}
+				}
+
+				return true;
+			};
+
+			// Wraps any text nodes or inline elements in the specified forced root block name
+			function wrapSelfAndSiblingsInDefaultBlock(container, offset) {
+				var newBlock, parentBlock, startNode, node, next, blockName = newBlockName || 'P';
+
+				// Not in a block element or in a table cell or caption
+				parentBlock = dom.getParent(container, dom.isBlock);
+				if (!parentBlock || !canSplitBlock(parentBlock)) {
+					parentBlock = parentBlock || editableRoot;
+
+					if (!parentBlock.hasChildNodes()) {
+						newBlock = dom.create(blockName);
+						parentBlock.appendChild(newBlock);
+						rng.setStart(newBlock, 0);
+						rng.setEnd(newBlock, 0);
+						return newBlock;
+					}
+
+					// Find parent that is the first child of parentBlock
+					node = container;
+					while (node.parentNode != parentBlock) {
+						node = node.parentNode;
+					}
+
+					// Loop left to find start node start wrapping at
+					while (node && !dom.isBlock(node)) {
+						startNode = node;
+						node = node.previousSibling;
+					}
+
+					if (startNode) {
+						newBlock = dom.create(blockName);
+						startNode.parentNode.insertBefore(newBlock, startNode);
+
+						// Start wrapping until we hit a block
+						node = startNode;
+						while (node && !dom.isBlock(node)) {
+							next = node.nextSibling;
+							newBlock.appendChild(node);
+							node = next;
+						}
+
+						// Restore range to it's past location
+						rng.setStart(container, offset);
+						rng.setEnd(container, offset);
+					}
+				}
+
+				return container;
+			};
+
+			// Inserts a block or br before/after or in the middle of a split list of the LI is empty
+			function handleEmptyListItem() {
+				function isFirstOrLastLi(first) {
+					var node = containerBlock[first ? 'firstChild' : 'lastChild'];
+
+					// Find first/last element since there might be whitespace there
+					while (node) {
+						if (node.nodeType == 1) {
+							break;
+						}
+
+						node = node[first ? 'nextSibling' : 'previousSibling'];
+					}
+
+					return node === parentBlock;
+				};
+
+				newBlock = newBlockName ? createNewBlock(newBlockName) : dom.create('BR');
+
+				if (isFirstOrLastLi(true) && isFirstOrLastLi()) {
+					// Is first and last list item then replace the OL/UL with a text block
+					dom.replace(newBlock, containerBlock);
+				} else if (isFirstOrLastLi(true)) {
+					// First LI in list then remove LI and add text block before list
+					containerBlock.parentNode.insertBefore(newBlock, containerBlock);
+				} else if (isFirstOrLastLi()) {
+					// Last LI in list then temove LI and add text block after list
+					dom.insertAfter(newBlock, containerBlock);
+					renderBlockOnIE(newBlock);
+				} else {
+					// Middle LI in list the split the list and insert a text block in the middle
+					// Extract after fragment and insert it after the current block
+					tmpRng = rng.cloneRange();
+					tmpRng.setStartAfter(parentBlock);
+					tmpRng.setEndAfter(containerBlock);
+					fragment = tmpRng.extractContents();
+					dom.insertAfter(fragment, containerBlock);
+					dom.insertAfter(newBlock, containerBlock);
+				}
+
+				dom.remove(parentBlock);
+				moveToCaretPosition(newBlock);
+				undoManager.add();
+			};
+
+			// Walks the parent block to the right and look for any contents
+			function hasRightSideContent() {
+				var walker = new TreeWalker(container, parentBlock), node;
+
+				while (node = walker.next()) {
+					if (nonEmptyElementsMap[node.nodeName.toLowerCase()] || node.length > 0) {
+						return true;
+					}
+				}
+			}
+
+			// Inserts a BR element if the forced_root_block option is set to false or empty string
+			function insertBr() {
+				var brElm, extraBr, marker;
+
+				if (container && container.nodeType == 3 && offset >= container.nodeValue.length) {
+					// Insert extra BR element at the end block elements
+					if ((!tinymce.isIE || tinymce.isIE11) && !hasRightSideContent()) {
+						brElm = dom.create('br');
+						rng.insertNode(brElm);
+						rng.setStartAfter(brElm);
+						rng.setEndAfter(brElm);
+						extraBr = true;
+					}
+				}
+
+				brElm = dom.create('br');
+				rng.insertNode(brElm);
+
+				// Rendering modes below IE8 doesn't display BR elements in PRE unless we have a \n before it
+				if ((tinymce.isIE && !tinymce.isIE11) && parentBlockName == 'PRE' && (!documentMode || documentMode < 8)) {
+					brElm.parentNode.insertBefore(dom.doc.createTextNode('\r'), brElm);
+				}
+
+				// Insert temp marker and scroll to that
+				marker = dom.create('span', {}, '&nbsp;');
+				brElm.parentNode.insertBefore(marker, brElm);
+				selection.scrollIntoView(marker);
+				dom.remove(marker);
+
+				if (!extraBr) {
+					rng.setStartAfter(brElm);
+					rng.setEndAfter(brElm);
+				} else {
+					rng.setStartBefore(brElm);
+					rng.setEndBefore(brElm);
+				}
+
+				selection.setRng(rng);
+				undoManager.add();
+			};
+
+			// Trims any linebreaks at the beginning of node user for example when pressing enter in a PRE element
+			function trimLeadingLineBreaks(node) {
+				do {
+					if (node.nodeType === 3) {
+						node.nodeValue = node.nodeValue.replace(/^[\r\n]+/, '');
+					}
+
+					node = node.firstChild;
+				} while (node);
+			};
+
+			function getEditableRoot(node) {
+				var root = dom.getRoot(), parent, editableRoot;
+
+				// Get all parents until we hit a non editable parent or the root
+				parent = node;
+				while (parent !== root && dom.getContentEditable(parent) !== "false") {
+					if (dom.getContentEditable(parent) === "true") {
+						editableRoot = parent;
+					}
+
+					parent = parent.parentNode;
+				}
+				
+				return parent !== root ? editableRoot : root;
+			};
+
+			// Adds a BR at the end of blocks that only contains an IMG or INPUT since these might be floated and then they won't expand the block
+			function addBrToBlockIfNeeded(block) {
+				var lastChild;
+
+				// IE will render the blocks correctly other browsers needs a BR
+				if (!tinymce.isIE || tinymce.isIE11) {
+					block.normalize(); // Remove empty text nodes that got left behind by the extract
+
+					// Check if the block is empty or contains a floated last child
+					lastChild = block.lastChild;
+					if (!lastChild || (/^(left|right)$/gi.test(dom.getStyle(lastChild, 'float', true)))) {
+						dom.add(block, 'br');
+					}
+				}
+			};
+
+			// Delete any selected contents
+			if (!rng.collapsed) {
+				editor.execCommand('Delete');
+				return;
+			}
+
+			// Event is blocked by some other handler for example the lists plugin
+			if (evt.isDefaultPrevented()) {
+				return;
+			}
+
+			// Setup range items and newBlockName
+			container = rng.startContainer;
+			offset = rng.startOffset;
+			newBlockName = (settings.force_p_newlines ? 'p' : '') || settings.forced_root_block;
+			newBlockName = newBlockName ? newBlockName.toUpperCase() : '';
+			documentMode = dom.doc.documentMode;
+			shiftKey = evt.shiftKey;
+
+			// Resolve node index
+			if (container.nodeType == 1 && container.hasChildNodes()) {
+				isAfterLastNodeInContainer = offset > container.childNodes.length - 1;
+				container = container.childNodes[Math.min(offset, container.childNodes.length - 1)] || container;
+				if (isAfterLastNodeInContainer && container.nodeType == 3) {
+					offset = container.nodeValue.length;
+				} else {
+					offset = 0;
+				}
+			}
+
+			// Get editable root node normaly the body element but sometimes a div or span
+			editableRoot = getEditableRoot(container);
+
+			// If there is no editable root then enter is done inside a contentEditable false element
+			if (!editableRoot) {
+				return;
+			}
+
+			undoManager.beforeChange();
+
+			// If editable root isn't block nor the root of the editor
+			if (!dom.isBlock(editableRoot) && editableRoot != dom.getRoot()) {
+				if (!newBlockName || shiftKey) {
+					insertBr();
+				}
+
+				return;
+			}
+
+			// Wrap the current node and it's sibling in a default block if it's needed.
+			// for example this <td>text|<b>text2</b></td> will become this <td><p>text|<b>text2</p></b></td>
+			// This won't happen if root blocks are disabled or the shiftKey is pressed
+			if ((newBlockName && !shiftKey) || (!newBlockName && shiftKey)) {
+				container = wrapSelfAndSiblingsInDefaultBlock(container, offset);
+			}
+
+			// Find parent block and setup empty block paddings
+			parentBlock = dom.getParent(container, dom.isBlock);
+			containerBlock = parentBlock ? dom.getParent(parentBlock.parentNode, dom.isBlock) : null;
+
+			// Setup block names
+			parentBlockName = parentBlock ? parentBlock.nodeName.toUpperCase() : ''; // IE < 9 & HTML5
+			containerBlockName = containerBlock ? containerBlock.nodeName.toUpperCase() : ''; // IE < 9 & HTML5
+
+			// Enter inside block contained within a LI then split or insert before/after LI
+			if (containerBlockName == 'LI' && !evt.ctrlKey) {
+				parentBlock = containerBlock;
+				parentBlockName = containerBlockName;
+			}
+
+			// Handle enter in LI
+			if (parentBlockName == 'LI') {
+				if (!newBlockName && shiftKey) {
+					insertBr();
+					return;
+				}
+
+				// Handle enter inside an empty list item
+				if (dom.isEmpty(parentBlock)) {
+					// Let the list plugin or browser handle nested lists for now
+					if (/^(UL|OL|LI)$/.test(containerBlock.parentNode.nodeName)) {
+						return false;
+					}
+
+					handleEmptyListItem();
+					return;
+				}
+			}
+
+			// Don't split PRE tags but insert a BR instead easier when writing code samples etc
+			if (parentBlockName == 'PRE' && settings.br_in_pre !== false) {
+				if (!shiftKey) {
+					insertBr();
+					return;
+				}
+			} else {
+				// If no root block is configured then insert a BR by default or if the shiftKey is pressed
+				if ((!newBlockName && !shiftKey && parentBlockName != 'LI') || (newBlockName && shiftKey)) {
+					insertBr();
+					return;
+				}
+			}
+
+			// Default block name if it's not configured
+			newBlockName = newBlockName || 'P';
+
+			// Insert new block before/after the parent block depending on caret location
+			if (isCaretAtStartOrEndOfBlock()) {
+				// If the caret is at the end of a header we produce a P tag after it similar to Word unless we are in a hgroup
+				if (/^(H[1-6]|PRE)$/.test(parentBlockName) && containerBlockName != 'HGROUP') {
+					newBlock = createNewBlock(newBlockName);
+				} else {
+					newBlock = createNewBlock();
+				}
+
+				// Split the current container block element if enter is pressed inside an empty inner block element
+				if (settings.end_container_on_empty_block && canSplitBlock(containerBlock) && dom.isEmpty(parentBlock)) {
+					// Split container block for example a BLOCKQUOTE at the current blockParent location for example a P
+					newBlock = dom.split(containerBlock, parentBlock);
+				} else {
+					dom.insertAfter(newBlock, parentBlock);
+				}
+
+				moveToCaretPosition(newBlock);
+			} else if (isCaretAtStartOrEndOfBlock(true)) {
+				// Insert new block before
+				newBlock = parentBlock.parentNode.insertBefore(createNewBlock(), parentBlock);
+				renderBlockOnIE(newBlock);
+			} else {
+				// Extract after fragment and insert it after the current block
+				tmpRng = rng.cloneRange();
+				tmpRng.setEndAfter(parentBlock);
+				fragment = tmpRng.extractContents();
+				trimLeadingLineBreaks(fragment);
+				newBlock = fragment.firstChild;
+				dom.insertAfter(fragment, parentBlock);
+				trimInlineElementsOnLeftSideOfBlock(newBlock);
+				addBrToBlockIfNeeded(parentBlock);
+				moveToCaretPosition(newBlock);
+			}
+
+			dom.setAttrib(newBlock, 'id', ''); // Remove ID since it needs to be document unique
+			undoManager.add();
+		}
+
+		editor.onKeyDown.add(function(ed, evt) {
+			if (evt.keyCode == 13) {
+				if (handleEnterKey(evt) !== false) {
+					evt.preventDefault();
+				}
+			}
+		});
+	};
+})(tinymce);
+
diff --git a/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/utils/editable_selects.js b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/utils/editable_selects.js
new file mode 100644
index 0000000..4d9ffe2
--- /dev/null
+++ b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/utils/editable_selects.js
@@ -0,0 +1,70 @@
+/**
+ * editable_selects.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+var TinyMCE_EditableSelects = {
+	editSelectElm : null,
+
+	init : function() {
+		var nl = document.getElementsByTagName("select"), i, d = document, o;
+
+		for (i=0; i<nl.length; i++) {
+			if (nl[i].className.indexOf('mceEditableSelect') != -1) {
+				o = new Option(tinyMCEPopup.editor.translate('value'), '__mce_add_custom__');
+
+				o.className = 'mceAddSelectValue';
+
+				nl[i].options[nl[i].options.length] = o;
+				nl[i].onchange = TinyMCE_EditableSelects.onChangeEditableSelect;
+			}
+		}
+	},
+
+	onChangeEditableSelect : function(e) {
+		var d = document, ne, se = window.event ? window.event.srcElement : e.target;
+
+		if (se.options[se.selectedIndex].value == '__mce_add_custom__') {
+			ne = d.createElement("input");
+			ne.id = se.id + "_custom";
+			ne.name = se.name + "_custom";
+			ne.type = "text";
+
+			ne.style.width = se.offsetWidth + 'px';
+			se.parentNode.insertBefore(ne, se);
+			se.style.display = 'none';
+			ne.focus();
+			ne.onblur = TinyMCE_EditableSelects.onBlurEditableSelectInput;
+			ne.onkeydown = TinyMCE_EditableSelects.onKeyDown;
+			TinyMCE_EditableSelects.editSelectElm = se;
+		}
+	},
+
+	onBlurEditableSelectInput : function() {
+		var se = TinyMCE_EditableSelects.editSelectElm;
+
+		if (se) {
+			if (se.previousSibling.value != '') {
+				addSelectValue(document.forms[0], se.id, se.previousSibling.value, se.previousSibling.value);
+				selectByValue(document.forms[0], se.id, se.previousSibling.value);
+			} else
+				selectByValue(document.forms[0], se.id, '');
+
+			se.style.display = 'inline';
+			se.parentNode.removeChild(se.previousSibling);
+			TinyMCE_EditableSelects.editSelectElm = null;
+		}
+	},
+
+	onKeyDown : function(e) {
+		e = e || window.event;
+
+		if (e.keyCode == 13)
+			TinyMCE_EditableSelects.onBlurEditableSelectInput();
+	}
+};
diff --git a/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/utils/form_utils.js b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/utils/form_utils.js
new file mode 100644
index 0000000..6f62fe6
--- /dev/null
+++ b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/utils/form_utils.js
@@ -0,0 +1,210 @@
+/**
+ * form_utils.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+var themeBaseURL = tinyMCEPopup.editor.baseURI.toAbsolute('themes/' + tinyMCEPopup.getParam("theme"));
+
+function getColorPickerHTML(id, target_form_element) {
+	var h = "", dom = tinyMCEPopup.dom;
+
+	if (label = dom.select('label[for=' + target_form_element + ']')[0]) {
+		label.id = label.id || dom.uniqueId();
+	}
+
+	h += '<a role="button" aria-labelledby="' + id + '_label" id="' + id + '_link" href="javascript:;" onclick="tinyMCEPopup.pickColor(event,\'' + target_form_element +'\');" onmousedown="return false;" class="pickcolor">';
+	h += '<span id="' + id + '" title="' + tinyMCEPopup.getLang('browse') + '">&nbsp;<span id="' + id + '_label" class="mceVoiceLabel mceIconOnly" style="display:none;">' + tinyMCEPopup.getLang('browse') + '</span></span></a>';
+
+	return h;
+}
+
+function updateColor(img_id, form_element_id) {
+	document.getElementById(img_id).style.backgroundColor = document.forms[0].elements[form_element_id].value;
+}
+
+function setBrowserDisabled(id, state) {
+	var img = document.getElementById(id);
+	var lnk = document.getElementById(id + "_link");
+
+	if (lnk) {
+		if (state) {
+			lnk.setAttribute("realhref", lnk.getAttribute("href"));
+			lnk.removeAttribute("href");
+			tinyMCEPopup.dom.addClass(img, 'disabled');
+		} else {
+			if (lnk.getAttribute("realhref"))
+				lnk.setAttribute("href", lnk.getAttribute("realhref"));
+
+			tinyMCEPopup.dom.removeClass(img, 'disabled');
+		}
+	}
+}
+
+function getBrowserHTML(id, target_form_element, type, prefix) {
+	var option = prefix + "_" + type + "_browser_callback", cb, html;
+
+	cb = tinyMCEPopup.getParam(option, tinyMCEPopup.getParam("file_browser_callback"));
+
+	if (!cb)
+		return "";
+
+	html = "";
+	html += '<a id="' + id + '_link" href="javascript:openBrowser(\'' + id + '\',\'' + target_form_element + '\', \'' + type + '\',\'' + option + '\');" onmousedown="return false;" class="browse">';
+	html += '<span id="' + id + '" title="' + tinyMCEPopup.getLang('browse') + '">&nbsp;</span></a>';
+
+	return html;
+}
+
+function openBrowser(img_id, target_form_element, type, option) {
+	var img = document.getElementById(img_id);
+
+	if (img.className != "mceButtonDisabled")
+		tinyMCEPopup.openBrowser(target_form_element, type, option);
+}
+
+function selectByValue(form_obj, field_name, value, add_custom, ignore_case) {
+	if (!form_obj || !form_obj.elements[field_name])
+		return;
+
+	if (!value)
+		value = "";
+
+	var sel = form_obj.elements[field_name];
+
+	var found = false;
+	for (var i=0; i<sel.options.length; i++) {
+		var option = sel.options[i];
+
+		if (option.value == value || (ignore_case && option.value.toLowerCase() == value.toLowerCase())) {
+			option.selected = true;
+			found = true;
+		} else
+			option.selected = false;
+	}
+
+	if (!found && add_custom && value != '') {
+		var option = new Option(value, value);
+		option.selected = true;
+		sel.options[sel.options.length] = option;
+		sel.selectedIndex = sel.options.length - 1;
+	}
+
+	return found;
+}
+
+function getSelectValue(form_obj, field_name) {
+	var elm = form_obj.elements[field_name];
+
+	if (elm == null || elm.options == null || elm.selectedIndex === -1)
+		return "";
+
+	return elm.options[elm.selectedIndex].value;
+}
+
+function addSelectValue(form_obj, field_name, name, value) {
+	var s = form_obj.elements[field_name];
+	var o = new Option(name, value);
+	s.options[s.options.length] = o;
+}
+
+function addClassesToList(list_id, specific_option) {
+	// Setup class droplist
+	var styleSelectElm = document.getElementById(list_id);
+	var styles = tinyMCEPopup.getParam('theme_advanced_styles', false);
+	styles = tinyMCEPopup.getParam(specific_option, styles);
+
+	if (styles) {
+		var stylesAr = styles.split(';');
+
+		for (var i=0; i<stylesAr.length; i++) {
+			if (stylesAr != "") {
+				var key, value;
+
+				key = stylesAr[i].split('=')[0];
+				value = stylesAr[i].split('=')[1];
+
+				styleSelectElm.options[styleSelectElm.length] = new Option(key, value);
+			}
+		}
+	} else {
+		tinymce.each(tinyMCEPopup.editor.dom.getClasses(), function(o) {
+			styleSelectElm.options[styleSelectElm.length] = new Option(o.title || o['class'], o['class']);
+		});
+	}
+}
+
+function isVisible(element_id) {
+	var elm = document.getElementById(element_id);
+
+	return elm && elm.style.display != "none";
+}
+
+function convertRGBToHex(col) {
+	var re = new RegExp("rgb\\s*\\(\\s*([0-9]+).*,\\s*([0-9]+).*,\\s*([0-9]+).*\\)", "gi");
+
+	var rgb = col.replace(re, "$1,$2,$3").split(',');
+	if (rgb.length == 3) {
+		r = parseInt(rgb[0]).toString(16);
+		g = parseInt(rgb[1]).toString(16);
+		b = parseInt(rgb[2]).toString(16);
+
+		r = r.length == 1 ? '0' + r : r;
+		g = g.length == 1 ? '0' + g : g;
+		b = b.length == 1 ? '0' + b : b;
+
+		return "#" + r + g + b;
+	}
+
+	return col;
+}
+
+function convertHexToRGB(col) {
+	if (col.indexOf('#') != -1) {
+		col = col.replace(new RegExp('[^0-9A-F]', 'gi'), '');
+
+		r = parseInt(col.substring(0, 2), 16);
+		g = parseInt(col.substring(2, 4), 16);
+		b = parseInt(col.substring(4, 6), 16);
+
+		return "rgb(" + r + "," + g + "," + b + ")";
+	}
+
+	return col;
+}
+
+function trimSize(size) {
+	return size.replace(/([0-9\.]+)(px|%|in|cm|mm|em|ex|pt|pc)/i, '$1$2');
+}
+
+function getCSSSize(size) {
+	size = trimSize(size);
+
+	if (size == "")
+		return "";
+
+	// Add px
+	if (/^[0-9]+$/.test(size))
+		size += 'px';
+	// Sanity check, IE doesn't like broken values
+	else if (!(/^[0-9\.]+(px|%|in|cm|mm|em|ex|pt|pc)$/i.test(size)))
+		return "";
+
+	return size;
+}
+
+function getStyle(elm, attrib, style) {
+	var val = tinyMCEPopup.dom.getAttrib(elm, attrib);
+
+	if (val != '')
+		return '' + val;
+
+	if (typeof(style) == 'undefined')
+		style = attrib;
+
+	return tinyMCEPopup.dom.getStyle(elm, style);
+}
diff --git a/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/utils/mctabs.js b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/utils/mctabs.js
new file mode 100644
index 0000000..027ef40
--- /dev/null
+++ b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/utils/mctabs.js
@@ -0,0 +1,162 @@
+/**
+ * mctabs.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+function MCTabs() {
+	this.settings = [];
+	this.onChange = tinyMCEPopup.editor.windowManager.createInstance('tinymce.util.Dispatcher');
+};
+
+MCTabs.prototype.init = function(settings) {
+	this.settings = settings;
+};
+
+MCTabs.prototype.getParam = function(name, default_value) {
+	var value = null;
+
+	value = (typeof(this.settings[name]) == "undefined") ? default_value : this.settings[name];
+
+	// Fix bool values
+	if (value == "true" || value == "false")
+		return (value == "true");
+
+	return value;
+};
+
+MCTabs.prototype.showTab =function(tab){
+	tab.className = 'current';
+	tab.setAttribute("aria-selected", true);
+	tab.setAttribute("aria-expanded", true);
+	tab.tabIndex = 0;
+};
+
+MCTabs.prototype.hideTab =function(tab){
+	var t=this;
+
+	tab.className = '';
+	tab.setAttribute("aria-selected", false);
+	tab.setAttribute("aria-expanded", false);
+	tab.tabIndex = -1;
+};
+
+MCTabs.prototype.showPanel = function(panel) {
+	panel.className = 'current'; 
+	panel.setAttribute("aria-hidden", false);
+};
+
+MCTabs.prototype.hidePanel = function(panel) {
+	panel.className = 'panel';
+	panel.setAttribute("aria-hidden", true);
+}; 
+
+MCTabs.prototype.getPanelForTab = function(tabElm) {
+	return tinyMCEPopup.dom.getAttrib(tabElm, "aria-controls");
+};
+
+MCTabs.prototype.displayTab = function(tab_id, panel_id, avoid_focus) {
+	var panelElm, panelContainerElm, tabElm, tabContainerElm, selectionClass, nodes, i, t = this;
+
+	tabElm = document.getElementById(tab_id);
+
+	if (panel_id === undefined) {
+		panel_id = t.getPanelForTab(tabElm);
+	}
+
+	panelElm= document.getElementById(panel_id);
+	panelContainerElm = panelElm ? panelElm.parentNode : null;
+	tabContainerElm = tabElm ? tabElm.parentNode : null;
+	selectionClass = t.getParam('selection_class', 'current');
+
+	if (tabElm && tabContainerElm) {
+		nodes = tabContainerElm.childNodes;
+
+		// Hide all other tabs
+		for (i = 0; i < nodes.length; i++) {
+			if (nodes[i].nodeName == "LI") {
+				t.hideTab(nodes[i]);
+			}
+		}
+
+		// Show selected tab
+		t.showTab(tabElm);
+	}
+
+	if (panelElm && panelContainerElm) {
+		nodes = panelContainerElm.childNodes;
+
+		// Hide all other panels
+		for (i = 0; i < nodes.length; i++) {
+			if (nodes[i].nodeName == "DIV")
+				t.hidePanel(nodes[i]);
+		}
+
+		if (!avoid_focus) { 
+			tabElm.focus();
+		}
+
+		// Show selected panel
+		t.showPanel(panelElm);
+	}
+};
+
+MCTabs.prototype.getAnchor = function() {
+	var pos, url = document.location.href;
+
+	if ((pos = url.lastIndexOf('#')) != -1)
+		return url.substring(pos + 1);
+
+	return "";
+};
+
+
+//Global instance
+var mcTabs = new MCTabs();
+
+tinyMCEPopup.onInit.add(function() {
+	var tinymce = tinyMCEPopup.getWin().tinymce, dom = tinyMCEPopup.dom, each = tinymce.each;
+
+	each(dom.select('div.tabs'), function(tabContainerElm) {
+		var keyNav;
+
+		dom.setAttrib(tabContainerElm, "role", "tablist"); 
+
+		var items = tinyMCEPopup.dom.select('li', tabContainerElm);
+		var action = function(id) {
+			mcTabs.displayTab(id, mcTabs.getPanelForTab(id));
+			mcTabs.onChange.dispatch(id);
+		};
+
+		each(items, function(item) {
+			dom.setAttrib(item, 'role', 'tab');
+			dom.bind(item, 'click', function(evt) {
+				action(item.id);
+			});
+		});
+
+		dom.bind(dom.getRoot(), 'keydown', function(evt) {
+			if (evt.keyCode === 9 && evt.ctrlKey && !evt.altKey) { // Tab
+				keyNav.moveFocus(evt.shiftKey ? -1 : 1);
+				tinymce.dom.Event.cancel(evt);
+			}
+		});
+
+		each(dom.select('a', tabContainerElm), function(a) {
+			dom.setAttrib(a, 'tabindex', '-1');
+		});
+
+		keyNav = tinyMCEPopup.editor.windowManager.createInstance('tinymce.ui.KeyboardNavigation', {
+			root: tabContainerElm,
+			items: items,
+			onAction: action,
+			actOnFocus: true,
+			enableLeftRight: true,
+			enableUpDown: true
+		}, tinyMCEPopup.dom);
+	});
+});
\ No newline at end of file
diff --git a/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/utils/validate.js b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/utils/validate.js
new file mode 100644
index 0000000..760d029
--- /dev/null
+++ b/data/treeio/treeio/static/js/tinymce/jscripts/tiny_mce/utils/validate.js
@@ -0,0 +1,252 @@
+/**
+ * validate.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+/**
+	// String validation:
+
+	if (!Validator.isEmail('myemail'))
+		alert('Invalid email.');
+
+	// Form validation:
+
+	var f = document.forms['myform'];
+
+	if (!Validator.isEmail(f.myemail))
+		alert('Invalid email.');
+*/
+
+var Validator = {
+	isEmail : function(s) {
+		return this.test(s, '^[-!#$%&\'*+\\./0-9=?A-Z^_`a-z{|}~]+@[-!#$%&\'*+\\/0-9=?A-Z^_`a-z{|}~]+\.[-!#$%&\'*+\\./0-9=?A-Z^_`a-z{|}~]+$');
+	},
+
+	isAbsUrl : function(s) {
+		return this.test(s, '^(news|telnet|nttp|file|http|ftp|https)://[-A-Za-z0-9\\.]+\\/?.*$');
+	},
+
+	isSize : function(s) {
+		return this.test(s, '^[0-9.]+(%|in|cm|mm|em|ex|pt|pc|px)?$');
+	},
+
+	isId : function(s) {
+		return this.test(s, '^[A-Za-z_]([A-Za-z0-9_])*$');
+	},
+
+	isEmpty : function(s) {
+		var nl, i;
+
+		if (s.nodeName == 'SELECT' && s.selectedIndex < 1)
+			return true;
+
+		if (s.type == 'checkbox' && !s.checked)
+			return true;
+
+		if (s.type == 'radio') {
+			for (i=0, nl = s.form.elements; i<nl.length; i++) {
+				if (nl[i].type == "radio" && nl[i].name == s.name && nl[i].checked)
+					return false;
+			}
+
+			return true;
+		}
+
+		return new RegExp('^\\s*$').test(s.nodeType == 1 ? s.value : s);
+	},
+
+	isNumber : function(s, d) {
+		return !isNaN(s.nodeType == 1 ? s.value : s) && (!d || !this.test(s, '^-?[0-9]*\\.[0-9]*$'));
+	},
+
+	test : function(s, p) {
+		s = s.nodeType == 1 ? s.value : s;
+
+		return s == '' || new RegExp(p).test(s);
+	}
+};
+
+var AutoValidator = {
+	settings : {
+		id_cls : 'id',
+		int_cls : 'int',
+		url_cls : 'url',
+		number_cls : 'number',
+		email_cls : 'email',
+		size_cls : 'size',
+		required_cls : 'required',
+		invalid_cls : 'invalid',
+		min_cls : 'min',
+		max_cls : 'max'
+	},
+
+	init : function(s) {
+		var n;
+
+		for (n in s)
+			this.settings[n] = s[n];
+	},
+
+	validate : function(f) {
+		var i, nl, s = this.settings, c = 0;
+
+		nl = this.tags(f, 'label');
+		for (i=0; i<nl.length; i++) {
+			this.removeClass(nl[i], s.invalid_cls);
+			nl[i].setAttribute('aria-invalid', false);
+		}
+
+		c += this.validateElms(f, 'input');
+		c += this.validateElms(f, 'select');
+		c += this.validateElms(f, 'textarea');
+
+		return c == 3;
+	},
+
+	invalidate : function(n) {
+		this.mark(n.form, n);
+	},
+	
+	getErrorMessages : function(f) {
+		var nl, i, s = this.settings, field, msg, values, messages = [], ed = tinyMCEPopup.editor;
+		nl = this.tags(f, "label");
+		for (i=0; i<nl.length; i++) {
+			if (this.hasClass(nl[i], s.invalid_cls)) {
+				field = document.getElementById(nl[i].getAttribute("for"));
+				values = { field: nl[i].textContent };
+				if (this.hasClass(field, s.min_cls, true)) {
+					message = ed.getLang('invalid_data_min');
+					values.min = this.getNum(field, s.min_cls);
+				} else if (this.hasClass(field, s.number_cls)) {
+					message = ed.getLang('invalid_data_number');
+				} else if (this.hasClass(field, s.size_cls)) {
+					message = ed.getLang('invalid_data_size');
+				} else {
+					message = ed.getLang('invalid_data');
+				}
+				
+				message = message.replace(/{\#([^}]+)\}/g, function(a, b) {
+					return values[b] || '{#' + b + '}';
+				});
+				messages.push(message);
+			}
+		}
+		return messages;
+	},
+
+	reset : function(e) {
+		var t = ['label', 'input', 'select', 'textarea'];
+		var i, j, nl, s = this.settings;
+
+		if (e == null)
+			return;
+
+		for (i=0; i<t.length; i++) {
+			nl = this.tags(e.form ? e.form : e, t[i]);
+			for (j=0; j<nl.length; j++) {
+				this.removeClass(nl[j], s.invalid_cls);
+				nl[j].setAttribute('aria-invalid', false);
+			}
+		}
+	},
+
+	validateElms : function(f, e) {
+		var nl, i, n, s = this.settings, st = true, va = Validator, v;
+
+		nl = this.tags(f, e);
+		for (i=0; i<nl.length; i++) {
+			n = nl[i];
+
+			this.removeClass(n, s.invalid_cls);
+
+			if (this.hasClass(n, s.required_cls) && va.isEmpty(n))
+				st = this.mark(f, n);
+
+			if (this.hasClass(n, s.number_cls) && !va.isNumber(n))
+				st = this.mark(f, n);
+
+			if (this.hasClass(n, s.int_cls) && !va.isNumber(n, true))
+				st = this.mark(f, n);
+
+			if (this.hasClass(n, s.url_cls) && !va.isAbsUrl(n))
+				st = this.mark(f, n);
+
+			if (this.hasClass(n, s.email_cls) && !va.isEmail(n))
+				st = this.mark(f, n);
+
+			if (this.hasClass(n, s.size_cls) && !va.isSize(n))
+				st = this.mark(f, n);
+
+			if (this.hasClass(n, s.id_cls) && !va.isId(n))
+				st = this.mark(f, n);
+
+			if (this.hasClass(n, s.min_cls, true)) {
+				v = this.getNum(n, s.min_cls);
+
+				if (isNaN(v) || parseInt(n.value) < parseInt(v))
+					st = this.mark(f, n);
+			}
+
+			if (this.hasClass(n, s.max_cls, true)) {
+				v = this.getNum(n, s.max_cls);
+
+				if (isNaN(v) || parseInt(n.value) > parseInt(v))
+					st = this.mark(f, n);
+			}
+		}
+
+		return st;
+	},
+
+	hasClass : function(n, c, d) {
+		return new RegExp('\\b' + c + (d ? '[0-9]+' : '') + '\\b', 'g').test(n.className);
+	},
+
+	getNum : function(n, c) {
+		c = n.className.match(new RegExp('\\b' + c + '([0-9]+)\\b', 'g'))[0];
+		c = c.replace(/[^0-9]/g, '');
+
+		return c;
+	},
+
+	addClass : function(n, c, b) {
+		var o = this.removeClass(n, c);
+		n.className = b ? c + (o != '' ? (' ' + o) : '') : (o != '' ? (o + ' ') : '') + c;
+	},
+
+	removeClass : function(n, c) {
+		c = n.className.replace(new RegExp("(^|\\s+)" + c + "(\\s+|$)"), ' ');
+		return n.className = c != ' ' ? c : '';
+	},
+
+	tags : function(f, s) {
+		return f.getElementsByTagName(s);
+	},
+
+	mark : function(f, n) {
+		var s = this.settings;
+
+		this.addClass(n, s.invalid_cls);
+		n.setAttribute('aria-invalid', 'true');
+		this.markLabels(f, n, s.invalid_cls);
+
+		return false;
+	},
+
+	markLabels : function(f, n, ic) {
+		var nl, i;
+
+		nl = this.tags(f, "label");
+		for (i=0; i<nl.length; i++) {
+			if (nl[i].getAttribute("for") == n.id || nl[i].htmlFor == n.id)
+				this.addClass(nl[i], ic);
+		}
+
+		return null;
+	}
+};
diff --git a/data/treeio/treeio/static/mobile/jquery.mobile.forms.ajaxform.js b/data/treeio/treeio/static/mobile/jquery.mobile.forms.ajaxform.js
new file mode 100644
index 0000000..18ea29f
--- /dev/null
+++ b/data/treeio/treeio/static/mobile/jquery.mobile.forms.ajaxform.js
@@ -0,0 +1,68 @@
+/*
+* jQuery Mobile Framework : "ajaxform" plugin
+* Copyright (c) jQuery Project
+* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
+* Note: Code is in draft form and is subject to change 
+*/  
+(function($){
+
+//ajax response callbacks
+$.formhandlers = {
+	'default' : function(data,type){
+		return $(data).find('[data-role="content"]:eq(0)');
+	}
+};
+
+function getBaseURL(){
+    var newBaseURL = location.hash.replace(/#/,'').split('/');
+	if(newBaseURL.length && /[.|&]/.test(newBaseURL[newBaseURL.length-1]) ){
+		newBaseURL.pop();	
+	}
+	newBaseURL = newBaseURL.join('/');
+	if(newBaseURL !== "" && newBaseURL.charAt(newBaseURL.length-1) !== '/'){  newBaseURL += '/'; }
+	return newBaseURL;
+}
+
+$.fn.ajaxform = function(options){
+	return $(this).each(function(){	
+		$this = $(this);
+	
+		//extendable options
+		var o = $.extend({
+			submitEvents: '',
+			method: $this.attr('method'),
+			action: getBaseURL()+$this.attr('action'),
+			injectResponse: true,//should be data-attr driven
+			dataFilter: $.formhandlers['default'], //should be data-attr driven 
+			theme: $this.data('theme') || 'b'
+		}, options);
+				
+		$this.addClass('ui-autoform ui-bar-'+o.theme);
+		
+		$this.bind(o.submitEvents, function(){
+			$(this).submit();
+		});
+		
+		$this.submit(function(){
+			$.pageLoading();
+			$.ajax({
+				url: o.action,
+				type: o.method,
+				data: $(this).serialize(),
+				dataFilter: o.dataFilter,
+				success: function(data,textStatus){
+					$('.ui-page-active .ui-content').replaceWith( data );
+					$('.ui-page-active [data-role="content"]').page();
+					$.pageLoading(true);
+				}
+			});
+			return false;
+		});
+	});
+};
+
+
+
+
+})(jQuery);
+	
diff --git a/data/treeio/treeio/static/mobile/jquery.mobile.scrollview.js b/data/treeio/treeio/static/mobile/jquery.mobile.scrollview.js
new file mode 100644
index 0000000..7f1b381
--- /dev/null
+++ b/data/treeio/treeio/static/mobile/jquery.mobile.scrollview.js
@@ -0,0 +1,803 @@
+/*
+* jQuery Mobile Framework : scrollview plugin
+* Copyright (c) 2010 Adobe Systems Incorporated - Kin Blas (jblas@adobe.com)
+* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
+* Note: Code is in draft form and is subject to change 
+*/
+(function($,window,document,undefined){
+
+jQuery.widget( "mobile.scrollview", jQuery.mobile.widget, {
+	options: {
+		fps:               60,    // Frames per second in msecs.
+		direction:         null,  // "x", "y", or null for both.
+	
+		scrollDuration:    2000,  // Duration of the scrolling animation in msecs.
+		overshootDuration: 250,   // Duration of the overshoot animation in msecs.
+		snapbackDuration:  500,   // Duration of the snapback animation in msecs.
+	
+		moveThreshold:     10,   // User must move this many pixels in any direction to trigger a scroll.
+		moveIntervalThreshold:     150,   // Time between mousemoves must not exceed this threshold.
+	
+		scrollMethod:      "translate",  // "translate", "position", "scroll"
+	
+		startEventName:    "scrollstart",
+		updateEventName:   "scrollupdate",
+		stopEventName:     "scrollstop",
+	
+		eventType:         $.support.touch ? "touch" : "mouse",
+	
+		showScrollBars:    true,
+		
+		pagingEnabled:     false,
+		delayedClickSelector: "a,input,textarea,select,button,.ui-btn",
+		delayedClickEnabled: true
+	},
+
+	_makePositioned: function($ele)
+	{
+		if ($ele.css("position") == "static")
+			$ele.css("position", "relative");
+	},
+
+	_create: function()
+	{ 
+		this._$clip = $(this.element).addClass("ui-scrollview-clip");
+		var $child = this._$clip.children();
+		if ($child.length > 1) {
+			$child = this._$clip.wrapInner("<div></div>").children();
+		}
+		this._$view = $child.addClass("ui-scrollview-view");
+
+		this._$clip.css("overflow", this.options.scrollMethod === "scroll" ? "scroll" : "hidden");
+		this._makePositioned(this._$clip);
+
+		this._$view.css("overflow", "hidden");
+
+		// Turn off our faux scrollbars if we are using native scrolling
+		// to position the view.
+
+		this.options.showScrollBars = this.options.scrollMethod === "scroll" ? false : this.options.showScrollBars;
+
+		// We really don't need this if we are using a translate transformation
+		// for scrolling. We set it just in case the user wants to switch methods
+		// on the fly.
+
+		this._makePositioned(this._$view);
+		this._$view.css({ left: 0, top: 0 });
+
+		this._sx = 0;
+		this._sy = 0;
+	
+		var direction = this.options.direction;
+		this._hTracker = (direction !== "y")   ? new MomentumTracker(this.options) : null;
+		this._vTracker = (direction !== "x") ? new MomentumTracker(this.options) : null;
+	
+		this._timerInterval = 1000/this.options.fps;
+		this._timerID = 0;
+	
+		var self = this;
+		this._timerCB = function(){ self._handleMomentumScroll(); };
+	
+		this._addBehaviors();
+	},
+
+	_startMScroll: function(speedX, speedY)
+	{
+		this._stopMScroll();
+		this._showScrollBars();
+
+		var keepGoing = false;
+		var duration = this.options.scrollDuration;
+
+		this._$clip.trigger(this.options.startEventName);
+
+		var ht = this._hTracker;
+		if (ht)
+		{
+			var c = this._$clip.width();
+			var v = this._$view.width();
+			ht.start(this._sx, speedX, duration, (v > c) ? -(v - c) : 0, 0);
+			keepGoing = !ht.done();
+		}
+
+		var vt = this._vTracker;
+		if (vt)
+		{
+			var c = this._$clip.height();
+			var v = this._$view.height();
+			vt.start(this._sy, speedY, duration, (v > c) ? -(v - c) : 0, 0);
+			keepGoing = keepGoing || !vt.done();
+		}
+
+		if (keepGoing)
+			this._timerID = setTimeout(this._timerCB, this._timerInterval);
+		else
+			this._stopMScroll();
+	},
+
+	_stopMScroll: function()
+	{
+		if (this._timerID)
+		{
+			this._$clip.trigger(this.options.stopEventName);
+			clearTimeout(this._timerID);
+		}
+		this._timerID = 0;
+
+		if (this._vTracker)
+			this._vTracker.reset();
+
+		if (this._hTracker)
+			this._hTracker.reset();
+
+		this._hideScrollBars();
+	},
+
+	_handleMomentumScroll: function()
+	{
+		var keepGoing = false;
+		var v = this._$view;
+
+		var x = 0, y = 0;
+
+		var vt = this._vTracker;
+		if (vt)
+		{
+			vt.update();
+			y = vt.getPosition();
+			keepGoing = !vt.done();
+		}
+
+		var ht = this._hTracker;
+		if (ht)
+		{
+			ht.update();
+			x = ht.getPosition();
+			keepGoing = keepGoing || !ht.done();
+		}
+
+		this._setScrollPosition(x, y);
+		this._$clip.trigger(this.options.updateEventName, { x: x, y: y });
+
+		if (keepGoing)
+			this._timerID = setTimeout(this._timerCB, this._timerInterval);	
+		else
+			this._stopMScroll();
+	},
+
+	_setScrollPosition: function(x, y)
+	{
+		this._sx = x;
+		this._sy = y;
+
+		var $v = this._$view;
+
+		var sm = this.options.scrollMethod;
+
+		switch (sm)
+		{
+			case "translate":
+				setElementTransform($v, x + "px", y + "px");
+				break;
+			case "position":
+				$v.css({left: x + "px", top: y + "px"});
+				break;
+			case "scroll":
+				var c = this._$clip[0];
+				c.scrollLeft = -x;
+				c.scrollTop = -y;
+				break;
+		}
+
+		var $vsb = this._$vScrollBar;
+		var $hsb = this._$hScrollBar;
+
+		if ($vsb)
+		{
+			var $sbt = $vsb.find(".ui-scrollbar-thumb");
+			if (sm === "translate")
+				setElementTransform($sbt, "0px", -y/$v.height() * $sbt.parent().height() + "px");
+			else
+				$sbt.css("top", -y/$v.height()*100 + "%");
+		}
+
+		if ($hsb)
+		{
+			var $sbt = $hsb.find(".ui-scrollbar-thumb");
+			if (sm === "translate")
+				setElementTransform($sbt,  -x/$v.width() * $sbt.parent().width() + "px", "0px");
+			else
+				$sbt.css("left", -x/$v.width()*100 + "%");
+		}
+	},
+
+	scrollTo: function(x, y, duration)
+	{
+		this._stopMScroll();
+		if (!duration)
+			return this._setScrollPosition(x, y);
+
+		x = -x;
+		y = -y;
+
+		var self = this;
+		var start = getCurrentTime();
+		var efunc = $.easing["easeOutQuad"];
+		var sx = this._sx;
+		var sy = this._sy;
+		var dx = x - sx;
+		var dy = y - sy;
+		var tfunc = function(){
+			var elapsed = getCurrentTime() - start;
+			if (elapsed >= duration)
+			{
+				self._timerID = 0;
+				self._setScrollPosition(x, y);
+			}
+			else
+			{
+				var ec = efunc(elapsed/duration, elapsed, 0, 1, duration);
+				self._setScrollPosition(sx + (dx * ec), sy + (dy * ec));
+				self._timerID = setTimeout(tfunc, self._timerInterval);
+			}
+		};
+
+		this._timerID = setTimeout(tfunc, this._timerInterval);
+	},
+
+	getScrollPosition: function()
+	{
+		return { x: -this._sx, y: -this._sy };
+	},
+
+	_getScrollHierarchy: function()
+	{
+		var svh = [];
+		this._$clip.parents(".ui-scrollview-clip").each(function(){
+			var d = $(this).data("scrollview");
+			if (d) svh.unshift(d);
+		});
+		return svh;
+	},
+
+	_getAncestorByDirection: function(dir)
+	{
+		var svh = this._getScrollHierarchy();
+		var n = svh.length;
+		while (0 < n--)
+		{
+			var sv = svh[n];
+			var svdir = sv.options.direction;
+
+			if (!svdir || svdir == dir)
+				return sv;
+		}
+		return null;
+	},
+
+	_handleDragStart: function(e, ex, ey)
+	{
+		// Stop any scrolling of elements in our parent hierarcy.
+		$.each(this._getScrollHierarchy(),function(i,sv){ sv._stopMScroll(); });
+		this._stopMScroll();
+
+		var c = this._$clip;
+		var v = this._$view;
+
+		if (this.options.delayedClickEnabled) {
+			this._$clickEle = $(e.target).closest(this.options.delayedClickSelector);
+		}
+		this._lastX = ex;
+		this._lastY = ey;
+		this._doSnapBackX = false;
+		this._doSnapBackY = false;
+		this._speedX = 0;
+		this._speedY = 0;
+		this._directionLock = "";
+		this._didDrag = false;
+
+		if (this._hTracker)
+		{
+			var cw = parseInt(c.css("width"), 10);
+			var vw = parseInt(v.css("width"), 10);
+			this._maxX = cw - vw;
+			if (this._maxX > 0) this._maxX = 0;
+			if (this._$hScrollBar)
+				this._$hScrollBar.find(".ui-scrollbar-thumb").css("width", (cw >= vw ? "100%" : Math.floor(cw/vw*100)+ "%"));
+		}
+
+		if (this._vTracker)
+		{
+			var ch = parseInt(c.css("height"), 10);
+			var vh = parseInt(v.css("height"), 10);
+			this._maxY = ch - vh;
+			if (this._maxY > 0) this._maxY = 0;
+			if (this._$vScrollBar)
+				this._$vScrollBar.find(".ui-scrollbar-thumb").css("height", (ch >= vh ? "100%" : Math.floor(ch/vh*100)+ "%"));
+		}
+
+		var svdir = this.options.direction;
+
+		this._pageDelta = 0;
+		this._pageSize = 0;
+		this._pagePos = 0; 
+
+		if (this.options.pagingEnabled && (svdir === "x" || svdir === "y"))
+		{
+			this._pageSize = svdir === "x" ? cw : ch;
+			this._pagePos = svdir === "x" ? this._sx : this._sy;
+			this._pagePos -= this._pagePos % this._pageSize;
+		}
+		this._lastMove = 0;
+		this._enableTracking();
+
+		// If we're using mouse events, we need to prevent the default
+		// behavior to suppress accidental selection of text, etc. We
+		// can't do this on touch devices because it will disable the
+		// generation of "click" events.
+		//
+		// XXX: We should test if this has an effect on links! - kin
+
+		if (this.options.eventType == "mouse" || this.options.delayedClickEnabled)
+			e.preventDefault();
+		e.stopPropagation();
+	},
+
+	_propagateDragMove: function(sv, e, ex, ey, dir)
+	{
+		this._hideScrollBars();
+		this._disableTracking();
+		sv._handleDragStart(e,ex,ey);
+		sv._directionLock = dir;
+		sv._didDrag = this._didDrag;
+	},
+
+	_handleDragMove: function(e, ex, ey)
+	{
+		this._lastMove = getCurrentTime();
+
+		var v = this._$view;
+
+		var dx = ex - this._lastX;
+		var dy = ey - this._lastY;
+		var svdir = this.options.direction;
+
+		if (!this._directionLock)
+		{
+			var x = Math.abs(dx);
+			var y = Math.abs(dy);
+			var mt = this.options.moveThreshold;
+
+			if (x < mt && y < mt) {
+				return false;
+			}
+
+			var dir = null;
+			var r = 0;
+			if (x < y && (x/y) < 0.5) {
+				dir = "y";
+			}
+			else if (x > y && (y/x) < 0.5) {
+				dir = "x";
+			}
+
+			if (svdir && dir && svdir != dir)
+			{
+				// This scrollview can't handle the direction the user
+				// is attempting to scroll. Find an ancestor scrollview
+				// that can handle the request.
+
+				var sv = this._getAncestorByDirection(dir);
+				if (sv)
+				{
+					this._propagateDragMove(sv, e, ex, ey, dir);
+					return false;
+				}
+			}
+
+			this._directionLock = svdir ? svdir : (dir ? dir : "none");
+		}
+
+		var newX = this._sx;
+		var newY = this._sy;
+
+		if (this._directionLock !== "y" && this._hTracker)
+		{
+			var x = this._sx;
+			this._speedX = dx;
+			newX = x + dx;
+
+			// Simulate resistance.
+
+			this._doSnapBackX = false;
+			if (newX > 0 || newX < this._maxX)
+			{
+				if (this._directionLock === "x")
+				{
+					var sv = this._getAncestorByDirection("x");
+					if (sv)
+					{
+						this._setScrollPosition(newX > 0 ? 0 : this._maxX, newY);
+						this._propagateDragMove(sv, e, ex, ey, dir);
+						return false;
+					}
+				}
+				newX = x + (dx/2);
+				this._doSnapBackX = true;
+			}
+		}
+
+		if (this._directionLock !== "x" && this._vTracker)
+		{
+			var y = this._sy;
+			this._speedY = dy;
+			newY = y + dy;
+
+			// Simulate resistance.
+
+			this._doSnapBackY = false;
+			if (newY > 0 || newY < this._maxY)
+			{
+				if (this._directionLock === "y")
+				{
+					var sv = this._getAncestorByDirection("y");
+					if (sv)
+					{
+						this._setScrollPosition(newX, newY > 0 ? 0 : this._maxY);
+						this._propagateDragMove(sv, e, ex, ey, dir);
+						return false;
+					}
+				}
+
+				newY = y + (dy/2);
+				this._doSnapBackY = true;
+			}
+
+		}
+
+		if (this.options.pagingEnabled && (svdir === "x" || svdir === "y"))
+		{
+			if (this._doSnapBackX || this._doSnapBackY)
+				this._pageDelta = 0;
+			else
+			{
+				var opos = this._pagePos;
+				var cpos = svdir === "x" ? newX : newY;
+				var delta = svdir === "x" ? dx : dy;
+
+				this._pageDelta = (opos > cpos && delta < 0) ? this._pageSize : ((opos < cpos && delta > 0) ? -this._pageSize : 0);
+			}
+		}
+
+		this._didDrag = true;
+		this._lastX = ex;
+		this._lastY = ey;
+
+		this._setScrollPosition(newX, newY);
+
+		this._showScrollBars();
+
+		// Call preventDefault() to prevent touch devices from
+		// scrolling the main window.
+
+		// e.preventDefault();
+		
+		return false;
+	},
+
+	_handleDragStop: function(e)
+	{
+		var l = this._lastMove;
+		var t = getCurrentTime();
+		var doScroll = l && (t - l) <= this.options.moveIntervalThreshold;
+
+		var sx = (this._hTracker && this._speedX && doScroll) ? this._speedX : (this._doSnapBackX ? 1 : 0);
+		var sy = (this._vTracker && this._speedY && doScroll) ? this._speedY : (this._doSnapBackY ? 1 : 0);
+
+		var svdir = this.options.direction;
+		if (this.options.pagingEnabled && (svdir === "x" || svdir === "y") && !this._doSnapBackX && !this._doSnapBackY)
+		{
+			var x = this._sx;
+			var y = this._sy;
+			if (svdir === "x")
+				x = -this._pagePos + this._pageDelta;
+			else
+				y = -this._pagePos + this._pageDelta;
+
+			this.scrollTo(x, y, this.options.snapbackDuration);
+		}
+		else if (sx || sy)
+			this._startMScroll(sx, sy);
+		else
+			this._hideScrollBars();
+
+		this._disableTracking();
+
+		if (!this._didDrag && this.options.delayedClickEnabled && this._$clickEle.length) {
+			this._$clickEle
+				.trigger("mousedown")
+				//.trigger("focus")
+				.trigger("mouseup")
+				.trigger("click");
+		}
+
+		// If a view scrolled, then we need to absorb
+		// the event so that links etc, underneath our
+		// cursor/finger don't fire.
+
+		return this._didDrag ? false : undefined;
+	},
+
+	_enableTracking: function()
+	{
+		$(document).bind(this._dragMoveEvt, this._dragMoveCB);
+		$(document).bind(this._dragStopEvt, this._dragStopCB);
+	},
+
+	_disableTracking: function()
+	{
+		$(document).unbind(this._dragMoveEvt, this._dragMoveCB);
+		$(document).unbind(this._dragStopEvt, this._dragStopCB);
+	},
+
+	_showScrollBars: function()
+	{
+		var vclass = "ui-scrollbar-visible";
+		if (this._$vScrollBar) this._$vScrollBar.addClass(vclass);
+		if (this._$hScrollBar) this._$hScrollBar.addClass(vclass);
+	},
+
+	_hideScrollBars: function()
+	{
+		var vclass = "ui-scrollbar-visible";
+		if (this._$vScrollBar) this._$vScrollBar.removeClass(vclass);
+		if (this._$hScrollBar) this._$hScrollBar.removeClass(vclass);
+	},
+
+	_addBehaviors: function()
+	{
+		var self = this;
+		if (this.options.eventType === "mouse")
+		{
+			this._dragStartEvt = "mousedown";
+			this._dragStartCB = function(e){ return self._handleDragStart(e, e.clientX, e.clientY); };
+
+			this._dragMoveEvt = "mousemove";
+			this._dragMoveCB = function(e){ return self._handleDragMove(e, e.clientX, e.clientY); };
+
+			this._dragStopEvt = "mouseup";
+			this._dragStopCB = function(e){ return self._handleDragStop(e); };
+		}
+		else // "touch"
+		{
+			this._dragStartEvt = "touchstart";
+			this._dragStartCB = function(e)
+			{
+				var t = e.originalEvent.targetTouches[0];
+				return self._handleDragStart(e, t.pageX, t.pageY);
+			};
+
+			this._dragMoveEvt = "touchmove";
+			this._dragMoveCB = function(e)
+			{
+				var t = e.originalEvent.targetTouches[0];
+				return self._handleDragMove(e, t.pageX, t.pageY);
+			};
+
+			this._dragStopEvt = "touchend";
+			this._dragStopCB = function(e){ return self._handleDragStop(e); };
+		}
+
+		this._$view.bind(this._dragStartEvt, this._dragStartCB);
+
+		if (this.options.showScrollBars)
+		{
+			var $c = this._$clip;
+			var prefix = "<div class=\"ui-scrollbar ui-scrollbar-";
+			var suffix = "\"><div class=\"ui-scrollbar-track\"><div class=\"ui-scrollbar-thumb\"></div></div></div>";
+			if (this._vTracker)
+			{
+				$c.append(prefix + "y" + suffix);
+				this._$vScrollBar = $c.children(".ui-scrollbar-y");
+			}
+			if (this._hTracker)
+			{
+				$c.append(prefix + "x" + suffix);
+				this._$hScrollBar = $c.children(".ui-scrollbar-x");
+			}
+		}
+	}
+});
+
+function setElementTransform($ele, x, y)
+{
+	var v = "translate3d(" + x + "," + y + ", 0px)";
+	$ele.css({
+		"-moz-transform": v,
+		"-webkit-transform": v,
+		"transform": v
+	});
+}
+
+
+function MomentumTracker(options)
+{
+	this.options = $.extend({}, options);
+	this.easing = "easeOutQuad";
+	this.reset();
+}
+
+var tstates = {
+	scrolling: 0,
+	overshot:  1,
+	snapback:  2,
+	done:      3
+};
+
+function getCurrentTime() { return (new Date()).getTime(); }
+
+$.extend(MomentumTracker.prototype, {
+	start: function(pos, speed, duration, minPos, maxPos)
+	{
+		this.state = (speed != 0) ? ((pos < minPos || pos > maxPos) ? tstates.snapback : tstates.scrolling) : tstates.done;
+		this.pos = pos;
+		this.speed = speed;
+		this.duration = (this.state == tstates.snapback) ? this.options.snapbackDuration : duration;
+		this.minPos = minPos;
+		this.maxPos = maxPos;
+
+		this.fromPos = (this.state == tstates.snapback) ? this.pos : 0;
+		this.toPos = (this.state == tstates.snapback) ? ((this.pos < this.minPos) ? this.minPos : this.maxPos) : 0;
+
+		this.startTime = getCurrentTime();
+	},
+
+	reset: function()
+	{
+		this.state = tstates.done;
+		this.pos = 0;
+		this.speed = 0;
+		this.minPos = 0;
+		this.maxPos = 0;
+		this.duration = 0;
+	},
+
+	update: function()
+	{
+		var state = this.state;
+		if (state == tstates.done)
+			return this.pos;
+
+		var duration = this.duration;
+		var elapsed = getCurrentTime() - this.startTime;
+		elapsed = elapsed > duration ? duration : elapsed;
+
+		if (state == tstates.scrolling || state == tstates.overshot)
+		{
+			var dx = this.speed * (1 - $.easing[this.easing](elapsed/duration, elapsed, 0, 1, duration));
+	
+			var x = this.pos + dx;
+	
+			var didOverShoot = (state == tstates.scrolling) && (x < this.minPos || x > this.maxPos);
+			if (didOverShoot)
+				x = (x < this.minPos) ? this.minPos : this.maxPos;
+		
+			this.pos = x;
+	
+			if (state == tstates.overshot)
+			{
+				if (elapsed >= duration)
+				{
+					this.state = tstates.snapback;
+					this.fromPos = this.pos;
+					this.toPos = (x < this.minPos) ? this.minPos : this.maxPos;
+					this.duration = this.options.snapbackDuration;
+					this.startTime = getCurrentTime();
+					elapsed = 0;
+				}
+			}
+			else if (state == tstates.scrolling)
+			{
+				if (didOverShoot)
+				{
+					this.state = tstates.overshot;
+					this.speed = dx / 2;
+					this.duration = this.options.overshootDuration;
+					this.startTime = getCurrentTime();
+				}
+				else if (elapsed >= duration)
+					this.state = tstates.done;
+			}
+		}
+		else if (state == tstates.snapback)
+		{
+			if (elapsed >= duration)
+			{
+				this.pos = this.toPos;
+				this.state = tstates.done;		
+			}
+			else
+				this.pos = this.fromPos + ((this.toPos - this.fromPos) * $.easing[this.easing](elapsed/duration, elapsed, 0, 1, duration));
+		}
+
+		return this.pos;
+	},
+
+	done: function() { return this.state == tstates.done; },
+	getPosition: function(){ return this.pos; }
+});
+
+jQuery.widget( "mobile.scrolllistview", jQuery.mobile.scrollview, {
+	options: {
+		direction: "y"
+	},
+
+	_create: function() {
+		$.mobile.scrollview.prototype._create.call(this);
+	
+		// Cache the dividers so we don't have to search for them everytime the
+		// view is scrolled.
+		//
+		// XXX: Note that we need to update this cache if we ever support lists
+		//      that can dynamically update their content.
+	
+		this._$dividers = this._$view.find("[data-role=list-divider]");
+		this._lastDivider = null;
+	},
+
+	_setScrollPosition: function(x, y)
+	{
+		// Let the view scroll like it normally does.
+	
+		$.mobile.scrollview.prototype._setScrollPosition.call(this, x, y);
+
+		y = -y;
+
+		// Find the dividers for the list.
+
+		var $divs = this._$dividers;
+		var cnt = $divs.length;
+		var d = null;
+		var dy = 0;
+		var nd = null;
+
+		for (var i = 0; i < cnt; i++)
+		{
+			nd = $divs.get(i);
+			var t = nd.offsetTop;
+			if (y >= t)
+			{
+				d = nd;
+				dy = t;
+			}
+			else if (d)
+				break;
+		}
+
+		// If we found a divider to move position it at the top of the
+		// clip view.
+
+		if (d)
+		{
+			var h = d.offsetHeight;
+			var mxy = (d != nd) ? nd.offsetTop : (this._$view.get(0).offsetHeight);
+			if (y + h >= mxy)
+				y = (mxy - h) - dy;
+			else
+				y = y - dy;
+
+			// XXX: Need to convert this over to using $().css() and supporting the non-transform case.
+
+			var ld = this._lastDivider;
+			if (ld && d != ld) {
+				setElementTransform($(ld), 0, 0);
+			}
+			setElementTransform($(d), 0, y + "px");
+			this._lastDivider = d;
+
+		}
+	}
+});
+
+})(jQuery,window,document); // End Component
+
diff --git a/data/treeio/treeio/templates/html/core/administration/settings_view.html b/data/treeio/treeio/templates/html/core/administration/settings_view.html
new file mode 100644
index 0000000..d5effbb
--- /dev/null
+++ b/data/treeio/treeio/templates/html/core/administration/settings_view.html
@@ -0,0 +1,50 @@
+{% load i18n %}
+{% extends "html/core/page.html" %}
+
+{% block title %}{% trans %}Settings{% endtrans %} | {% trans %}Administration{% endtrans %}{% endblock %}
+
+{% block class_settings %}sidebar-link-active{% endblock %}
+
+{% block module_title %}{% trans %}Settings{% endtrans %}{% endblock %}
+
+{% block module_topmenu %}
+<a href="{% url core_settings_view %}" class="top-menu view-link-active">{% trans %}View{% endtrans %}</a>
+<a href="{% url core_settings_edit %}" class="top-menu edit-link">{% trans %}Edit{% endtrans %}</a>
+{% endblock %}
+
+{% block module_content %}
+
+<div>
+    <span class="content-label">{% trans %}Default Perspective{% endtrans %}:</span>
+    <span class="content-value">
+        {% if default_perspective %}
+        <a href="{% url core_admin_perspective_view default_perspective.id %}">{{ default_perspective }}</a>
+        {% endif %}
+    </span>
+</div><div>
+    <span class="content-label">{% trans %}Default Permissions{% endtrans %}:</span>
+    <span class="content-value">
+        {{ default_permissions_display }}
+    </span>
+</div>
+<div>
+    <span class="content-label">{% trans %}Language{% endtrans %}:</span>
+    <span class="content-value">
+        {% for code, name in all_languages %}
+        {% if code == language %}{{ name }}{% endif %}
+        {% endfor %}
+    </span>
+</div>
+<div>
+    <span class="content-label">{% trans %}Default Time Zone{% endtrans %}:</span>
+    <span class="content-value">
+        {% for zone, title in all_timezones %}
+        {% if zone == default_timezone %}{{ title }}{% endif %}
+        {% endfor %}
+    </span>
+</div>
+<div>
+    <span class="content-label">{% trans %}Logo{% endtrans %}:</span>
+    <span class="content-value">{% if logopath %}<a href="{% url core_logo_image %}" target="_blank">{{ logopath }}{% else %}{% trans %}Default{% endtrans %}{% endif %}</span>
+</div>
+{% endblock %}
diff --git a/data/treeio/treeio/templates/html/core/billing/upgrade.html b/data/treeio/treeio/templates/html/core/billing/upgrade.html
new file mode 100644
index 0000000..f742f9c
--- /dev/null
+++ b/data/treeio/treeio/templates/html/core/billing/upgrade.html
@@ -0,0 +1,104 @@
+{% load i18n %}
+{% extends "html/core/page.html" %}
+
+{% block title %}{% trans %}Upgrade{% endtrans %} | {% trans %}Billing{% endtrans %} | {% trans %}Administration{% endtrans %}{% endblock %}
+
+{% block module_title %}{% trans %}Billing{% endtrans %}{% endblock %}
+
+{% block module_topmenu %}
+    <a href="{% url core_billing_upgrade %}" class="top-menu add-link-active">{% trans %}Upgrade Account{% endtrans %}</a>
+    <a href="{% url core_billing_information %}" class="top-menu edit-link">{% trans %}Billing Information{% endtrans %}</a>
+{% endblock %}
+
+{% block class_billing %}sidebar-link-active{% endblock %}
+
+
+{% block module_content %}
+
+    	<script type="text/javascript">
+
+
+		$(document).ready(function(){
+			var discount = 0;
+
+			$("#id_users").keyup(prorate);
+			$("#id_coupon").keyup(prorate);
+		});
+
+		var upgrade = "yes";
+		function prorate() {
+
+            var p_users=$('#id_users').val();
+			var p_coupon=$('#id_coupon').val();
+
+			$.ajax({
+				url: "{% url core_billing_prorate %}",
+				type: "GET",
+				global: false,
+				dataType: "html",
+				async:false,
+				data: ({users: p_users, coupon: p_coupon}),
+				success: function(p_price) {
+					$('#prorated-price').html(p_price);
+				}
+			});
+		}
+	</script>
+
+<div class="admin-style">
+    {% if messages %}
+		<p class="yellow">
+            {% for message in messages %}
+			{{ message|htsafe }}
+            {% endfor %}
+		</p>
+		{% endif %}
+
+    <p class="label-margin clearfix">
+    {% if not has_billing %}
+    <h2>{% trans %}Please{% endtrans %} <a href="{% url core_billing_information %}">{% trans %}update your billing details{% endtrans %}</a> {% trans %}in order to upgrade.{% endtrans %}</h2>
+    {% endif %}
+    </p>
+    
+
+    <div class="hint_box">
+    	<div class="hint_content">
+    		<img class="left" src="/static/images/checklist.png"/>
+			<div class="hint_message">
+		    	<span class="hint_title">{% trans %}Account Information{% endtrans %}</span>
+		      	<div class="content-box">
+		      		<h3>You have <strong>{{ quota - active_users }}</strong> of your <strong>{{ quota }}</strong> available users left. ({{ disabled_users }} currently disabled).</h3>
+		       		<h3>Additional users are priced at $15 per user/month.</h3>
+		    		<div id="prorated-price"></div>
+		    	</div>
+			</div>
+		</div>
+    </div>
+
+
+
+    <hr class="space"/>
+    <div class="hint_box">
+     	<div class="hint_content">
+     		<img class="left" src="/static/images/gifts.png"/>
+			<div class="hint_message">
+				<span class="hint_title">{% trans %}Add Users{% endtrans %}</span>
+				<div class="content-box">
+					<form action="" method="post" class="content-form">
+					{% csrf_token %}
+	
+				    <ul class="content-form-fields">
+				        {{ form.as_ul()|htsafe }}
+				    </ul>
+				    <div class="label-margin content-form-submit">
+				        <input type="submit" name="save" value="{% trans %}Upgrade{% endtrans %}">
+				    </div>
+	
+					</form>
+				</div>
+			</div>
+		</div>
+	</div>
+
+</div>
+{% endblock %}
diff --git a/data/treeio/treeio/templates/html/core/database_setup.html b/data/treeio/treeio/templates/html/core/database_setup.html
new file mode 100644
index 0000000..f626823
--- /dev/null
+++ b/data/treeio/treeio/templates/html/core/database_setup.html
@@ -0,0 +1,26 @@
+{% load i18n %}
+{% extends "html/base_login.html" %}
+
+{% block title %}{% trans %}Set domain up{% endtrans %}{% endblock %}
+
+{% block page %}
+<div class="login-block">
+
+    <div style="text-align: center;">
+  		<a href="{% url home %}"><img src="{% url core_logo_image_ie %}" alt="Tree.io" class="logo-large" /></a>
+  	</div>
+
+    <form method="post" action="{% url database_setup %}" method="post" autocomplete="off">
+        {% csrf_token %}
+        <div>The sql engine settings</div>
+        <ul class="content-form-fields">
+            {{ sql_form.as_ul()|htsafe }}
+        </ul>
+        <div class="content-form-submit">
+            <input type="submit" name="save" value="{% trans %}Create{% endtrans %}">
+            <input type="submit" name="cancel" value="{% trans %}Cancel{% endtrans %}" class="cancel" />
+        </div>
+    </form>
+    
+</div>
+{% endblock %}
diff --git a/data/treeio/treeio/treeio/account/ajax.py b/data/treeio/treeio/treeio/account/ajax.py
new file mode 100644
index 0000000..8afc657
--- /dev/null
+++ b/data/treeio/treeio/treeio/account/ajax.py
@@ -0,0 +1,272 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+"""
+Core Ajax views
+"""
+
+from django.template import RequestContext
+import re
+from treeio.core.mail import EmailInvitation
+from django.contrib.sites.models import RequestSite
+from treeio.core.models import Attachment, Invitation
+from treeio.core.views import user_denied
+from treeio.core.rendering import render_to_string
+from treeio.core.models import Comment, Object, UpdateRecord, Tag
+from treeio.core.forms import TagsForm
+from treeio.core.ajax import converter
+from dajaxice.core import dajaxice_functions
+from dajax.core import Dajax
+
+
+def comments_likes(request, target, form, expand=True):
+    dajax = Dajax()
+
+    response_format = 'html'
+
+    object_id = form.get('object_id', 0)
+    update = form.get('update', 0)
+    object = None
+    if update:
+        object = UpdateRecord.objects.get(pk=object_id)
+    else:
+        object = Object.objects.get(pk=object_id)
+
+    profile = request.user.profile
+
+    if object:
+        if form.get('like', 0) == unicode(object.id):
+            object.likes.add(profile)
+            if hasattr(object, 'score'):
+                object.score += 1
+                object.save()
+
+        elif form.get('unlike', 0) == unicode(object.id):
+            object.likes.remove(profile)
+            if hasattr(object, 'score'):
+                object.score -= 1
+                object.save()
+
+        elif form.get('dislike', 0) == unicode(object.id):
+            object.dislikes.add(profile)
+            if hasattr(object, 'score'):
+                object.score += 1
+                object.save()
+
+        elif form.get('undislike', 0) == unicode(object.id):
+            object.dislikes.remove(profile)
+            if hasattr(object, 'score'):
+                object.score -= 1
+                object.save()
+
+        elif form.get('commentobject', 0) == unicode(object.id) and 'comment' in form:
+            comment = Comment(author=profile,
+                              body=form.get('comment'))
+            comment.save()
+            if hasattr(object, 'score'):
+                object.score += 1
+                object.save()
+            object.comments.add(comment)
+
+    likes = object.likes.all()
+    dislikes = object.dislikes.all()
+    comments = object.comments.all()
+
+    ilike = profile in likes
+    idislike = profile in dislikes
+    icommented = comments.filter(author=profile).exists() or \
+        comments.filter(author__default_group__in=[
+                        profile.default_group_id] + [i.id for i in profile.other_groups.all().only('id')]).exists()
+
+    output = render_to_string('core/tags/comments_likes',
+                              {'object': object,
+                               'is_update': update,
+                               'profile': profile,
+                               'likes': likes,
+                               'dislikes': dislikes,
+                               'comments': comments,
+                               'ilike': ilike,
+                               'idislike': idislike,
+                               'icommented': icommented,
+                               'expand': expand},
+                              context_instance=RequestContext(request),
+                              response_format=response_format)
+
+    dajax.add_data({'target': target, 'content': output}, 'treeio.add_data')
+    return dajax.json()
+
+dajaxice_functions.register(comments_likes)
+
+
+def tags(request, target, object_id, edit=False, formdata=None):
+    if formdata is None:
+        formdata = {}
+    dajax = Dajax()
+
+    response_format = 'html'
+    object = Object.objects.get(pk=object_id)
+
+    tags = object.tags.all()
+    form = None
+    if 'tags' in formdata and not type(formdata['tags']) == list:
+        formdata['tags'] = [formdata['tags']]
+
+    if edit or formdata:
+        if formdata.get('tags_object', 0) == unicode(object.id):
+            form = TagsForm(tags, formdata)
+            if form.is_valid():
+                if 'multicomplete_tags' in formdata:
+                    tag_names = formdata.get('multicomplete_tags').split(',')
+                    new_tags = []
+                    for name in tag_names:
+                        name = name.strip()
+                        if name:
+                            try:
+                                tag = Tag.objects.get(name=name)
+                            except Tag.DoesNotExist:
+                                tag = Tag(name=name)
+                                tag.save()
+                            new_tags.append(tag)
+                else:
+                    new_tags = form.is_valid()
+
+                object.tags.clear()
+                for tag in new_tags:
+                    object.tags.add(tag)
+                tags = object.tags.all()
+                form = None
+        else:
+            form = TagsForm(tags)
+
+    context = {'object': object,
+               'tags': tags,
+               'form': form}
+
+    context = converter.preprocess_context(context)
+
+    output = render_to_string('core/ajax/tags_box', context,
+                              context_instance=RequestContext(request),
+                              response_format=response_format)
+
+    dajax.add_data({'target': target, 'content': output}, 'treeio.add_data')
+    return dajax.json()
+
+dajaxice_functions.register(tags)
+
+
+def attachment(request, object_id, update_id=None):
+    dajax = Dajax()
+
+    try:
+
+        if object_id:
+            attachments = Attachment.objects.filter(
+                attached_object__id=object_id)
+            template = 'core/tags/attachments_block'
+
+            object_markup = render_to_string(template,
+                                             {'object_id': object_id,
+                                                 'attachments': attachments},
+                                             context_instance=RequestContext(
+                                                 request),
+                                             response_format='html')
+
+            dajax.add_data(
+                {'target': 'div.attachment-block[object="%s"]' % object_id, 'content': object_markup}, 'treeio.add_data')
+
+        if update_id:
+            attachments = Attachment.objects.filter(
+                attached_record__id=update_id)
+            template = 'core/tags/attachments_record_block'
+            update_markup = render_to_string(template,
+                                             {'update_id': update_id,
+                                                 'attachments': attachments},
+                                             context_instance=RequestContext(
+                                                 request),
+                                             response_format='html')
+            dajax.add_data(
+                {'target': 'div.attachment-record-block[object="%s"]' % update_id, 'content': update_markup}, 'treeio.add_data')
+
+    except Exception, e:
+        pass
+
+    return dajax.json()
+
+dajaxice_functions.register(attachment)
+
+
+def attachment_delete(request, attachment_id):
+
+    try:
+        a = Attachment.objects.get(pk=attachment_id)
+    except Attachment.DoesNotExist:
+        return
+
+    profile = request.user.profile
+
+    if a.attached_object:
+        object_id = a.attached_object.id
+        object = Object.objects.get(pk=object_id)
+    else:
+        object_id = None
+
+    update_id = None
+    if a.attached_record:
+        update_id = a.attached_record.id
+        update = UpdateRecord.objects.get(pk=update_id)
+        if not update.author == profile:
+            return user_denied(request, message="Only the author of this Update can delete attachments.")
+
+    elif not profile.has_permission(object, mode='w'):
+        return user_denied(request, message="You don't have full access to this Object")
+
+    a.delete()
+
+    return attachment(request, object_id, update_id)
+
+dajaxice_functions.register(attachment_delete)
+
+
+def easy_invite(request, emails=None):
+
+    dajax = Dajax()
+
+    try:
+        emails_original = emails
+        emails = emails.split(',')
+
+        sender = request.user.profile
+        default_group = sender.default_group
+        domain = RequestSite(request).domain
+
+        invited = []
+
+        for email in emails:
+            email = email.strip()
+            if len(email) > 7 and re.match("^.+\\@(\\[?)[a-zA-Z0-9\\-\\.]+\\.([a-zA-Z]{2,3}|[0-9]{1,3})(\\]?)$", email) is not None:
+                invitation = Invitation(
+                    sender=request.user.profile, email=email, default_group=default_group)
+                invitation.save()
+                EmailInvitation(
+                    invitation=invitation, sender=sender, domain=domain).send_email()
+                invited.append(email)
+
+        if invited:
+            template = 'core/tags/easy_invite_success'
+        else:
+            template = 'core/tags/easy_invite_failure'
+    except:
+        template = 'core/tags/easy_invite_failure'
+
+    invite_markup = render_to_string(template,
+                                     {},
+                                     context_instance=RequestContext(request),
+                                     response_format='html')
+
+    dajax.add_data({'target': "div.easy-invite[emails='%s']" %
+                   (emails_original), 'content': invite_markup}, 'treeio.add_data')
+    return dajax.json()
+
+dajaxice_functions.register(easy_invite)
diff --git a/data/treeio/treeio/treeio/account/cron.py b/data/treeio/treeio/treeio/account/cron.py
new file mode 100644
index 0000000..a1f1cac
--- /dev/null
+++ b/data/treeio/treeio/treeio/account/cron.py
@@ -0,0 +1,88 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+"""
+Account cron jobs
+"""
+
+import codecs
+
+try:
+    from cStringIO import StringIO
+except ImportError:
+    from StringIO import StringIO
+
+from django.db.models import Q
+from django.utils.html import strip_tags
+from django.contrib.sites.models import Site
+
+from datetime import datetime, timedelta
+from treeio.core.mail import SystemEmail
+from treeio.core.models import UpdateRecord
+from treeio.account.models import NotificationSetting, Notification
+
+
+class CronNotifier:
+    def __init__(self):
+        self.next_daily = datetime.now()
+
+    def send_notification(self, note, records):
+        message_html = codecs.getwriter("utf8")(StringIO())
+        message_html.write(note.title())
+        current_url = None
+        for record in records:
+            if current_url != record.url:
+                current_url = record.url
+                message_html.write(
+                    u'<br /><br />\n\n<a href="%s">' % unicode(record.url))
+                if record.sender:
+                    message_html.write(u'%s</a> (%s):<br />\n' %
+                                       (unicode(record.sender), unicode(record.sender.get_human_type())))
+                else:
+                    message_html.write(
+                        u'%s</a>:<br />\n' % unicode(record.url))
+                message_html.write('-' * 30)
+                message_html.write('<br /><br />\n\n')
+            message_html.write(u'%s:<br />\n%s - %s<br /><br />\n\n' %
+                               (unicode(record.author), unicode(record.date_created.isoformat()),
+                                record.get_full_message()))
+        signature = "This is an automated message from Tree.io service (http://tree.io). Please do not reply to this e-mail."
+        subject = "%s summary of [Tree.io] %s" % (
+            note.get_ntype_display(), unicode(note.owner),)
+
+        # send email notification to recipient
+        try:
+            toaddr = note.owner.get_contact().get_email()
+        except:
+            toaddr = None
+        if toaddr:
+            html = message_html.getvalue()
+            html = html.replace(
+                'href="', 'href="http://' + Site.objects.get_current().domain)
+            body = strip_tags(html)
+            SystemEmail(
+                toaddr, subject, body, signature, html + signature).send_email()
+            Notification(
+                recipient=note.owner, body=html, ntype=note.ntype).save()
+
+    def send_notifications(self):
+        "Run sending some notifications"
+        now = datetime.now()
+
+        if self.next_daily <= now:
+            notes = NotificationSetting.objects.filter(
+                next_date__lte=now.date(), enabled=True)
+            for note in notes:
+                query = Q()
+                for module in note.modules.all():
+                    query = query | Q(
+                        about__object_type__icontains=module.name)
+                query = query & Q(date_created__gte=note.last_datetime) \
+                        & (Q(author=note.owner_id) | Q(recipients=note.owner_id))
+                self.send_notification(note, UpdateRecord.objects.filter(
+                    query).distinct().order_by('url', '-date_created'))
+                note.update_date(now)
+            self.next_daily = datetime(
+                now.year, now.month, now.day) + timedelta(days=1)
diff --git a/data/treeio/treeio/treeio/account/forms.py b/data/treeio/treeio/treeio/account/forms.py
new file mode 100644
index 0000000..879ed79
--- /dev/null
+++ b/data/treeio/treeio/treeio/account/forms.py
@@ -0,0 +1,237 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+"""
+Core forms
+"""
+from django import forms
+from treeio.account.models import NotificationSetting, notification_types
+from treeio.core.models import User, Object, ModuleSetting, Perspective, Module
+from django.utils.translation import ugettext as _
+from treeio.core.decorators import preprocess_form
+from treeio.core.conf import settings
+from datetime import date
+
+preprocess_form()
+
+
+class MassActionForm(forms.Form):
+    """ Mass action form for Accounts """
+
+    delete = forms.ChoiceField(label=_("With selected"),
+                               choices=(('', '-----'), ('delete', _('Delete Completely')),
+                                        ('trash', _('Move to Trash'))), required=False)
+
+    instance = None
+
+    def __init__(self, user, *args, **kwargs):
+        if 'instance' in kwargs:
+            self.instance = kwargs['instance']
+            del kwargs['instance']
+
+        super(MassActionForm, self).__init__(*args, **kwargs)
+        self.fields['delete'] = forms.ChoiceField(label=_("With selected"),
+                                                  choices=(('', '-----'), ('delete', _('Delete Completely')),
+                                                           ('trash', _('Move to Trash'))), required=False)
+
+    def save(self, *args, **kwargs):
+        "Process form"
+        if self.instance:
+            if self.is_valid():
+                if self.cleaned_data['delete']:
+                    if self.cleaned_data['delete'] == 'delete':
+                        self.instance.delete()
+                    if self.cleaned_data['delete'] == 'trash':
+                        self.instance.trash = True
+                        self.instance.save()
+
+
+class AccountForm(forms.ModelForm):
+    """ Account form """
+
+    def __init__(self, *args, **kwargs):
+        self.instance = kwargs['instance']
+        super(AccountForm, self).__init__(*args, **kwargs)
+
+        self.fields['name'].label = _("Username")
+
+    def save(self, *args, **kwargs):
+        "Form processor"
+        super(AccountForm, self).save(*args, **kwargs)
+
+        self.instance.user.username = self.instance.name
+        self.instance.user.save()
+
+    def clean_name(self):
+        "Clean name"
+        data = self.cleaned_data['name']
+        existing = User.objects.filter(name=data).exclude(pk=self.instance.id)
+        if existing:
+            raise forms.ValidationError(
+                _("User with username %s already exists.") % data)
+        return data
+
+    class Meta:
+        "Account Form"
+        model = User
+        fields = ('name', 'default_group', 'other_groups')
+
+
+class AccountPasswordForm(forms.Form):
+    """ Password form """
+
+    old_password = forms.CharField(max_length=255,
+                                   widget=forms.PasswordInput(render_value=False))
+    new_password = forms.CharField(max_length=255,
+                                   widget=forms.PasswordInput(render_value=False))
+    new_password_again = forms.CharField(max_length=255,
+                                         widget=forms.PasswordInput(render_value=False))
+
+    user = None
+
+    def __init__(self, user, *args, **kwargs):
+        super(AccountPasswordForm, self).__init__(*args, **kwargs)
+        self.fields['old_password'].label = _("Current Password")
+        self.fields['new_password'].label = _("New Password")
+        self.fields['new_password_again'].label = _("Confirm Password")
+
+        self.user = user
+
+    def clean_old_password(self):
+        "Clean old password"
+        data = self.cleaned_data['old_password']
+        if not self.user.check_password(data):
+            raise forms.ValidationError(_("Current password is wrong"))
+        return data
+
+    def clean_new_password_again(self):
+        "Clean new password again"
+        password1 = self.cleaned_data['new_password']
+        password2 = self.cleaned_data['new_password_again']
+        if not password1 == password2:
+            raise forms.ValidationError(_("Passwords do not match"))
+        return password2
+
+    def save(self):
+        "Save"
+        password1 = self.cleaned_data['new_password']
+        self.user.set_password(password1)
+        return self.user.save()
+
+
+class SettingsForm(forms.Form):
+    """ User Account settings form """
+
+    default_perspective = forms.ModelChoiceField(
+        label='Default Perspective', queryset=[])
+    language = forms.ChoiceField(label='Language', choices=[])
+    default_timezone = forms.ChoiceField(label='Time Zone', choices=[])
+    user = None
+    email_notifications = forms.ChoiceField(
+        label="E-mail Notifications",
+        choices=(('never', _('Never (disabled)')), ('True', _('As-it-happens'))) + notification_types, required=False)
+    notifications_for_modules = forms.MultipleChoiceField(
+        label="Receive notifications for modules", required=False)
+
+    def __init__(self, user, *args, **kwargs):
+        "Sets choices and initial value"
+        super(SettingsForm, self).__init__(*args, **kwargs)
+
+        self.fields['default_perspective'].label = _("Default Perspective")
+        self.fields['language'].label = _("Language")
+        self.fields['default_timezone'].label = _("Time Zone")
+        self.fields['email_notifications'].label = _("E-mail Notifications")
+
+        self.user = user
+
+        self.fields['default_perspective'].queryset = Object.filter_permitted(
+            user, Perspective.objects)
+        try:
+            conf = ModuleSetting.get_for_module(
+                'treeio.core', 'default_perspective', user=self.user)[0]
+            default_perspective = Perspective.objects.get(pk=long(conf.value))
+            self.fields['default_perspective'].initial = default_perspective.id
+        except:
+            pass
+
+        self.fields['default_timezone'].choices = getattr(
+            settings, 'HARDTREE_SERVER_TIMEZONE')
+        timezone = settings.HARDTREE_SERVER_DEFAULT_TIMEZONE
+        try:
+            conf = ModuleSetting.get('default_timezone', user=user)[0]
+            timezone = conf.value
+        except:
+            pass
+        self.fields['default_timezone'].initial = timezone
+
+        self.fields['language'].choices = getattr(
+            settings, 'HARDTREE_LANGUAGES', [('en', 'English')])
+        language = getattr(settings, 'HARDTREE_LANGUAGES_DEFAULT', '')
+        try:
+            conf = ModuleSetting.get('language', user=user)[0]
+            language = conf.value
+        except IndexError:
+            pass
+        self.fields['language'].initial = language
+
+        try:
+            conf = ModuleSetting.get('email_notifications', user=user)[0]
+            self.fields['email_notifications'].initial = conf.value
+        except:
+            self.fields[
+                'email_notifications'].initial = settings.HARDTREE_ALLOW_EMAIL_NOTIFICATIONS
+
+        perspective = user.get_perspective()
+
+        modules = perspective.modules.filter(display=True).order_by('title')
+        if not modules:
+            modules = Module.objects.filter(display=True).order_by('title')
+        self.fields['notifications_for_modules'].choices = [
+            (module.pk, module.title) for module in modules]
+
+        try:
+            modules = NotificationSetting.objects.get(
+                owner=self.user).modules.all()
+            self.fields['notifications_for_modules'].initial = [
+                m.pk for m in modules]
+        except (NotificationSetting.DoesNotExist, NotificationSetting.MultipleObjectsReturned):
+            pass
+
+    def save(self):
+        "Form processor"
+        try:
+            ModuleSetting.set_for_module('default_perspective',
+                                         self.cleaned_data[
+                                             'default_perspective'].id,
+                                         'treeio.core', user=self.user)
+            ModuleSetting.set_for_module('default_timezone',
+                                         self.cleaned_data['default_timezone'],
+                                         'treeio.core', user=self.user)
+            ModuleSetting.set_for_module('language',
+                                         self.cleaned_data['language'],
+                                         'treeio.core', user=self.user)
+            # notification settings
+            email_notifications = self.cleaned_data['email_notifications']
+            notification, created = NotificationSetting.objects.get_or_create(
+                owner=self.user)
+            if email_notifications in ('d', 'w', 'm'):
+                notification.ntype = email_notifications
+                if not notification.enabled:
+                    notification.enabled = True
+                    notification.update_date(date.today())
+                notification.save()
+                notification.modules.clear()
+                for m in Module.objects.filter(pk__in=self.cleaned_data['notifications_for_modules']):
+                    notification.modules.add(m)
+            else:
+                notification.enabled = False
+                notification.save()
+            ModuleSetting.set_for_module('email_notifications',
+                                         email_notifications,
+                                         'treeio.core', user=self.user)
+            return True
+
+        except:
+            return False
diff --git a/data/treeio/treeio/treeio/account/south_migrations/0001_initial.py b/data/treeio/treeio/treeio/account/south_migrations/0001_initial.py
new file mode 100644
index 0000000..6e560a5
--- /dev/null
+++ b/data/treeio/treeio/treeio/account/south_migrations/0001_initial.py
@@ -0,0 +1,25 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        pass
+
+    def backwards(self, orm):
+        pass
+
+    models = {
+
+    }
+
+    complete_apps = ['account']
diff --git a/data/treeio/treeio/treeio/account/views.py b/data/treeio/treeio/treeio/account/views.py
new file mode 100644
index 0000000..26d2f86
--- /dev/null
+++ b/data/treeio/treeio/treeio/account/views.py
@@ -0,0 +1,223 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+"""
+Core module views
+"""
+
+from treeio.core.rendering import render_to_response
+from django.template import RequestContext
+from django.http import HttpResponseRedirect
+from django.core.urlresolvers import reverse
+from treeio.account.forms import AccountForm, AccountPasswordForm, SettingsForm, MassActionForm
+from treeio.core.decorators import treeio_login_required, handle_response_format
+from treeio.core.models import ModuleSetting, Perspective
+from treeio.account.models import NotificationSetting
+from treeio.core.conf import settings
+from jinja2 import Markup
+
+
+@treeio_login_required
+def account_view(request, response_format='html'):
+    "Account view"
+
+    profile = request.user.profile
+    try:
+        contacts = profile.contact_set.exclude(trash=True)
+    except:
+        contacts = []
+
+    return render_to_response('account/account_view',
+                              {'profile': profile, 'contacts': contacts},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def watchlist(request, response_format='html'):
+    "Displays all objects a User is subscribed to"
+
+    profile = request.user.profile
+    watchlist = profile.subscriptions.all()
+
+    context = {'profile': profile, 'watchlist': watchlist}
+
+    return render_to_response('account/watchlist', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def account_edit(request, response_format='html'):
+    "Account edit"
+
+    profile = request.user.profile
+    if request.POST:
+        form = AccountForm(request.POST, instance=profile)
+        if form.is_valid():
+            form.save()
+            return HttpResponseRedirect(reverse('account_view'))
+    else:
+        form = AccountForm(instance=profile)
+
+    return render_to_response('account/account_edit',
+                              {'profile': profile,
+                                  'form': Markup(form.as_ul())},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def account_password(request, response_format='html'):
+    "Change password form"
+
+    profile = request.user.profile
+    if request.POST:
+        if 'cancel' not in request.POST:
+            form = AccountPasswordForm(request.user, request.POST)
+            if form.is_valid():
+                form.save()
+                return HttpResponseRedirect(reverse('account_view'))
+        else:
+            return HttpResponseRedirect(reverse('account_view'))
+    else:
+        form = AccountPasswordForm(request.user)
+
+    return render_to_response('account/account_password',
+                              {'profile': profile,
+                               'form': Markup(form.as_ul())},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+#
+# Settings
+#
+@treeio_login_required
+def settings_view(request, response_format='html'):
+    "Settings view"
+    user = request.user.profile
+
+    # default permissions
+    try:
+        conf = ModuleSetting.get_for_module(
+            'treeio.core', 'default_permissions', user=user)[0]
+        default_permissions = conf.value
+    except:
+        default_permissions = settings.HARDTREE_DEFAULT_PERMISSIONS
+
+    # default perspective
+    try:
+        conf = ModuleSetting.get_for_module(
+            'treeio.core', 'default_perspective', user=user)[0]
+        default_perspective = Perspective.objects.get(pk=long(conf.value))
+    except:
+        default_perspective = None
+
+    # language
+    language = getattr(settings, 'HARDTREE_LANGUAGES_DEFAULT', '')
+    try:
+        conf = ModuleSetting.get('language', user=user)[0]
+        language = conf.value
+    except IndexError:
+        pass
+    all_languages = getattr(
+        settings, 'HARDTREE_LANGUAGES', [('en', 'English')])
+
+    # time zone
+    default_timezone = settings.HARDTREE_SERVER_DEFAULT_TIMEZONE
+    try:
+        conf = ModuleSetting.get('default_timezone')[0]
+        default_timezone = conf.value
+    except:
+        pass
+
+    try:
+        conf = ModuleSetting.get('default_timezone', user=user)[0]
+        default_timezone = conf.value
+    except:
+        default_timezone = getattr(
+            settings, 'HARDTREE_SERVER_TIMEZONE')[default_timezone][0]
+
+    all_timezones = getattr(settings, 'HARDTREE_SERVER_TIMEZONE')
+
+    # email notifications e.g. new task assigned to you
+    email_notifications = getattr(
+        settings, 'HARDTREE_ALLOW_EMAIL_NOTIFICATIONS', False)
+    try:
+        conf = ModuleSetting.get('email_notifications', user=user)[0]
+        email_notifications = conf.value
+    except:
+        pass
+
+    try:
+        ns = NotificationSetting.objects.get(owner=user, enabled=True)
+        notifications_for_modules = [m.title for m in ns.modules.all()]
+    except NotificationSetting.DoesNotExist:
+        notifications_for_modules = []
+
+    return render_to_response('account/settings_view',
+                              {
+                                  'default_permissions': default_permissions,
+                                  'default_perspective': default_perspective,
+                                  'language': language,
+                                  'all_languages': all_languages,
+                                  'default_timezone': default_timezone,
+                                  'all_timezones': all_timezones,
+                                  'email_notifications': email_notifications,
+                                  'notifications_for_modules': notifications_for_modules,
+                              },
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def settings_edit(request, response_format='html'):
+    "Settings edit"
+
+    if request.POST:
+        if 'cancel' not in request.POST:
+            form = SettingsForm(request.user.profile, request.POST)
+            if form.is_valid():
+                form.save()
+                return HttpResponseRedirect(reverse('account_settings_view'))
+        else:
+            return HttpResponseRedirect(reverse('account_settings_view'))
+    else:
+        form = SettingsForm(request.user.profile)
+
+    return render_to_response('account/settings_edit',
+                              {'form': Markup(form.as_ul())},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+#
+# Notification settings
+#
+
+
+def _process_mass_form(f):
+    "Pre-process request to handle mass action form for NotificationSetting"
+
+    def wrap(request, *args, **kwargs):
+        "Wrap"
+        user = request.user.profile
+        if 'massform' in request.POST:
+            for key in request.POST:
+                if 'mass-setting' in key:
+                    try:
+                        report = NotificationSetting.objects.get(pk=request.POST[key])
+                        form = MassActionForm(
+                            user, request.POST, instance=report)
+                        if form.is_valid() and user.has_permission(report, mode='w'):
+                            form.save()
+                    except:
+                        pass
+
+        return f(request, *args, **kwargs)
+
+    # can use functools.update_wrapper instead
+    wrap.__doc__ = f.__doc__
+    wrap.__name__ = f.__name__
+
+    return wrap
diff --git a/data/treeio/treeio/treeio/changes/south_migrations/0001_initial.py b/data/treeio/treeio/treeio/changes/south_migrations/0001_initial.py
new file mode 100644
index 0000000..c93b405
--- /dev/null
+++ b/data/treeio/treeio/treeio/changes/south_migrations/0001_initial.py
@@ -0,0 +1,194 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Adding model 'ChangeSetStatus'
+        db.create_table('changes_changesetstatus', (
+            ('object_ptr', self.gf('django.db.models.fields.related.OneToOneField')(
+                to=orm['core.Object'], unique=True, primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')
+             (max_length=256)),
+            ('details', self.gf('django.db.models.fields.TextField')
+             (null=True, blank=True)),
+            ('active', self.gf('django.db.models.fields.BooleanField')
+             (default=True)),
+            ('hidden', self.gf('django.db.models.fields.BooleanField')
+             (default=False)),
+        ))
+        db.send_create_signal('changes', ['ChangeSetStatus'])
+
+        # Adding model 'ChangeSet'
+        db.create_table('changes_changeset', (
+            ('id', self.gf('django.db.models.fields.AutoField')
+             (primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')
+             (max_length=255)),
+            ('object', self.gf('django.db.models.fields.related.ForeignKey')
+             (related_name='changeset_object_set', to=orm['core.Object'])),
+            ('author', self.gf('django.db.models.fields.related.ForeignKey')(
+                blank=True, related_name='author', null=True, to=orm['core.User'])),
+            ('resolved_by', self.gf('django.db.models.fields.related.ForeignKey')(
+                to=orm['core.User'], null=True, blank=True)),
+            ('resolved_on', self.gf('django.db.models.fields.DateTimeField')
+             (null=True, blank=True)),
+            ('status', self.gf('django.db.models.fields.related.ForeignKey')
+             (to=orm['changes.ChangeSetStatus'])),
+            ('details', self.gf('django.db.models.fields.TextField')
+             (null=True, blank=True)),
+            ('date_created', self.gf('django.db.models.fields.DateTimeField')
+             (default=datetime.datetime.now)),
+        ))
+        db.send_create_signal('changes', ['ChangeSet'])
+
+        # Adding model 'Change'
+        db.create_table('changes_change', (
+            ('id', self.gf('django.db.models.fields.AutoField')
+             (primary_key=True)),
+            ('change_set', self.gf('django.db.models.fields.related.ForeignKey')(
+                to=orm['changes.ChangeSet'])),
+            ('change_type', self.gf('django.db.models.fields.CharField')
+             (max_length=255, null=True, blank=True)),
+            ('field', self.gf('django.db.models.fields.CharField')
+             (max_length=255, null=True, blank=True)),
+            ('change_from', self.gf('django.db.models.fields.TextField')
+             (null=True, blank=True)),
+            ('change_to', self.gf('django.db.models.fields.TextField')
+             (null=True, blank=True)),
+            ('date_created', self.gf('django.db.models.fields.DateTimeField')
+             (default=datetime.datetime.now)),
+        ))
+        db.send_create_signal('changes', ['Change'])
+
+    def backwards(self, orm):
+
+        # Deleting model 'ChangeSetStatus'
+        db.delete_table('changes_changesetstatus')
+
+        # Deleting model 'ChangeSet'
+        db.delete_table('changes_changeset')
+
+        # Deleting model 'Change'
+        db.delete_table('changes_change')
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'changes.change': {
+            'Meta': {'ordering': "['-date_created']", 'object_name': 'Change'},
+            'change_from': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'change_set': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['changes.ChangeSet']"}),
+            'change_to': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'change_type': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'field': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'changes.changeset': {
+            'Meta': {'ordering': "('-date_created', 'name')", 'object_name': 'ChangeSet'},
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'author'", 'null': 'True', 'to': "orm['core.User']"}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'changeset_object_set'", 'to': "orm['core.Object']"}),
+            'resolved_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'}),
+            'resolved_on': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'status': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['changes.ChangeSetStatus']"})
+        },
+        'changes.changesetstatus': {
+            'Meta': {'ordering': "('hidden', '-active', 'name')", 'object_name': 'ChangeSetStatus', '_ormbases': ['core.Object']},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'hidden': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'core.group': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Group'},
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['core.Group']"})
+        },
+        'core.object': {
+            'Meta': {'object_name': 'Object'},
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'everybody_execute': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'everybody_read': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'everybody_write': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Group']"}),
+            'group_execute': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'group_read': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'group_write': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'links': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'links_rel_+'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'nuvius_resource': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'object_name': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'object_type': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'subscribers': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'subscriptions'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'trash': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']"}),
+            'user_execute': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'user_read': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'user_write': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'core.user': {
+            'Meta': {'ordering': "['name']", 'object_name': 'User'},
+            'default_group': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'default_user_set'", 'null': 'True', 'to': "orm['core.Group']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'other_groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        }
+    }
+
+    complete_apps = ['changes']
diff --git a/data/treeio/treeio/treeio/core/administration/api/handlers.py b/data/treeio/treeio/treeio/core/administration/api/handlers.py
new file mode 100644
index 0000000..e0d2a3e
--- /dev/null
+++ b/data/treeio/treeio/treeio/core/administration/api/handlers.py
@@ -0,0 +1,217 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+# -*- coding: utf-8 -*-
+
+from __future__ import absolute_import, with_statement
+
+__all__ = ['GroupHandler', 'UserHandler', 'ModuleHandler',
+           'PerspectiveHandler', 'PageFolderHandler', 'PageHandler']
+
+from django.utils.translation import ugettext as _
+
+from treeio.core.api.utils import rc
+from piston3.handler import BaseHandler
+from django.db.models import Q
+from treeio.core.api.handlers import AccessHandler, ObjectHandler
+from treeio.core.api.decorators import module_admin_required
+from treeio.core.models import User, Group, Perspective, Module, Page, PageFolder
+from treeio.core.administration.forms import PerspectiveForm, UserForm, GroupForm, PageForm, PageFolderForm
+
+
+class GroupHandler(AccessHandler):
+    "Entrypoint for Group model."
+    model = Group
+    form = GroupForm
+    fields = ('id', 'name', 'parent', 'perspective', 'details')
+
+    @classmethod
+    def resource_uri(cls, obj=None):
+        object_id = "id"
+        if obj is not None:
+            object_id = obj.id
+        return ('api_admin_groups', [object_id])
+
+    @staticmethod
+    def perspective(data):
+        return data.get_perspective()
+
+
+class UserHandler(AccessHandler):
+    "Entrypoint for User model."
+    model = User
+    form = UserForm
+    allowed_methods = ('GET', 'DELETE')
+    fields = ('id', 'name', 'default_group', 'other_groups',
+              'disabled', 'last_access', 'perspective')
+
+    @classmethod
+    def resource_uri(cls, obj=None):
+        object_id = "id"
+        if obj is not None:
+            object_id = obj.id
+        return ('api_admin_users', [object_id])
+
+    @staticmethod
+    def perspective(data):
+        return data.get_perspective()
+
+    def create(self, request, *args, **kwargs):
+        return rc.NOT_IMPLEMENTED
+
+    def update(self, request, *args, **kwargs):
+        return rc.NOT_IMPLEMENTED
+
+    @module_admin_required()
+    def delete(self, request, *args, **kwargs):
+        pkfield = self.model._meta.pk.name
+
+        if pkfield in kwargs:
+            try:
+                profile = self.model.objects.get(pk=kwargs.get(pkfield))
+
+                if profile == request.user.profile:
+                    self.status = 401
+                    return _("This is you!")
+                else:
+                    profile.delete()
+                    return rc.DELETED
+            except self.model.MultipleObjectsReturned:
+                return rc.DUPLICATE_ENTRY
+            except self.model.DoesNotExist:
+                return rc.NOT_HERE
+        else:
+            return rc.BAD_REQUEST
+
+
+class ModuleHandler(BaseHandler):
+    "Entrypoint for Module model."
+    allowed_methods = ('GET',)
+    model = Module
+    exclude = ('object_type', 'object_ptr', 'object_name')
+
+    read = module_admin_required()(BaseHandler.read)
+
+    @classmethod
+    def resource_uri(cls, obj=None):
+        object_id = "id"
+        if obj is not None:
+            object_id = obj.id
+        return ('api_admin_modules', [object_id])
+
+
+class PerspectiveHandler(ObjectHandler):
+    "Entrypoint for Perspective model."
+    model = Perspective
+    form = PerspectiveForm
+
+    fields = ('id',) + form._meta.fields
+
+    @classmethod
+    def resource_uri(cls, obj=None):
+        object_id = "id"
+        if obj is not None:
+            object_id = obj.id
+        return ('api_admin_perspectives', [object_id])
+
+    def check_create_permission(self, request, mode):
+        return request.user.profile.is_admin('treeio.core')
+
+    def check_instance_permission(self, request, inst, mode):
+        return request.user.profile.is_admin('treeio.core')
+
+    @module_admin_required()
+    def delete_instance(self, request, inst):
+        # Don't let users delete their last perspective
+        other_perspectives = Perspective.objects.filter(
+            trash=False).exclude(id=inst.id)
+        admin_module = Module.objects.all().filter(name='treeio.core')[0]
+        if not other_perspectives:
+            self.status = 401
+            return _("This is your only Perspective.")
+        elif not other_perspectives.filter(Q(modules=admin_module) | Q(modules__isnull=True)):
+            self.status = 401
+            return _("This is your only Perspective with Administration module. You would be locked out!")
+        elif 'trash' in request.REQUEST:
+            inst.trash = True
+            inst.save()
+            return inst
+        else:
+            inst.delete()
+            return rc.DELETED
+
+    @module_admin_required()
+    def update(self, request, *args, **kwargs):
+        if request.data is None:
+            return rc.BAD_REQUEST
+
+        pkfield = kwargs.get(self.model._meta.pk.name) or request.data.get(
+            self.model._meta.pk.name)
+
+        if not pkfield:
+            return rc.BAD_REQUEST
+
+        try:
+            obj = self.model.objects.get(pk=pkfield)
+        except self.model.ObjectDoesNotExist:
+            return rc.NOT_FOUND
+
+        attrs = self.flatten_dict(request)
+
+        form = self.form(instance=obj, **attrs)
+        if form.is_valid():
+            perspective = form.save()
+
+            admin_module = Module.objects.filter(name='treeio.core')[0]
+            other_perspectives = Perspective.objects.filter(
+                trash=False).exclude(id=perspective.id)
+            modules = perspective.modules.all()
+            if modules and admin_module not in modules:
+                if not other_perspectives.filter(Q(modules=admin_module) | Q(modules__isnull=True)):
+                    perspective.modules.add(admin_module)
+                    request.session['message'] = _(
+                        "This is your only Perspective with Administration module. You would be locked out!")
+            return obj
+        else:
+            self.status = 400
+            return form.errors
+
+
+class PageFolderHandler(ObjectHandler):
+    "Entrypoint for PageFolder model."
+    model = PageFolder
+    form = PageFolderForm
+
+    @classmethod
+    def resource_uri(cls, obj=None):
+        object_id = "id"
+        if obj is not None:
+            object_id = obj.id
+        return ('api_admin_folders', [object_id])
+
+    def check_instance_permission(self, request, inst, mode):
+        return request.user.profile.is_admin('treeio.core')
+
+    def flatten_dict(self, request):
+        return {'data': super(ObjectHandler, self).flatten_dict(request.data)}
+
+
+class PageHandler(ObjectHandler):
+    "Entrypoint for Page model."
+    model = Page
+    form = PageForm
+
+    @classmethod
+    def resource_uri(cls, obj=None):
+        object_id = "id"
+        if obj is not None:
+            object_id = obj.id
+        return ('api_admin_pages', [object_id])
+
+    def check_instance_permission(self, request, inst, mode):
+        return request.user.profile.is_admin('treeio.core')
+
+    def flatten_dict(self, request):
+        return {'data': super(ObjectHandler, self).flatten_dict(request.data)}
diff --git a/data/treeio/treeio/treeio/core/administration/forms.py b/data/treeio/treeio/treeio/core/administration/forms.py
new file mode 100644
index 0000000..4f7e3cd
--- /dev/null
+++ b/data/treeio/treeio/treeio/core/administration/forms.py
@@ -0,0 +1,474 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+"""
+Administration module forms
+"""
+from django.db import models
+from django import forms
+from django.forms import ModelChoiceField
+from treeio.core.conf import settings
+from django.db.models import Q
+from django.core.files.storage import default_storage
+import django.contrib.auth.models as django_auth
+from django.utils.translation import ugettext as _
+from treeio.core.decorators import preprocess_form
+from treeio.identities.forms import ContactForm
+from treeio.core.models import User, Group, Perspective, ModuleSetting, Page, PageFolder, user_autocreate_handler
+import hashlib
+import random
+import re
+
+preprocess_form()
+
+PERMISSION_CHOICES = (
+    ('everyone', 'Everyone'),
+    ('usergroup', 'Automatic, User and Default Group'),
+    ('usergroupreadonly', 'Automatic, User and Default Group. READ ONLY'),
+    ('userallgroups', 'Automatic, User and All Their Groups'),
+    ('userallgroupsreadonly',
+     'Automatic, User and All Their Groups. READ ONLY'),
+    ('user', 'Automatic, User Only'),
+    ('userreadonly', 'Automatic, User Only. READ ONLY'),
+    ('nomoduleusergroup', 'Automatic, Skip Module, User and Default Group'),
+    ('nomoduleusergroupreadonly',
+     'Automatic, Skip Module, User and Default Group. READ ONLY'),
+    ('nomoduleuserallgroups',
+     'Automatic, Skip Module, User and All Their Groups'),
+    ('nomoduleuserallgroupsreadonly',
+     'Automatic, Skip Module, User and All Their Groups. READ ONLY'),
+    ('nomoduleuser', 'Automatic, Skip Module, User Only'),
+    ('nomoduleuserreadonly', 'Automatic, Skip Module, User Only. READ ONLY'),
+    ('forceusergroup', 'Force User and Default Group'),
+    ('forceuserallgroups', 'Force User and All Their Groups'),
+    ('forceuser', 'Force User Only'),
+)
+
+
+class SettingsForm(forms.Form):
+
+    """ Global settings form """
+
+    default_perspective = forms.ModelChoiceField(
+        label='Default Perspective', queryset=[])
+    default_permissions = forms.ChoiceField(label='Default Permissions',
+                                            choices=PERMISSION_CHOICES)
+    language = forms.ChoiceField(label='Language', choices=[])
+    default_timezone = forms.ChoiceField(label='Time Zone', choices=[])
+    logo = forms.ImageField(
+        label='Logo', required=False, widget=forms.FileInput)
+
+    def __init__(self, user, *args, **kwargs):
+        "Sets choices and initial value"
+        super(SettingsForm, self).__init__(*args, **kwargs)
+
+        self.fields['default_perspective'].queryset = Perspective.objects.all()
+        try:
+            conf = ModuleSetting.get_for_module(
+                'treeio.core', 'default_perspective')[0]
+            default_perspective = Perspective.objects.get(pk=long(conf.value))
+            self.fields['default_perspective'].initial = default_perspective.id
+        except:
+            pass
+
+        try:
+            conf = ModuleSetting.get_for_module(
+                'treeio.core', 'default_permissions')[0]
+            self.fields['default_permissions'].initial = conf.value
+        except:
+            self.fields['default_permissions'].initial = getattr(
+                settings, 'HARDTREE_DEFAULT_PERMISSIONS', 'everyone')
+
+        self.fields['default_timezone'].choices = getattr(
+            settings, 'HARDTREE_SERVER_TIMEZONE')
+        timezone = settings.HARDTREE_SERVER_DEFAULT_TIMEZONE
+        try:
+            conf = ModuleSetting.get_for_module(
+                'treeio.core', 'default_timezone')[0]
+            timezone = conf.value
+        except Exception:
+            pass
+        self.fields['default_timezone'].initial = timezone
+
+        self.fields['language'].choices = getattr(
+            settings, 'HARDTREE_LANGUAGES', [('en', 'English')])
+        language = getattr(settings, 'HARDTREE_LANGUAGES_DEFAULT', '')
+        try:
+            conf = ModuleSetting.get_for_module('treeio.core', 'language')[0]
+            language = conf.value
+        except IndexError:
+            pass
+        self.fields['language'].initial = language
+
+        if getattr(settings, 'HARDTREE_SUBSCRIPTION_CUSTOMIZATION', True):
+            logopath = ''
+            try:
+                conf = ModuleSetting.get_for_module(
+                    'treeio.core', 'logopath')[0]
+                logopath = conf.value
+            except:
+                pass
+
+            if logopath:
+                match = re.match('.*[a-z0-9]{32}__(?P<filename>.+)$', logopath)
+                if match:
+                    logopath = match.group('filename')
+                form_field = forms.ChoiceField(
+                    label=_("Logo"), widget=forms.RadioSelect())
+                form_field.choices = ((logopath, _("Keep existing: ") + unicode(logopath)),
+                                      ('delete', "Delete "))
+                form_field.initial = logopath
+                form_field.required = False
+                self.fields['logo'] = form_field
+            self.fields['logo'].label = _("Logo")
+        else:
+            del self.fields['logo']
+
+        self.fields['default_perspective'].label = _("Default Perspective")
+        self.fields['default_permissions'].label = _("Default Permissions")
+        self.fields['default_timezone'].label = _("Time Zone")
+        self.fields['language'].label = _("Language")
+
+    def _get_upload_name(self, filename):
+        "Returns an upload_to path to a new file"
+        while True:
+            hasher = hashlib.md5()
+            hasher.update(str(random.random()))
+            filepath = u"core/" + hasher.hexdigest() + u"__" + filename
+            fullpath = settings.MEDIA_ROOT + filepath
+            if not default_storage.exists(fullpath):
+                return filepath
+
+    def _handle_uploaded_file(self, field_name):
+        "Process an uploaded file"
+        try:
+            file = self.files[field_name]
+            filepath = self._get_upload_name(file.name)
+        except KeyError:
+            return ''
+        destination = open(settings.MEDIA_ROOT + filepath, 'wb+')
+        for chunk in file.chunks():
+            destination.write(chunk)
+        destination.close()
+        return filepath
+
+    def save(self):
+        "Form processor"
+        try:
+            ModuleSetting.set_for_module('default_perspective',
+                                         self.cleaned_data[
+                                             'default_perspective'].id,
+                                         'treeio.core')
+            ModuleSetting.set_for_module('default_permissions',
+                                         self.cleaned_data[
+                                             'default_permissions'],
+                                         'treeio.core')
+            ModuleSetting.set_for_module('default_timezone',
+                                         self.cleaned_data['default_timezone'],
+                                         'treeio.core')
+            ModuleSetting.set_for_module('language',
+                                         self.cleaned_data['language'],
+                                         'treeio.core')
+            if getattr(settings, 'HARDTREE_SUBSCRIPTION_CUSTOMIZATION', True):
+                if isinstance(self.fields['logo'], forms.FileField):
+                    logopath = self._handle_uploaded_file('logo')
+                    ModuleSetting.set_for_module(
+                        'logopath', logopath, 'treeio.core')
+
+                elif isinstance(self.fields['logo'], forms.ChoiceField):
+                    if self.cleaned_data['logo'] == 'delete':
+                        try:
+                            ModuleSetting.get_for_module(
+                                'treeio.core', 'logopath').delete()
+                        except:
+                            pass
+
+            return True
+
+        except:
+            return False
+
+
+class PerspectiveForm(forms.ModelForm):
+
+    """ Perspective form """
+    name = forms.CharField(widget=forms.TextInput(attrs={'size': '50'}))
+
+    def __init__(self, user, *args, **kwargs):
+        super(PerspectiveForm, self).__init__(*args, **kwargs)
+
+        self.fields['modules'].help_text = ""
+        self.fields['name'].label = _("Name")
+        self.fields['modules'].label = _("Modules")
+        self.fields['details'].label = _("Details")
+
+    class Meta:
+
+        "Perspective Form"
+        model = Perspective
+        fields = ('name', 'modules', 'details')
+
+
+class UserForm(forms.ModelForm):
+
+    """ User form """
+    perspective = ModelChoiceField(
+        label='Perspective', queryset=[], required=False)
+
+    def __init__(self, *args, **kwargs):
+
+        super(UserForm, self).__init__(*args, **kwargs)
+
+        if 'instance' in kwargs:
+            self.instance = kwargs['instance']
+        else:
+            self.fields['password'] = forms.CharField(max_length=255, label=_("Password"),
+                                                      widget=forms.PasswordInput(render_value=False))
+            self.fields['password_again'] = forms.CharField(max_length=255, label=_("Confirm Password"),
+                                                            widget=forms.PasswordInput(render_value=False))
+
+        self.fields['name'].label = _("Username")
+        self.fields['name'].help_text = _("Used to log in")
+        self.fields['default_group'].label = _("Default group")
+        self.fields['other_groups'].label = _("Other groups")
+        self.fields['other_groups'].help_text = ""
+        self.fields['perspective'].label = _("Perspective")
+        self.fields['perspective'].queryset = Perspective.objects.all()
+        if self.instance:
+            try:
+                self.fields[
+                    'perspective'].initial = self.instance.get_perspective()
+            except:
+                pass
+
+    def clean_name(self):
+        "Clean Name"
+        data = self.cleaned_data['name']
+        query = Q(name=data)
+        if self.instance and self.instance.id:
+            query = query & ~Q(id=self.instance.id)
+        existing = User.objects.filter(query)
+        if existing:
+            raise forms.ValidationError(
+                _("User with username %s already exists.") % data)
+        if self.instance and not self.instance.id:
+            # Check Hardtree Subscription user limit
+            user_limit = getattr(
+                settings, 'HARDTREE_SUBSCRIPTION_USER_LIMIT', 0)
+            if user_limit > 0:
+                user_number = User.objects.filter(disabled=False).count()
+                if user_number >= user_limit:
+                    raise forms.ValidationError(
+                        _("Sorry, but your subscription does not allow more than %d users. You're currently at your limit.") % (user_limit))
+        return data
+
+    def clean_password_again(self):
+        "Clean password again"
+        password1 = self.cleaned_data['password']
+        password2 = self.cleaned_data['password_again']
+        if not password1 == password2:
+            raise forms.ValidationError(_("Passwords do not match"))
+        return password2
+
+    def clean_disabled(self):
+        "Ensure the admin does not go over subscription limit by re-enabling users"
+        enable = not self.cleaned_data['disabled']
+        if self.instance and self.instance.id and enable and self.instance.disabled:
+            user_limit = getattr(
+                settings, 'HARDTREE_SUBSCRIPTION_USER_LIMIT', 0)
+            if user_limit > 0:
+                user_number = User.objects.filter(disabled=False).count()
+                if user_number >= user_limit:
+                    raise forms.ValidationError(
+                        _("Sorry, but your subscription does not allow more than %d users. You're currently at your limit.") % (user_limit))
+        return self.cleaned_data['disabled']
+
+    def save(self, *args, **kwargs):
+        "Form processor"
+
+        if self.instance.id:
+            self.instance.user.username = self.instance.name
+            self.instance.user.save()
+            super(UserForm, self).save(*args, **kwargs)
+        else:
+            new_user = django_auth.User(
+                username=self.cleaned_data['name'], password='')
+            new_user.set_password(self.cleaned_data['password'])
+            models.signals.post_save.disconnect(user_autocreate_handler, sender=django_auth.User)
+            new_user.save()
+            if getattr(settings, 'HARDTREE_SIGNALS_AUTOCREATE_USER', False):
+                models.signals.post_save.connect(user_autocreate_handler, sender=django_auth.User)
+            self.instance.user = new_user
+            super(UserForm, self).save(*args, **kwargs)
+
+        if self.cleaned_data['perspective']:
+            self.instance.set_perspective(self.cleaned_data['perspective'])
+
+        return self.instance
+
+    class Meta:
+
+        "User Form"
+        model = User
+        fields = ('name', 'default_group', 'other_groups', 'disabled')
+
+
+class PasswordForm(forms.Form):
+
+    """ Password form """
+
+    new_password = forms.CharField(max_length=255, label=_("New Password"),
+                                   widget=forms.PasswordInput(render_value=False))
+    new_password_again = forms.CharField(max_length=255, label=_("Confirm Password"),
+                                         widget=forms.PasswordInput(render_value=False))
+
+    user = None
+
+    def __init__(self, user, *args, **kwargs):
+        super(PasswordForm, self).__init__(*args, **kwargs)
+        self.user = user
+        self.fields['new_password'].label = _("New Password")
+        self.fields['new_password_again'].label = _("Confirm Password")
+
+    def clean_new_password_again(self):
+        "Clean New Password Again"
+        password1 = self.cleaned_data['new_password']
+        password2 = self.cleaned_data['new_password_again']
+        if not password1 == password2:
+            raise forms.ValidationError(_("Passwords do not match"))
+        return password2
+
+    def save(self):
+        "Save"
+        password1 = self.cleaned_data['new_password']
+        self.user.set_password(password1)
+        return self.user.save()
+
+
+class GroupForm(forms.ModelForm):
+
+    """ Group form """
+    perspective = ModelChoiceField(
+        label=_('Perspective'), queryset=[], required=False)
+
+    def __init__(self, *args, **kwargs):
+        super(GroupForm, self).__init__(*args, **kwargs)
+
+        self.fields['perspective'].label = _('Perspective')
+        self.fields['perspective'].queryset = Perspective.objects.all()
+        if self.instance:
+            try:
+                self.fields[
+                    'perspective'].initial = self.instance.get_perspective()
+            except:
+                pass
+
+    def save(self, *args, **kwargs):
+        instance = super(GroupForm, self).save(*args, **kwargs)
+        if instance.id and self.cleaned_data['perspective']:
+            instance.set_perspective(self.cleaned_data['perspective'])
+        return instance
+
+    class Meta:
+
+        "Group Form"
+        model = Group
+        fields = ('name', 'parent', 'details')
+
+
+class PageForm(forms.ModelForm):
+
+    """ Static Page form """
+    title = forms.CharField(widget=forms.TextInput(attrs={'size': '50'}))
+
+    def __init__(self, *args, **kwargs):
+        super(PageForm, self).__init__(*args, **kwargs)
+
+    class Meta:
+
+        "Page Form"
+        model = Page
+        fields = ('name', 'title', 'folder', 'published', 'body')
+
+
+class PageFolderForm(forms.ModelForm):
+
+    """ PageFolder for Static Pages form """
+    name = forms.CharField(widget=forms.TextInput(attrs={'size': '50'}))
+
+    def __init__(self, *args, **kwargs):
+        super(PageFolderForm, self).__init__(*args, **kwargs)
+
+    class Meta:
+
+        "Page Folder Form"
+        model = PageFolder
+        fields = ('name', 'details')
+
+
+class FilterForm(forms.ModelForm):
+
+    """ Filter form for Modules definition """
+
+    def __init__(self, user, _type=None, *args, **kwargs):
+        if _type is None:
+            _type = []
+        super(FilterForm, self).__init__(*args, **kwargs)
+
+        if 'perspective' in _type:
+            del self.fields['name']
+            self.fields['modules'].help_text = ""
+
+        if 'module' in _type:
+            del self.fields['name']
+            self.fields['modules'].help_text = ""
+
+    class Meta:
+
+        "Filter"
+        model = Perspective
+        fields = ('name', 'modules')
+
+
+class ContactSetupForm(ContactForm):
+
+    """ ContactSetupForm """
+
+    name = forms.CharField(
+        max_length=256, widget=forms.TextInput(attrs={'size': '50'}))
+    instance = None
+    files = {}
+
+    def __init__(self, contact_type, instance=None, *args, **kwargs):
+        "Populates form with fields from given ContactType"
+
+        if instance:
+            self.instance = instance
+            values = instance.contactvalue_set.all()
+
+        super(ContactForm, self).__init__(*args, **kwargs)
+
+        self.fields['name'].label = _('Name')
+
+        if 'files' in kwargs:
+            self.files = kwargs['files']
+
+        for field in contact_type.fields.all():
+            if self.instance:
+                initial_field_name = self._get_free_field_name(field)
+                self.fields[initial_field_name] = self._get_form_field(field)
+                for value in values:
+                    if value.field == field:
+                        field_name = self._get_free_field_name(field)
+                        self.fields[field_name] = self._get_form_field(
+                            field, value)
+                        if initial_field_name in self.fields:
+                            del self.fields[initial_field_name]
+            else:
+                field_name = self._get_free_field_name(field)
+                self.fields[field_name] = self._get_form_field(field)
+
+        if self.instance:
+            self.fields['name'].initial = self.instance.name
diff --git a/data/treeio/treeio/treeio/core/administration/views.py b/data/treeio/treeio/treeio/core/administration/views.py
new file mode 100644
index 0000000..8f65128
--- /dev/null
+++ b/data/treeio/treeio/treeio/core/administration/views.py
@@ -0,0 +1,848 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+"""
+Core module views
+"""
+
+from django.shortcuts import get_object_or_404
+from django.template import RequestContext
+from django.http import HttpResponseRedirect
+from django.core.urlresolvers import reverse
+from django.contrib.sites.models import RequestSite
+from django.utils.translation import ugettext as _
+from treeio.core.conf import settings
+from django.db.models import Q
+from treeio.core.rendering import render_to_response
+from treeio.core.models import User, Group, Invitation, Perspective, Module, ModuleSetting, Page, PageFolder
+from treeio.core.administration.forms import PerspectiveForm, UserForm, PasswordForm, \
+    GroupForm, PageForm, PageFolderForm, FilterForm, SettingsForm, PERMISSION_CHOICES
+from treeio.core.mail import EmailInvitation
+from treeio.core.decorators import module_admin_required, treeio_login_required, handle_response_format
+
+from treeio.identities.models import ContactType
+from treeio.core.administration.forms import ContactSetupForm
+import re
+
+
+def _get_filter_query(args):
+    "Creates a query to filter Modules based on FilterForm arguments"
+    query = Q(trash=False)
+
+    for arg in args:
+        if hasattr(Perspective, arg) and args[arg]:
+            kwargs = {unicode(arg + '__id'): long(args[arg])}
+            query = query & Q(**kwargs)
+
+    return query
+
+
+@handle_response_format
+@treeio_login_required
+@module_admin_required()
+def index_perspectives(request, response_format='html'):
+    "Perspective list"
+
+    query = _get_filter_query(request.GET)
+    perspectives = Perspective.objects.filter(query).order_by('name')
+
+    filters = FilterForm(
+        request.user.profile, 'perspective', request.GET)
+
+    message = request.session.pop('message', '')
+
+    return render_to_response('core/administration/index_perspectives',
+                              {'perspectives': perspectives,
+                               'filters': filters,
+                               'message': message},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+@module_admin_required()
+def index_modules(request, response_format='html'):
+    "Module list"
+    modules = Module.objects.all().order_by('title')
+
+    return render_to_response('core/administration/index_modules',
+                              {'modules': modules},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+#
+# Perspectives
+#
+
+
+@handle_response_format
+@treeio_login_required
+@module_admin_required()
+def perspective_view(request, perspective_id, response_format='html'):
+    "Perspective view"
+    perspective = get_object_or_404(Perspective, pk=perspective_id)
+
+    all_modules = Module.objects.all()
+
+    message = request.session.pop('message', '')
+
+    return render_to_response('core/administration/perspective_view',
+                              {'perspective': perspective,
+                               'all_modules': all_modules,
+                               'message': message},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+@module_admin_required()
+def perspective_edit(request, perspective_id, response_format='html'):
+    "Perspective edit"
+    perspective = get_object_or_404(Perspective, pk=perspective_id)
+    # Don't let users delete their last perspective
+    other_perspectives = Perspective.objects.filter(
+        trash=False).exclude(id=perspective_id)
+    admin_module = Module.objects.filter(name='treeio.core')[0]
+
+    if request.POST:
+        if 'cancel' not in request.POST:
+            form = PerspectiveForm(
+                request.user.profile, request.POST, instance=perspective)
+            if form.is_valid():
+                perspective = form.save()
+                modules = perspective.modules.all()
+                if modules and admin_module not in modules:
+                    if not other_perspectives.filter(Q(modules=admin_module) | Q(modules__isnull=True)):
+                        perspective.modules.add(admin_module)
+                        request.session['message'] = _(
+                            "This is your only Perspective with Administration module. You would be locked out!")
+                return HttpResponseRedirect(reverse('core_admin_perspective_view', args=[perspective.id]))
+        else:
+            return HttpResponseRedirect(reverse('core_admin_perspective_view', args=[perspective.id]))
+    else:
+        form = PerspectiveForm(
+            request.user.profile, instance=perspective)
+
+    request.session.pop('message', '')
+
+    return render_to_response('core/administration/perspective_edit',
+                              {'perspective': perspective,
+                               'form': form},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+@module_admin_required()
+def perspective_delete(request, perspective_id, response_format='html'):
+    "Perspective delete"
+
+    perspective = get_object_or_404(Perspective, pk=perspective_id)
+    all_modules = Module.objects.all()
+    message = ""
+
+    # Don't let users delete their last perspective
+    other_perspectives = Perspective.objects.filter(
+        trash=False).exclude(id=perspective_id)
+    admin_module = all_modules.filter(name='treeio.core')[0]
+    if not other_perspectives:
+        message = _("This is your only Perspective.")
+    elif not other_perspectives.filter(Q(modules=admin_module) | Q(modules__isnull=True)):
+        message = _(
+            "This is your only Perspective with Administration module. You would be locked out!")
+    else:
+        if request.POST:
+            if 'delete' in request.POST:
+                if 'trash' in request.POST:
+                    perspective.trash = True
+                    perspective.save()
+                else:
+                    perspective.delete()
+                return HttpResponseRedirect(reverse('core_admin_index_perspectives'))
+            elif 'cancel' in request.POST:
+                return HttpResponseRedirect(reverse('core_admin_perspective_view', args=[perspective.id]))
+
+    return render_to_response('core/administration/perspective_delete',
+                              {'perspective': perspective,
+                               'all_modules': all_modules,
+                               'message': message},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+@module_admin_required()
+def perspective_add(request, response_format='html'):
+    "Perspective add"
+
+    if request.POST:
+        if 'cancel' not in request.POST:
+            perspective = Perspective()
+            form = PerspectiveForm(
+                request.user.profile, request.POST, instance=perspective)
+            if form.is_valid():
+                perspective = form.save()
+                perspective.set_user_from_request(request)
+                return HttpResponseRedirect(reverse('core_admin_perspective_view', args=[perspective.id]))
+        else:
+            return HttpResponseRedirect(reverse('core_admin_index_perspectives'))
+    else:
+        form = PerspectiveForm(request.user.profile)
+
+    return render_to_response('core/administration/perspective_add',
+                              {'form': form.as_ul()},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+#
+# Modules
+#
+
+
+@handle_response_format
+@treeio_login_required
+@module_admin_required()
+def module_view(request, module_id, response_format='html'):
+    "Module view"
+    module = get_object_or_404(Module, pk=module_id)
+
+    return render_to_response('core/administration/module_view',
+                              {'module': module},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+#
+# Users
+#
+
+
+@handle_response_format
+@treeio_login_required
+@module_admin_required()
+def index_users(request, response_format='html'):
+    "User List"
+
+    users = User.objects.order_by('user__username')
+
+    return render_to_response('core/administration/index_users',
+                              {'users': users},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+@module_admin_required()
+def user_view(request, user_id, response_format='html'):
+    "User view"
+
+    profile = get_object_or_404(User, pk=user_id)
+    try:
+        contacts = profile.contact_set.exclude(trash=True)
+    except:
+        contacts = []
+
+    modules = profile.get_perspective().get_modules()
+
+    return render_to_response('core/administration/user_view',
+                              {'profile': profile, 'contacts': contacts,
+                                  'modules': modules},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+@module_admin_required()
+def user_edit(request, user_id, response_format='html'):
+    "User edit"
+
+    profile = get_object_or_404(User, pk=user_id)
+    if request.POST:
+        if 'cancel' not in request.POST:
+            form = UserForm(request.POST, instance=profile)
+            if form.is_valid():
+                profile = form.save()
+                return HttpResponseRedirect(reverse('core_admin_user_view', args=[profile.id]))
+        else:
+            return HttpResponseRedirect(reverse('core_admin_user_view', args=[profile.id]))
+    else:
+        form = UserForm(instance=profile)
+
+    return render_to_response('core/administration/user_edit',
+                              {'profile': profile,
+                               'form': form},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+@module_admin_required()
+def contact_setup(request, response_format='html'):
+
+    profile = request.user.profile
+    contact = profile.get_contact()
+
+    def get_contact_type(description):
+        c_type = None
+        slug = description.lower()
+        name = slug.capitalize()
+        try:
+            c_type = ContactType.objects.get(Q(name=name) | Q(slug=slug))
+        except:
+            contact_types = ContactType.objects.all()
+            if contact_types.count():
+                c_type = contact_types[0]
+        return c_type
+
+    company_type = get_contact_type('company')
+
+    company = None
+    if contact:
+        person_type = contact.contact_type
+        if contact.parent and contact.parent.contact_type == company_type:
+            company = contact.parent
+    else:
+        person_type = get_contact_type('person')
+
+    if person_type and request.POST:
+        contact_form = ContactSetupForm(
+            person_type, instance=contact, data=request.POST, files=request.FILES, prefix='person')
+        company_form = ContactSetupForm(
+            company_type, instance=company, data=request.POST, files=request.FILES, prefix='company')
+        if contact_form.is_valid() and company_form.is_valid():
+            company = company_form.save(request, company_type)
+            contact_form.cleaned_data['parent'] = company
+            contact_form.cleaned_data['related_user'] = profile
+            contact_form.save(request, person_type)
+            return HttpResponseRedirect(reverse('identities_contact_me'))
+    else:
+        contact_form = ContactSetupForm(
+            person_type, instance=contact, prefix='person') if person_type else None
+        company_form = ContactSetupForm(
+            company_type, instance=company, prefix='company') if company_type else None
+
+    return render_to_response('core/administration/contact_settings',
+                              {'contact_form': contact_form,
+                               'company_form': company_form},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def user_password(request, user_id, response_format='html'):
+    "User change password form"
+
+    profile = get_object_or_404(User, pk=user_id)
+    if request.POST:
+        if 'cancel' not in request.POST:
+            form = PasswordForm(profile.user, request.POST)
+            if form.is_valid():
+                form.save()
+                return HttpResponseRedirect(reverse('core_admin_user_view', args=[profile.id]))
+        else:
+            return HttpResponseRedirect(reverse('core_admin_user_view', args=[profile.id]))
+    else:
+        form = PasswordForm(profile.user)
+
+    return render_to_response('core/administration/user_password',
+                              {'profile': profile, 'form': form},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+@module_admin_required()
+def user_delete(request, user_id, response_format='html'):
+    "User delete"
+
+    profile = get_object_or_404(User, pk=user_id)
+    message = ""
+
+    if profile == request.user.profile:
+        message = _("This is you!")
+    else:
+        if request.POST:
+            if 'delete' in request.POST:
+                profile.delete()
+                return HttpResponseRedirect(reverse('core_admin_index_users'))
+            elif 'cancel' in request.POST:
+                return HttpResponseRedirect(reverse('core_admin_user_view', args=[profile.id]))
+
+    return render_to_response('core/administration/user_delete',
+                              {'profile': profile,
+                               'message': message},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+@module_admin_required()
+def user_add(request, response_format='html'):
+    "User add"
+
+    user_limit = getattr(settings, 'HARDTREE_SUBSCRIPTION_USER_LIMIT', 0)
+
+    if user_limit > 0:
+        user_number = User.objects.filter(disabled=False).count()
+        if user_number >= user_limit:
+            return HttpResponseRedirect(reverse('core_billing_upgrade'))
+
+    if request.POST:
+        if 'cancel' not in request.POST:
+            form = UserForm(request.POST)
+            if form.is_valid():
+                profile = form.save()
+                return HttpResponseRedirect(reverse('core_admin_user_view', args=[profile.id]))
+        else:
+            return HttpResponseRedirect(reverse('core_admin_index_users'))
+    else:
+        form = UserForm()
+
+    return render_to_response('core/administration/user_add',
+                              {'form': form},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+#
+# Invites
+#
+
+
+@handle_response_format
+@treeio_login_required
+@module_admin_required()
+def user_invite(request, emails=None, response_format='html'):
+    "Invite people to Hardtree"
+
+    user_limit = getattr(settings, 'HARDTREE_SUBSCRIPTION_USER_LIMIT', 0)
+
+    # Check whether any invites can be made at all
+    if user_limit > 0:
+        user_number = User.objects.filter(disabled=False).count()
+        invites_left = user_limit - user_number
+        if user_number >= user_limit:
+            return HttpResponseRedirect(reverse('core_billing_upgrade'))
+    else:
+        invites_left = 100000000000000
+
+    invited = []
+    if request.POST or emails:
+        sender = request.user.profile
+        default_group = sender.default_group
+        domain = RequestSite(request).domain
+        if not emails:
+            emails = request.POST.get('emails').split(',')
+
+        # Check whether the number of invites + current users exceeds the limit
+        if user_limit > 0:
+            user_number = User.objects.filter(disabled=False).count()
+            if len(emails) + user_number > user_limit:
+                return HttpResponseRedirect(reverse('core_billing_upgrade'))
+
+        for email in emails:
+            email = email.strip()
+            if len(email) > 7 and re.match("^.+\\@(\\[?)[a-zA-Z0-9\\-\\.]+\\.([a-zA-Z]{2,3}|[0-9]{1,3})(\\]?)$", email) is not None:
+                if user_limit > 0 and user_number >= user_limit:
+                    break
+                invitation = Invitation(
+                    sender=request.user.profile, email=email, default_group=default_group)
+                invitation.save()
+                EmailInvitation(
+                    invitation=invitation, sender=sender, domain=domain).send_email()
+                invited.append(email)
+
+    return render_to_response('core/administration/user_invite',
+                              {'user_limit': user_limit,
+                               'emails': emails,
+                               'invites_left': invites_left,
+                               'invited': invited},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+#
+# Groups
+#
+
+
+@handle_response_format
+@treeio_login_required
+@module_admin_required()
+def index_groups(request, response_format='html'):
+    "Group List"
+
+    groups = Group.objects.order_by('parent', 'name')
+
+    return render_to_response('core/administration/index_groups',
+                              {'groups': groups},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+@module_admin_required()
+def group_view(request, group_id, response_format='html'):
+    "Group view"
+
+    group = get_object_or_404(Group, pk=group_id)
+    members = User.objects.filter(
+        Q(default_group=group) | Q(other_groups=group)).distinct()
+    subgroups = Group.objects.filter(parent=group)
+
+    return render_to_response('core/administration/group_view',
+                              {'group': group,
+                               'subgroups': subgroups,
+                               'members': members},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+@module_admin_required()
+def group_edit(request, group_id, response_format='html'):
+    "Group edit"
+
+    group = get_object_or_404(Group, pk=group_id)
+
+    if request.POST:
+        if 'cancel' not in request.POST:
+            form = GroupForm(request.POST, instance=group)
+            if form.is_valid():
+                group = form.save()
+                return HttpResponseRedirect(reverse('core_admin_group_view', args=[group.id]))
+        else:
+            return HttpResponseRedirect(reverse('core_admin_group_view', args=[group.id]))
+    else:
+        form = GroupForm(instance=group)
+
+    return render_to_response('core/administration/group_edit',
+                              {'group': group,
+                               'form': form},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+@module_admin_required()
+def group_delete(request, group_id, response_format='html'):
+    "Group delete"
+
+    group = get_object_or_404(Group, pk=group_id)
+    members = User.objects.filter(
+        Q(default_group=group) | Q(other_groups=group)).distinct()
+    subgroups = Group.objects.filter(parent=group)
+
+    if request.POST:
+        if 'delete' in request.POST:
+            group.delete()
+            return HttpResponseRedirect(reverse('core_admin_index_groups'))
+        elif 'cancel' in request.POST:
+            return HttpResponseRedirect(reverse('core_admin_group_view', args=[group.id]))
+
+    return render_to_response('core/administration/group_delete',
+                              {'group': group,
+                               'members': members,
+                               'subgroups': subgroups},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+@module_admin_required()
+def group_add(request, response_format='html'):
+    "Group add"
+
+    if request.POST:
+        if 'cancel' not in request.POST:
+            form = GroupForm(request.POST)
+            if form.is_valid():
+                group = form.save()
+                return HttpResponseRedirect(reverse('core_admin_group_view', args=[group.id]))
+        else:
+            return HttpResponseRedirect(reverse('core_admin_index_groups'))
+
+    else:
+        form = GroupForm()
+
+    return render_to_response('core/administration/group_add',
+                              {'form': form},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+#
+# Pages
+#
+
+
+@handle_response_format
+@treeio_login_required
+@module_admin_required()
+def index_pages(request, response_format='html'):
+    "Static Pages list"
+    pages = Page.objects.all().order_by('name')
+    folders = PageFolder.objects.all().order_by('name')
+
+    return render_to_response('core/administration/index_pages',
+                              {'pages': pages, 'folders': folders},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+@module_admin_required()
+def pagefolder_view(request, folder_id, response_format='html'):
+    "Folder for Static Pages view"
+
+    folder = get_object_or_404(PageFolder, pk=folder_id)
+    pages = Page.objects.filter(folder=folder).order_by('name')
+
+    return render_to_response('core/administration/pagefolder_view',
+                              {'folder': folder, 'pages': pages},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+@module_admin_required()
+def pagefolder_edit(request, folder_id, response_format='html'):
+    "Folder for Static Pages edit"
+
+    folder = get_object_or_404(PageFolder, pk=folder_id)
+    if request.POST:
+        form = PageFolderForm(request.POST, instance=folder)
+        if form.is_valid():
+            folder = form.save()
+            return HttpResponseRedirect(reverse('core_admin_pagefolder_view', args=[folder.id]))
+    else:
+        form = PageFolderForm(instance=folder)
+
+    return render_to_response('core/administration/pagefolder_edit',
+                              {'folder': folder, 'form': form},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+@module_admin_required()
+def pagefolder_delete(request, folder_id, response_format='html'):
+    "Folder for Static Pages delete"
+
+    folder = get_object_or_404(PageFolder, pk=folder_id)
+    pages = Page.objects.filter(folder=folder).order_by('name')
+    if request.POST:
+        if 'delete' in request.POST:
+            folder.delete()
+            return HttpResponseRedirect(reverse('core_admin_index_pages'))
+        elif 'cancel' in request.POST:
+            return HttpResponseRedirect(reverse('core_admin_pagefolder_view', args=[folder.id]))
+
+    return render_to_response('core/administration/pagefolder_delete',
+                              {'folder': folder, 'pages': pages},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+@module_admin_required()
+def pagefolder_add(request, response_format='html'):
+    "Folder for Static Pages add"
+
+    if request.POST:
+        form = PageFolderForm(request.POST)
+        if form.is_valid():
+            folder = form.save()
+            return HttpResponseRedirect(reverse('core_admin_pagefolder_view', args=[folder.id]))
+    else:
+        form = PageFolderForm()
+
+    return render_to_response('core/administration/pagefolder_add',
+                              {'form': form},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@module_admin_required()
+def page_view(request, page_id, response_format='html'):
+    "Static Page view"
+    page = get_object_or_404(Page, pk=page_id)
+
+    return render_to_response('core/administration/page_view',
+                              {'page': page},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+@module_admin_required()
+def page_edit(request, page_id, response_format='html'):
+    "Static Page edit"
+
+    page = get_object_or_404(Page, pk=page_id)
+    if request.POST:
+        form = PageForm(request.POST, instance=page)
+        if form.is_valid():
+            page = form.save()
+            return HttpResponseRedirect(reverse('core_admin_page_view', args=[page.id]))
+    else:
+        form = PageForm(instance=page)
+
+    return render_to_response('core/administration/page_edit',
+                              {'page': page, 'form': form},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+@module_admin_required()
+def page_delete(request, page_id, response_format='html'):
+    "Static Page delete"
+
+    page = get_object_or_404(Page, pk=page_id)
+    if request.POST:
+        if 'delete' in request.POST:
+            page.delete()
+            return HttpResponseRedirect(reverse('core_admin_index_pages'))
+        elif 'cancel' in request.POST:
+            return HttpResponseRedirect(reverse('core_admin_page_view', args=[page.id]))
+
+    return render_to_response('core/administration/page_delete',
+                              {'page': page},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+@module_admin_required()
+def page_add(request, response_format='html'):
+    "Static Page add"
+
+    if request.POST:
+        form = PageForm(request.POST)
+        if form.is_valid():
+            page = form.save()
+            return HttpResponseRedirect(reverse('core_admin_page_view', args=[page.id]))
+    else:
+        form = PageForm()
+
+    return render_to_response('core/administration/page_add',
+                              {'form': form},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+#
+# Setup Guide
+#
+
+
+@treeio_login_required
+@module_admin_required()
+def setup(request, response_format='html'):
+    "Quick set-up page"
+
+    modules = Module.objects.all()
+
+    for module in modules:
+        if module.name in ('treeio.projects', 'treeio.sales', 'treeio.services'):
+            module.major = True
+        else:
+            module.major = False
+
+    context = {'modules': modules}
+
+    return render_to_response('core/administration/setup', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+#
+# Settings
+#
+@handle_response_format
+@treeio_login_required
+@module_admin_required()
+def settings_view(request, response_format='html'):
+    "Settings view"
+
+    # default permissions
+    try:
+        conf = ModuleSetting.get_for_module(
+            'treeio.core', 'default_permissions')[0]
+        default_permissions = conf.value
+    except:
+        default_permissions = settings.HARDTREE_DEFAULT_PERMISSIONS
+
+    default_permissions_display = default_permissions
+    for key, value in PERMISSION_CHOICES:
+        if key == default_permissions:
+            default_permissions_display = _(value)
+
+    # default perspective
+    try:
+        conf = ModuleSetting.get_for_module(
+            'treeio.core', 'default_perspective')[0]
+        default_perspective = Perspective.objects.get(pk=long(conf.value))
+    except:
+        default_perspective = None
+
+    # language
+    language = getattr(settings, 'HARDTREE_LANGUAGES_DEFAULT', '')
+    try:
+        conf = ModuleSetting.get_for_module('treeio.core', 'language')[0]
+        language = conf.value
+    except IndexError:
+        pass
+    all_languages = getattr(
+        settings, 'HARDTREE_LANGUAGES', [('en', 'English')])
+
+    logopath = ''
+    try:
+        conf = ModuleSetting.get_for_module('treeio.core', 'logopath')[0]
+        logopath = conf.value
+        match = re.match('.*[a-z0-9]{32}__(?P<filename>.+)$', logopath)
+        if match:
+            logopath = match.group('filename')
+    except:
+        pass
+
+    # time zone
+    default_timezone = settings.HARDTREE_SERVER_DEFAULT_TIMEZONE
+    try:
+        conf = ModuleSetting.get_for_module(
+            'treeio.core', 'default_timezone')[0]
+        default_timezone = conf.value
+    except Exception:
+        default_timezone = getattr(
+            settings, 'HARDTREE_SERVER_TIMEZONE')[default_timezone][0]
+    all_timezones = getattr(settings, 'HARDTREE_SERVER_TIMEZONE', [
+                            (1, '(GMT-11:00) International Date Line West')])
+
+    return render_to_response('core/administration/settings_view',
+                              {
+                                  'default_permissions': default_permissions,
+                                  'default_permissions_display': default_permissions_display,
+                                  'default_perspective': default_perspective,
+                                  'language': language,
+                                  'all_languages': all_languages,
+                                  'logopath': logopath,
+                                  'default_timezone': default_timezone,
+                                  'all_timezones': all_timezones
+                              },
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+@module_admin_required()
+def settings_edit(request, response_format='html'):
+    "Settings edit"
+
+    if request.POST:
+        if 'cancel' not in request.POST:
+            form = SettingsForm(
+                request.user.profile, request.POST, request.FILES)
+            if form.is_valid():
+                form.save()
+                return HttpResponseRedirect(reverse('core_settings_view'))
+        else:
+            return HttpResponseRedirect(reverse('core_settings_view'))
+
+    else:
+        form = SettingsForm(request.user.profile)
+
+    return render_to_response('core/administration/settings_edit',
+                              {
+                                  'form': form,
+                              },
+                              context_instance=RequestContext(request), response_format=response_format)
diff --git a/data/treeio/treeio/treeio/core/ajax/converter.py b/data/treeio/treeio/treeio/core/ajax/converter.py
new file mode 100644
index 0000000..6d7c443
--- /dev/null
+++ b/data/treeio/treeio/treeio/core/ajax/converter.py
@@ -0,0 +1,225 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+"""
+Converter for AJAX response
+
+Takes HTML rendered response from Django and return JSON-serializable dict
+"""
+from collections import OrderedDict
+from django.forms import BaseForm, TextInput, CharField, HiddenInput, MultiValueField, MultiWidget
+from django.utils.safestring import mark_safe
+
+from treeio.core.ajax.rules import apply_rules
+
+
+class MultiHiddenWidget(MultiWidget):
+    "Renders multiple hidden widgets for initial values to use in autocomplete"
+
+    def __init__(self, initial=None, choices=None, attrs=None):
+        if initial is None:
+            initial = []
+        if choices is None:
+            choices = []
+        if attrs is None:
+            attrs = {}
+        widgets = []
+        if initial:
+            for i in initial:
+                if i:
+                    initial_label = ''
+                    for choice in choices:
+                        if choice[0] == i:
+                            initial_label = choice[1]
+                            break
+                    widgets.append(
+                        HiddenInput(attrs=dict(attrs, label=initial_label)))
+        super(MultiHiddenWidget, self).__init__(widgets=widgets, attrs=attrs)
+
+    def render(self, name, value, attrs=None):
+        if self.is_localized:
+            for widget in self.widgets:
+                widget.is_localized = self.is_localized
+        # value is a list of values, each corresponding to a widget
+        # in self.widgets.
+        if not isinstance(value, list):
+            value = self.decompress(value)
+        output = [u'<span id="%s_%s">' % (u'multi', name)]
+        final_attrs = self.build_attrs(attrs)
+        id_ = final_attrs.get('id', None)
+        for i, widget in enumerate(self.widgets):
+            try:
+                widget_value = value[i]
+            except IndexError:
+                widget_value = None
+            if id_:
+                final_attrs = dict(final_attrs, id=id_)
+            output.append(widget.render(name, widget_value, final_attrs))
+        output.append(u'</span>')
+        return mark_safe(self.format_output(output))
+
+    def decompress(self, value):
+        if not value:
+            value = []
+        else:
+            value = [value]
+        return value
+
+
+class MultiHiddenField(MultiValueField):
+    "Multiple choice hidden field"
+    widget = MultiHiddenWidget
+
+    def __init__(self, required=False, widget=None, initial=None, choices=None, fields=None):
+        if choices is None:
+            choices = []
+        if fields is None:
+            fields = []
+        widget = MultiHiddenWidget(initial=initial, choices=choices)
+        super(MultiHiddenField, self).__init__(fields=fields, widget=widget, initial=initial,
+                                               required=required, label='', help_text='')
+
+    def compress(self, data_list):
+        return data_list
+
+
+def convert_to_ajax(page, context_instance):
+    "Converts Django HTML response into AJAX response represented by a dict()"
+
+    response = apply_rules(page)
+
+    # The following is Deprecated for Django 1.3
+    # if 'module_content' in response:
+    # module_content = HttpResponse(response['module_content'], mimetype='text/html')
+    #    response['module_content'] = csrf().process_response(context_instance['request'], module_content).content
+
+    return response
+
+
+def preprocess_context(context):
+    "Prepares context to be rendered for AJAX"
+
+    # Process autocomplete-multiple fields
+    for key in context:
+        if isinstance(context[key], BaseForm):
+            form = context[key]
+            for fname in form.fields:
+                # skip newly added fields to avoid looping infinitely
+                if "autocomplete" not in fname:
+                    field = form.fields[fname]
+                    try:
+                        # find autocomplete fields
+                        if field.widget.attrs and 'callback' in field.widget.attrs and 'autocomplete' in \
+                                field.widget.attrs['class']:
+
+                            # save existing attributes
+                            old_attrs = field.widget.attrs
+
+                            # replace current widget with hidden input
+                            field.widget = HiddenInput()
+
+                            # get the current field value
+                            if not field.initial and fname in form.initial:
+                                field.initial = form.initial[fname]
+
+                            # if the field has choices replace value with it's
+                            # actual label
+                            initial_name = field.initial
+                            if field.initial and field.choices:
+                                for choice in field.choices:
+                                    if choice[0] == field.initial:
+                                        initial_name = choice[1]
+                                        break
+
+                            # create new field
+                            new_field = CharField(widget=TextInput(attrs=old_attrs),
+                                                  label=field.label,
+                                                  required=field.required,
+                                                  help_text=field.help_text,
+                                                  initial=initial_name)
+
+                            # update fields in context
+                            form.fields.update(
+                                {fname: field, "autocomplete_" + fname: new_field})
+                            if fname in form.errors:
+                                form.errors[
+                                    "autocomplete_" + fname] = form.errors[fname]
+                                del form.errors[fname]
+
+                            # restore original field order
+                            order = form.fields.keyOrder
+                            order.insert(order.index(fname),
+                                         order.pop(order.index("autocomplete_" + fname)))
+
+                    except:
+                        pass
+
+    # Process autocomplete fields
+    for key in context:
+        if isinstance(context[key], BaseForm):
+            form = context[key]
+            for fname in form.fields:
+                # skip newly added fields to avoid looping infinitely
+                if not "autocomplete" in fname:
+                    field = form.fields[fname]
+                    try:
+                        # find autocomplete fields
+                        if field.widget.attrs and 'callback' in field.widget.attrs and 'multicomplete' in \
+                                field.widget.attrs['class']:
+
+                            # save existing attributes
+                            old_attrs = field.widget.attrs
+
+                            # replace current widget with hidden input
+                            field.widget = HiddenInput()
+
+                            # get the current field value
+                            if not field.initial and fname in form.initial:
+                                field.initial = form.initial[fname]
+
+                            # if the field has choices replace value with it's
+                            # actual label
+                            initial_name = ''
+                            if field.initial and field.choices:
+                                for choice in field.choices:
+                                    if choice[0] in field.initial:
+                                        initial_name += choice[1] + u', '
+
+                            # create new field
+                            new_field = CharField(widget=TextInput(attrs=old_attrs),
+                                                  label=field.label,
+                                                  required=field.required,
+                                                  help_text=field.help_text,
+                                                  initial=initial_name)
+
+                            # hidden fields
+                            choices = getattr(field, 'choices', None)
+                            hidden_field = MultiHiddenField(fields=[field],
+                                                            required=field.required,
+                                                            initial=field.initial,
+                                                            choices=choices)
+
+                            # update fields in context
+                            form.fields.update(
+                                {fname: hidden_field, "multicomplete_" + fname: new_field})
+                            if fname in form.errors:
+                                form.errors[
+                                    "multicomplete_" + fname] = form.errors[fname]
+                                del form.errors[fname]
+
+                            # todo: the code below was commented out because on django 1.7 it uses a OrderedDict,
+                            # the SortedDict class was removed from django, this needs further investigation to check
+                            #  if everything is working as it should, as you can see the code was inserting in a
+                            # specific index and I don't know how to do it on OrderedDict
+
+                            # restore original field order
+                            # order = form.fields.keys()
+                            # order.insert(order.index(fname),
+                            #              order.pop(order.index("multicomplete_" + fname)))
+                            form.fields.pop("multicomplete_" + fname)
+                    except:
+                        raise
+
+    return context
diff --git a/data/treeio/treeio/treeio/core/api/doc.py b/data/treeio/treeio/treeio/core/api/doc.py
new file mode 100644
index 0000000..a16ffa1
--- /dev/null
+++ b/data/treeio/treeio/treeio/core/api/doc.py
@@ -0,0 +1,280 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+# -*- coding: utf-8 -*-
+
+import re
+import sys
+import inspect
+import piston3.handler as handler
+
+from types import ModuleType
+from resource import CsrfExemptResource
+from handlers import ObjectHandlerMetaClass
+
+from django.core.urlresolvers import get_resolver, get_callable, get_script_prefix
+from django.utils.translation import ugettext_lazy as _
+from django.shortcuts import render_to_response
+from django.template import RequestContext
+from django.db import models
+
+
+def get_module(mdl):
+    if isinstance(mdl, basestring):
+        __import__(mdl)
+        return sys.modules[mdl]
+    elif isinstance(mdl, ModuleType):
+        return mdl
+    else:
+        raise ValueError("mdl must be string or module type.")
+
+
+def generate_doc(handler_cls):
+    """
+    Returns a `HandlerDocumentation` object
+    for the given handler. Use this to generate
+    documentation for your API.
+    """
+    if not (type(handler_cls) is ObjectHandlerMetaClass
+            or type(handler_cls) is handler.HandlerMetaClass):
+        raise ValueError("Give me handler, not %s" % type(handler_cls))
+
+    return HandlerDocumentation(handler_cls)
+
+
+def get_field_data_type(field):
+    """Returns the description for a given field type, if it exists,
+    Fields' descriptions can contain format strings, which will be interpolated
+    against the values of field.__dict__ before being output."""
+
+    return field.description % field.__dict__
+
+
+class HandlerMethod(object):
+    def __init__(self, method, stale=False):
+        self.method = method
+        self.stale = stale
+
+    def iter_args(self):
+        args, _, _, defaults = inspect.getargspec(self.method)  # NOQA
+
+        for idx, arg in enumerate(args):
+            if arg in ('self', 'request', 'form'):
+                continue
+
+            didx = len(args) - idx
+
+            if defaults and len(defaults) >= didx:
+                yield (arg, str(defaults[-didx]))
+            else:
+                yield (arg, None)
+
+    def get_signature(self, parse_optional=True):
+        spec = ""
+
+        for argn, argdef in self.iter_args():
+            spec += argn
+
+            if argdef:
+                spec += '=%s' % argdef
+
+            spec += ', '
+
+        spec = spec.rstrip(", ")
+
+        if parse_optional:
+            return spec.replace("=None", "=<optional>")
+
+        return spec
+
+    signature = property(get_signature)
+
+    def get_fields(self):
+        to_update = False
+        doc = inspect.getdoc(self.method)
+        if not doc and issubclass(self.method.im_class.model, models.Model):
+            fields = None
+            if self.method.__name__ == 'read':
+                fields = self.method.im_class.fields if self.method.im_class.fields else tuple(
+                    attr.name for attr in self.method.im_class.model._meta.local_fields)
+            elif self.method.__name__ in ('create', 'update'):
+                to_update = True
+                if hasattr(self.method.im_class, 'form') and \
+                        hasattr(self.method.im_class.form, '_meta'):
+                    fields = self.method.im_class.form._meta.fields
+                else:
+                    fields = self.method.im_class.fields
+            if fields:
+                for field in fields:
+                    for mfield in self.method.im_class.model._meta.fields:
+                        if mfield.name == field:
+                            yield {'name': mfield.name,
+                                   'required': not mfield.blank if to_update else False,
+                                   'type': get_field_data_type(mfield),
+                                   'verbose': mfield.verbose_name,
+                                   'help_text': mfield.help_text, }
+                            break
+
+    def get_doc(self):
+        doc = inspect.getdoc(self.method)
+        if not doc and issubclass(self.method.im_class.model, models.Model):
+            if self.method.__name__ == 'delete':
+                doc = _(
+                    'Function deletes object with object_ptr. If you declare "trash" parameter as true, object is marked as trash.')
+            elif self.method.__name__ == 'read':
+                doc = _(
+                    'Function gets info about object and returns following fields:')
+            elif hasattr(self.method.im_class, 'form'):
+                if self.method.__name__ == 'create':
+                    doc = _('Function creates entry with following fields:')
+                elif self.method.__name__ == 'update':
+                    doc = _('Function updates following fields:')
+        return doc
+
+    doc = property(get_doc)
+
+    def get_name(self):
+        return self.method.__name__
+
+    name = property(get_name)
+
+    def __repr__(self):
+        return "<Method: %s>" % self.name
+
+
+def _convert(template, params=None):
+    """URI template converter"""
+    if params is None:
+        params = []
+    paths = template % dict([p, "{%s}" % p] for p in params)
+    return u'/api%s%s' % (get_script_prefix(), paths)
+
+
+class HandlerDocumentation(object):
+    def __init__(self, handler):
+        self.handler = handler
+
+    def get_methods(self, include_default=False):
+        for method in self.handler.allowed_methods:
+            met = getattr(self.handler, CsrfExemptResource.callmap.get(method))
+            stale = inspect.getmodule(met) is handler
+
+            if not self.handler.is_anonymous:
+                if met and (not stale or include_default):
+                    yield HandlerMethod(met, stale)
+            else:
+                if not stale or met.__name__ == "read" \
+                        and 'GET' in self.allowed_methods:
+                    yield HandlerMethod(met, stale)
+
+    def get_all_methods(self):
+        return self.get_methods(include_default=True)
+
+    @property
+    def is_anonymous(self):
+        return handler.is_anonymous
+
+    def get_model(self):
+        return getattr(self, 'model', None)
+
+    def get_doc(self):
+        return self.handler.__doc__
+
+    doc = property(get_doc)
+
+    @property
+    def name(self):
+        return self.handler.__name__
+
+    @property
+    def display_name(self):
+        name = self.handler.__name__.replace('Handler', '')
+        try:
+            pattern = re.compile('([A-Z][A-Z][a-z])|([a-z][A-Z])')
+            name = pattern.sub(
+                lambda m: m.group()[:1] + " " + m.group()[1:], name)
+        except:
+            pass
+        return name
+
+    @property
+    def allowed_methods(self):
+        return self.handler.allowed_methods
+
+    def get_resource_uri_template(self):
+        """
+        URI template processor.
+
+        See http://bitworking.org/projects/URI-Templates/
+        """
+        try:
+            resource_uri = self.handler.resource_uri()
+
+            components = [None, [], {}]
+
+            for i, value in enumerate(resource_uri):
+                components[i] = value
+
+            lookup_view, args, kwargs = components
+            lookup_view = get_callable(lookup_view, True)
+
+            possibilities = get_resolver(
+                'treeio.core.api.urls').reverse_dict.getlist(lookup_view)
+
+            for possibility, pattern in possibilities:
+                for result, params in possibility:
+                    if args:
+                        if len(args) != len(params):
+                            continue
+                        return _convert(result, params)
+                    else:
+                        if set(kwargs.keys()) != set(params):
+                            continue
+                        return _convert(result, params)
+
+        except:
+            return None
+
+    def get_resource_uri_index(self):
+        """
+        INDEX URI template processor.
+        """
+        try:
+            resource_uri = self.handler.resource_uri()
+
+            components = [None, [], {}]
+
+            for i, value in enumerate(resource_uri):
+                components[i] = value
+
+            lookup_view, args, kwargs = components
+            # else this url will be in get_resource_uri_template
+            if args or kwargs:
+                lookup_view = get_callable(lookup_view, True)
+
+                possibilities = get_resolver(
+                    'treeio.core.api.urls').reverse_dict.getlist(lookup_view)
+
+                for possibility, pattern in possibilities:
+                    for result, params in possibility:
+                        if not params:
+                            return _convert(result)
+        except:
+            return None
+
+    resource_uri_template = property(get_resource_uri_template)
+
+    def __repr__(self):
+        return u'<Documentation for "%s">' % self.name
+
+
+def documentation_view(request, module):
+    docs = []
+
+    for name, clsmember in inspect.getmembers(get_module(module), inspect.isclass):
+        if issubclass(clsmember, handler.BaseHandler) and getattr(clsmember, 'model', None):
+            docs.append(generate_doc(clsmember))
+
+    return render_to_response('api/reference.html', {'docs': docs}, RequestContext(request))
diff --git a/data/treeio/treeio/treeio/core/api/south_migrations/0001_initial.py b/data/treeio/treeio/treeio/core/api/south_migrations/0001_initial.py
new file mode 100644
index 0000000..de30052
--- /dev/null
+++ b/data/treeio/treeio/treeio/core/api/south_migrations/0001_initial.py
@@ -0,0 +1,152 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Adding model 'Nonce'
+        db.create_table('api_nonce', (
+            ('id', self.gf('django.db.models.fields.AutoField')
+             (primary_key=True)),
+            ('token_key', self.gf(
+                'django.db.models.fields.CharField')(max_length=18)),
+            ('consumer_key', self.gf(
+                'django.db.models.fields.CharField')(max_length=18)),
+            ('key', self.gf('django.db.models.fields.CharField')
+             (max_length=255)),
+        ))
+        db.send_create_signal('api', ['Nonce'])
+
+        # Adding model 'Consumer'
+        db.create_table('api_consumer', (
+            ('id', self.gf('django.db.models.fields.AutoField')
+             (primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')
+             (max_length=255)),
+            ('description', self.gf('django.db.models.fields.TextField')()),
+            ('key', self.gf('django.db.models.fields.CharField')
+             (unique=True, max_length=18)),
+            ('secret', self.gf('django.db.models.fields.CharField')
+             (max_length=32)),
+            ('status', self.gf('django.db.models.fields.CharField')
+             (default='pending', max_length=16)),
+        ))
+        db.send_create_signal('api', ['Consumer'])
+
+        # Adding model 'Token'
+        db.create_table('api_token', (
+            ('id', self.gf('django.db.models.fields.AutoField')
+             (primary_key=True)),
+            ('key', self.gf('django.db.models.fields.CharField')
+             (max_length=18)),
+            ('secret', self.gf('django.db.models.fields.CharField')
+             (max_length=32)),
+            ('verifier', self.gf(
+                'django.db.models.fields.CharField')(max_length=10)),
+            ('token_type', self.gf('django.db.models.fields.IntegerField')()),
+            ('timestamp', self.gf('django.db.models.fields.IntegerField')
+             (default=1303299544L)),
+            ('is_approved', self.gf(
+                'django.db.models.fields.BooleanField')(default=False)),
+            ('user', self.gf('django.db.models.fields.related.ForeignKey')(
+                blank=True, related_name='tokens', null=True, to=orm['auth.User'])),
+            ('consumer_id', self.gf('django.db.models.fields.IntegerField')
+             (null=True, blank=True)),
+            ('callback', self.gf('django.db.models.fields.CharField')
+             (max_length=255, null=True, blank=True)),
+            ('callback_confirmed', self.gf(
+                'django.db.models.fields.BooleanField')(default=False)),
+        ))
+        db.send_create_signal('api', ['Token'])
+
+    def backwards(self, orm):
+
+        # Deleting model 'Nonce'
+        db.delete_table('api_nonce')
+
+        # Deleting model 'Consumer'
+        db.delete_table('api_consumer')
+
+        # Deleting model 'Token'
+        db.delete_table('api_token')
+
+    models = {
+        'api.consumer': {
+            'Meta': {'object_name': 'Consumer'},
+            'description': ('django.db.models.fields.TextField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '18'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'secret': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
+            'status': ('django.db.models.fields.CharField', [], {'default': "'pending'", 'max_length': '16'})
+        },
+        'api.nonce': {
+            'Meta': {'object_name': 'Nonce'},
+            'consumer_key': ('django.db.models.fields.CharField', [], {'max_length': '18'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'key': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'token_key': ('django.db.models.fields.CharField', [], {'max_length': '18'})
+        },
+        'api.token': {
+            'Meta': {'object_name': 'Token'},
+            'callback': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'callback_confirmed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'consumer_id': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_approved': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'key': ('django.db.models.fields.CharField', [], {'max_length': '18'}),
+            'secret': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
+            'timestamp': ('django.db.models.fields.IntegerField', [], {'default': '1303299544L'}),
+            'token_type': ('django.db.models.fields.IntegerField', [], {}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'tokens'", 'null': 'True', 'to': "orm['auth.User']"}),
+            'verifier': ('django.db.models.fields.CharField', [], {'max_length': '10'})
+        },
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        }
+    }
+
+    complete_apps = ['api']
diff --git a/data/treeio/treeio/treeio/core/api/south_migrations/0002_auto__add_field_consumer_owner.py b/data/treeio/treeio/treeio/core/api/south_migrations/0002_auto__add_field_consumer_owner.py
new file mode 100644
index 0000000..29d83d5
--- /dev/null
+++ b/data/treeio/treeio/treeio/core/api/south_migrations/0002_auto__add_field_consumer_owner.py
@@ -0,0 +1,96 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Adding field 'Consumer.owner'
+        db.add_column('api_consumer', 'owner', self.gf('django.db.models.fields.related.ForeignKey')(
+            to=orm['auth.User'], null=True, blank=True), keep_default=False)
+
+    def backwards(self, orm):
+
+        # Deleting field 'Consumer.owner'
+        db.delete_column('api_consumer', 'owner_id')
+
+    models = {
+        'api.consumer': {
+            'Meta': {'object_name': 'Consumer'},
+            'description': ('django.db.models.fields.TextField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '18'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}),
+            'secret': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
+            'status': ('django.db.models.fields.CharField', [], {'default': "'pending'", 'max_length': '16'})
+        },
+        'api.nonce': {
+            'Meta': {'object_name': 'Nonce'},
+            'consumer_key': ('django.db.models.fields.CharField', [], {'max_length': '18'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'key': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'token_key': ('django.db.models.fields.CharField', [], {'max_length': '18'})
+        },
+        'api.token': {
+            'Meta': {'object_name': 'Token'},
+            'callback': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'callback_confirmed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'consumer_id': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_approved': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'key': ('django.db.models.fields.CharField', [], {'max_length': '18'}),
+            'secret': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
+            'timestamp': ('django.db.models.fields.IntegerField', [], {'default': '1311780361L'}),
+            'token_type': ('django.db.models.fields.IntegerField', [], {}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'tokens'", 'null': 'True', 'to': "orm['auth.User']"}),
+            'verifier': ('django.db.models.fields.CharField', [], {'max_length': '10'})
+        },
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        }
+    }
+
+    complete_apps = ['api']
diff --git a/data/treeio/treeio/treeio/core/api/utils.py b/data/treeio/treeio/treeio/core/api/utils.py
new file mode 100644
index 0000000..07df116
--- /dev/null
+++ b/data/treeio/treeio/treeio/core/api/utils.py
@@ -0,0 +1,346 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+import time
+from django.http import HttpResponse
+from django.core.cache import cache
+from django import get_version as django_version
+from django.core.mail import send_mail, mail_admins
+from django.conf import settings
+from django.utils.translation import ugettext as _
+from django.template import loader, TemplateDoesNotExist
+from django.contrib.sites.models import Site
+from piston3.decorator import decorator
+
+__version__ = '0.3dev'
+
+
+def get_version():
+    return __version__
+
+
+def format_error(error):
+    return u"Piston/%s (Django %s) crash report:\n\n%s" % \
+        (get_version(), django_version(), error)
+
+
+class rc_factory(object):
+
+    """
+    Status codes.
+    """
+    CODES = dict(ALL_OK=('OK', 200),
+                 CREATED = ('Created', 201),
+                 DELETED = ('', 204),  # 204 says "Don't send a body!"
+                 BAD_REQUEST = ('Bad Request', 400),
+                 FORBIDDEN = ('Forbidden', 401),
+                 NOT_FOUND = ('Not Found', 404),
+                 DUPLICATE_ENTRY = ('Conflict/Duplicate', 409),
+                 NOT_HERE = ('Gone', 410),
+                 INTERNAL_ERROR = ('Internal Error', 500),
+                 NOT_IMPLEMENTED = ('Not Implemented', 501),
+                 THROTTLED = ('Throttled', 503))
+
+    def __getattr__(self, attr):
+        """
+        Returns a fresh `HttpResponse` when getting
+        an "attribute". This is backwards compatible
+        with 0.2, which is important.
+        """
+        try:
+            (r, c) = self.CODES.get(attr)
+        except TypeError:
+            raise AttributeError(attr)
+
+        return HttpResponse(r, content_type='text/plain', status=c)
+
+rc = rc_factory()
+
+
+class FormValidationError(Exception):
+
+    def __init__(self, form):
+        self.form = form
+
+
+class HttpStatusCode(Exception):
+
+    def __init__(self, response):
+        self.response = response
+
+
+def validate(v_form, operation='POST'):
+    @decorator
+    def wrap(f, self, request, *a, **kwa):
+        form = v_form(getattr(request, operation))
+
+        if form.is_valid():
+            setattr(request, 'form', form)
+            return f(self, request, *a, **kwa)
+        else:
+            raise FormValidationError(form)
+    return wrap
+
+
+def throttle(max_requests, timeout=60 * 60, extra=''):
+    """
+    Simple throttling decorator, caches
+    the amount of requests made in cache.
+
+    If used on a view where users are required to
+    log in, the username is used, otherwise the
+    IP address of the originating request is used.
+
+    Parameters::
+     - `max_requests`: The maximum number of requests
+     - `timeout`: The timeout for the cache entry (default: 1 hour)
+    """
+    @decorator
+    def wrap(f, self, request, *args, **kwargs):
+        if request.user.is_authenticated():
+            ident = request.user.username
+        else:
+            ident = request.META.get('REMOTE_ADDR', None)
+
+        if hasattr(request, 'throttle_extra'):
+            """
+            Since we want to be able to throttle on a per-
+            application basis, it's important that we realize
+            that `throttle_extra` might be set on the request
+            object. If so, append the identifier name with it.
+            """
+            ident += ':%s' % str(request.throttle_extra)
+
+        if ident:
+            """
+            Preferrably we'd use incr/decr here, since they're
+            atomic in memcached, but it's in django-trunk so we
+            can't use it yet. If someone sees this after it's in
+            stable, you can change it here.
+            """
+            ident += ':%s' % extra
+
+            now = time.time()
+            count, expiration = cache.get(ident, (1, None))
+
+            if expiration is None:
+                expiration = now + timeout
+
+            if count >= max_requests and expiration > now:
+                t = rc.THROTTLED
+                wait = int(expiration - now)
+                t.content = 'Throttled, wait %d seconds.' % wait
+                t['Retry-After'] = wait
+                return t
+
+            cache.set(ident, (count + 1, expiration), (expiration - now))
+
+        return f(self, request, *args, **kwargs)
+    return wrap
+
+
+def coerce_put_post(request):
+    """
+    Django doesn't particularly understand REST.
+    In case we send data over PUT, Django won't
+    actually look at the data and load it. We need
+    to twist its arm here.
+
+    The try/except abominiation here is due to a bug
+    in mod_python. This should fix it.
+    """
+    if request.method == "PUT":
+        # Bug fix: if _load_post_and_files has already been called, for
+        # example by middleware accessing request.POST, the below code to
+        # pretend the request is a POST instead of a PUT will be too late
+        # to make a difference. Also calling _load_post_and_files will result
+        # in the following exception:
+        #   AttributeError: You cannot set the upload handlers after the upload has been processed.
+        # The fix is to check for the presence of the _post field which is set
+        # the first time _load_post_and_files is called (both by wsgi.py and
+        # modpython.py). If it's set, the request has to be 'reset' to redo
+        # the query value parsing in POST mode.
+        if hasattr(request, '_post'):
+            del request._post
+            del request._files
+
+        try:
+            request.method = "POST"
+            request._load_post_and_files()
+            request.method = "PUT"
+        except AttributeError:
+            request.META['REQUEST_METHOD'] = 'POST'
+            request._load_post_and_files()
+            request.META['REQUEST_METHOD'] = 'PUT'
+
+        request.PUT = request.POST
+
+
+class MimerDataException(Exception):
+
+    """
+    Raised if the content_type and data don't match
+    """
+    pass
+
+
+class Mimer(object):
+    TYPES = dict()
+
+    def __init__(self, request):
+        self.request = request
+
+    def is_multipart(self):
+        content_type = self.content_type()
+
+        if content_type is not None:
+            return content_type.lstrip().startswith('multipart')
+
+        return False
+
+    def loader_for_type(self, ctype):
+        """
+        Gets a function ref to deserialize content
+        for a certain mimetype.
+        """
+        for loadee, mimes in Mimer.TYPES.iteritems():
+            for mime in mimes:
+                if ctype.startswith(mime):
+                    return loadee
+
+    def content_type(self):
+        """
+        Returns the content type of the request in all cases where it is
+        different than a submitted form - application/x-www-form-urlencoded
+        """
+        type_formencoded = "application/x-www-form-urlencoded"
+
+        ctype = self.request.META.get('CONTENT_TYPE', type_formencoded)
+
+        if type_formencoded in ctype:
+            return None
+
+        return ctype
+
+    def translate(self):
+        """
+        Will look at the `Content-type` sent by the client, and maybe
+        deserialize the contents into the format they sent. This will
+        work for JSON, YAML, XML and Pickle. Since the data is not just
+        key-value (and maybe just a list), the data will be placed on
+        `request.data` instead, and the handler will have to read from
+        there.
+
+        It will also set `request.content_type` so the handler has an easy
+        way to tell what's going on. `request.content_type` will always be
+        None for form-encoded and/or multipart form data (what your browser sends.)
+        """
+        ctype = self.content_type()
+        self.request.content_type = ctype
+
+        if not self.is_multipart() and ctype:
+            loadee = self.loader_for_type(ctype)
+
+            if loadee:
+                try:
+                    self.request.data = loadee(self.request.body)
+
+                    # Reset both POST and PUT from request, as its
+                    # misleading having their presence around.
+                    self.request.POST = self.request.PUT = dict()
+                except (TypeError, ValueError):
+                    # This also catches if loadee is None.
+                    raise MimerDataException
+            else:
+                self.request.data = None
+
+        return self.request
+
+    @classmethod
+    def register(cls, loadee, types):
+        cls.TYPES[loadee] = types
+
+    @classmethod
+    def unregister(cls, loadee):
+        return cls.TYPES.pop(loadee)
+
+
+def translate_mime(request):
+    request = Mimer(request).translate()
+
+
+def require_mime(*mimes):
+    """
+    Decorator requiring a certain mimetype. There's a nifty
+    helper called `require_extended` below which requires everything
+    we support except for post-data via form.
+    """
+    @decorator
+    def wrap(f, self, request, *args, **kwargs):
+        m = Mimer(request)
+        realmimes = set()
+
+        rewrite = {'json': 'application/json',
+                   'yaml': 'application/x-yaml',
+                   'xml': 'text/xml',
+                   'pickle': 'application/python-pickle'}
+
+        for idx, mime in enumerate(mimes):
+            realmimes.add(rewrite.get(mime, mime))
+
+        if not m.content_type() in realmimes:
+            return rc.BAD_REQUEST
+
+        return f(self, request, *args, **kwargs)
+    return wrap
+
+require_extended = require_mime('json', 'yaml', 'xml', 'pickle')
+
+
+def send_consumer_mail(consumer):
+    """
+    Send a consumer an email depending on what their status is.
+    """
+    try:
+        subject = settings.PISTON_OAUTH_EMAIL_SUBJECTS[consumer.status]
+    except AttributeError:
+        subject = "Your API Consumer for %s " % Site.objects.get_current().name
+        if consumer.status == "accepted":
+            subject += "was accepted!"
+        elif consumer.status == "canceled":
+            subject += "has been canceled."
+        elif consumer.status == "rejected":
+            subject += "has been rejected."
+        else:
+            subject += "is awaiting approval."
+
+    template = "piston/mails/consumer_%s.txt" % consumer.status
+
+    try:
+        body = loader.render_to_string(template,
+                                       {'consumer': consumer, 'user': consumer.user})
+    except TemplateDoesNotExist:
+        """
+        They haven't set up the templates, which means they might not want
+        these emails sent.
+        """
+        return
+
+    try:
+        sender = settings.PISTON_FROM_EMAIL
+    except AttributeError:
+        sender = settings.DEFAULT_FROM_EMAIL
+
+    if consumer.user:
+        send_mail(
+            _(subject), body, sender, [consumer.user.email], fail_silently=True)
+
+    if consumer.status == 'pending' and len(settings.ADMINS):
+        mail_admins(_(subject), body, fail_silently=True)
+
+    if settings.DEBUG and consumer.user:
+        print "Mail being sent, to=%s" % consumer.user.email
+        print "Subject: %s" % _(subject)
+        print body
diff --git a/data/treeio/treeio/treeio/core/auth.py b/data/treeio/treeio/treeio/core/auth.py
new file mode 100644
index 0000000..b688b6e
--- /dev/null
+++ b/data/treeio/treeio/treeio/core/auth.py
@@ -0,0 +1,54 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+"""
+Hardtree support authentication backend
+"""
+from django.contrib.auth.models import User
+from treeio.identities.models import ContactValue
+
+
+class EmailBackend(object):
+
+    "Log a user in using email instead of their username"
+
+    def authenticate(self, username, password):
+        # The user entered an email, so try to log them in by e-mail
+        emails = ContactValue.objects.filter(value=username,
+                                             field__field_type='email',
+                                             contact__trash=False,
+                                             contact__related_user__isnull=False)
+        for email in emails:
+            try:
+                user = email.contact.related_user.user.user
+                if user.check_password(password):
+                    return user
+            except:
+                pass
+        return None
+
+    def get_user(self, user_id):
+        try:
+            return User.objects.get(pk=user_id)
+        except User.DoesNotExist:
+            return None
+
+
+class HashBackend(object):
+
+    "Log a user in using their password as a hash"
+
+    def authenticate(self, authkey):
+        try:
+            return User.objects.get(password=authkey)
+        except:
+            pass
+        return None
+
+    def get_user(self, user_id):
+        try:
+            return User.objects.get(pk=user_id)
+        except User.DoesNotExist:
+            return None
diff --git a/data/treeio/treeio/treeio/core/contrib/messages/storage/cache.py b/data/treeio/treeio/treeio/core/contrib/messages/storage/cache.py
new file mode 100644
index 0000000..24c9561
--- /dev/null
+++ b/data/treeio/treeio/treeio/core/contrib/messages/storage/cache.py
@@ -0,0 +1,98 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+# -*- coding:utf-8 -*-
+
+from treeio.core.conf import settings
+from django.contrib.messages.storage.base import BaseStorage
+from django.core.cache import cache
+import cPickle
+
+
+def lock(key):
+    while True:
+        if cache.add(key + '_lock', '1', 10):  # lifetime lock 10 seconds
+            break
+
+
+def unlock(key):
+    cache.delete(key + '_lock')
+
+
+class CacheStorage(BaseStorage):
+
+    """
+    Stores messages in a cache.
+    """
+
+    def __init__(self, request, *args, **kwargs):
+        super(CacheStorage, self).__init__(request, *args, **kwargs)
+        self.user = request.user.id
+        self.domain = getattr(settings, 'CURRENT_DOMAIN', 'default')
+        self.prefix = 'treeio_%s_storage_messages_%s'
+        self.key = self.prefix % (self.domain, self.user)
+
+    def _get(self, *args, **kwargs):
+        """
+        Retrieves a list of stored messages. Returns a tuple of the messages
+        and a flag indicating whether or not all the messages originally
+        intended to be stored in this storage were, in fact, stored and
+        retrieved; e.g., ``(messages, all_retrieved)``.
+        """
+        lock(self.key)
+        try:
+            data = cache.get(self.key)
+            if not data:
+                data = cPickle.dumps([])
+            messages = cPickle.loads(data)
+        except:
+            pass
+        unlock(self.key)
+        return messages, True
+
+    def update(self, response, *args, **kwargs):
+        "Update flew by - don't pass response to avoid Exceptions being thrown by Django middleware"
+        super(CacheStorage, self).update(response, *args, **kwargs)
+        return []
+
+    def _store(self, messages, *args, **kwargs):
+        """
+        Stores a list of messages, returning a list of any messages which could
+        not be stored.
+
+        One type of object must be able to be stored, ``Message``.
+        """
+        lock(self.key)
+        try:
+            if messages:
+                data = cache.get(self.key)
+                if not data:  # if not data in cache
+                    data = cPickle.dumps(([], True))
+                data = cPickle.loads(data)
+                data.append(messages)
+                cache.set(self.key, cPickle.dumps(messages), 2592000)
+            else:
+                cache.set(self.key, cPickle.dumps([]), 2592000)
+        except:
+            pass
+        unlock(self.key)
+        return messages
+
+    def _add(self, messages, *args, **kwargs):
+        """
+        adds to the message store
+        """
+        lock(self.key)
+        try:
+            if messages:
+                data = cache.get(self.key)
+                if not data:
+                    data = cPickle.dumps([])
+                data = cPickle.loads(data)
+                data.append(messages)
+                cache.set(self.key, cPickle.dumps(data), 2592000)
+        except:
+            pass
+        unlock(self.key)
diff --git a/data/treeio/treeio/treeio/core/dashboard/views.py b/data/treeio/treeio/treeio/core/dashboard/views.py
new file mode 100644
index 0000000..90a010d
--- /dev/null
+++ b/data/treeio/treeio/treeio/core/dashboard/views.py
@@ -0,0 +1,279 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+"""
+Core module Dashboard views
+"""
+
+from treeio.core.rendering import render_to_response
+from django.shortcuts import get_object_or_404
+from django.template import RequestContext
+from django.http import HttpResponseRedirect
+from django.core.urlresolvers import reverse
+from treeio.core.decorators import treeio_login_required, handle_response_format
+from treeio.core.models import Object, Widget
+from treeio.core.dashboard.forms import WidgetForm
+from treeio.core.conf import settings
+from jinja2 import Markup
+import json
+import re
+import copy
+
+
+def _preprocess_widget(widget, name):
+    "Populates widget with missing fields"
+
+    module_name = widget['module_name']
+    import_name = module_name + ".views"
+    module_views = __import__(import_name, fromlist=[str(module_name)])
+    if hasattr(module_views, name):
+        if 'title' not in widget:
+            widget['title'] = getattr(module_views, name).__doc__
+        widget = copy.deepcopy(widget)
+
+        if 'view' not in widget:
+            widget['view'] = getattr(module_views, name)
+
+    return widget
+
+
+def _get_all_widgets(request):
+    "Retrieve widgets from all available modules"
+
+    user = request.user.profile
+    perspective = user.get_perspective()
+    modules = perspective.get_modules()
+
+    widgets = {}
+
+    # For each Module in the Perspective get widgets
+    for module in modules:
+        try:
+            import_name = module.name + ".widgets"
+            module_widget_lib = __import__(
+                import_name, fromlist=[str(module.name)])
+            module_widgets = module_widget_lib.get_widgets(request)
+
+            # Preprocess widget, ensure it has all required fields
+            for name in module_widgets:
+                if 'module_name' not in module_widgets[name]:
+                    module_widgets[name]['module_name'] = module.name
+                if 'module_title' not in module_widgets[name]:
+                    module_widgets[name]['module_title'] = module.title
+                module_widgets[name] = _preprocess_widget(
+                    module_widgets[name], name)
+
+            widgets.update(module_widgets)
+
+        except ImportError:
+            pass
+        except AttributeError:
+            pass
+
+    return widgets
+
+
+def _get_widget(request, module, widget_name):
+    "Gets a widget by name"
+
+    import_name = module.name + ".widgets"
+    module_widget_lib = __import__(import_name, fromlist=[str(module.name)])
+    module_widgets = module_widget_lib.get_widgets(request)
+
+    widget = {}
+    # Preprocess widget, ensure it has all required fields
+    for name in module_widgets:
+        if name == widget_name:
+            widget = module_widgets[name]
+            if 'module_name' not in widget:
+                widget['module_name'] = module.name
+            if 'module_title' not in widget:
+                widget['module_title'] = module.title
+            widget = _preprocess_widget(widget, widget_name)
+            break
+
+    return widget
+
+
+def _create_widget_object(request, module_name, widget_name):
+    "Create a Widget object if one is available for the current user Perspective"
+
+    user = request.user.profile
+    perspective = user.get_perspective()
+    modules = perspective.get_modules()
+
+    obj = None
+
+    current_module = modules.filter(name=module_name)
+    widget = None
+    if current_module:
+        current_module = current_module[0]
+        widget = _get_widget(request, current_module, widget_name)
+    if widget:
+        obj = Widget(user=user, perspective=perspective)
+        obj.module_name = widget['module_name']
+        obj.widget_name = widget_name
+        obj.save()
+
+    # except Exception:
+    # pass
+
+    return obj
+
+
+def _get_widget_content(content, response_format='html'):
+    "Extracts widget content from rendred HTML"
+
+    widget_content = ""
+    regexp = r"<!-- widget_content -->(?P<widget_content>.*?)<!-- /widget_content -->"
+
+    if response_format == 'ajax':
+        try:
+            ajax_content = json.loads(content)
+            widget_content = ajax_content['response'][
+                'content']['module_content']
+        except:
+            blocks = re.finditer(regexp, content, re.DOTALL)
+            for block in blocks:
+                widget_content = block.group('widget_content').strip()
+    else:
+        blocks = re.finditer(regexp, content, re.DOTALL)
+        for block in blocks:
+            widget_content = block.group('widget_content').strip()
+
+    return Markup(widget_content)
+
+
+@handle_response_format
+@treeio_login_required
+def index(request, response_format='html'):
+    "Homepage"
+    trash = Object.filter_by_request(request, manager=Object.objects.filter(trash=True),
+                                     mode='r', filter_trash=False).count()
+    user = request.user.profile
+    perspective = user.get_perspective()
+    widget_objects = Widget.objects.filter(user=user, perspective=perspective)
+    clean_widgets = []
+
+    for widget_object in widget_objects:
+        try:
+            module = perspective.get_modules().filter(
+                name=widget_object.module_name)[0]
+            widget = _get_widget(request, module, widget_object.widget_name)
+            if 'view' in widget:
+                try:
+                    content = unicode(
+                        widget['view'](request, response_format=response_format).content, 'utf_8')
+                    widget_content = _get_widget_content(
+                        content, response_format=response_format)
+                except Exception, e:
+                    widget_content = ""
+                    if settings.DEBUG:
+                        widget_content = str(e)
+
+                widget['content'] = widget_content
+            if widget:
+                widget_object.widget = widget
+                clean_widgets.append(widget_object)
+        except IndexError:
+            widget_object.delete()
+
+    return render_to_response('core/dashboard/index',
+                              {'trash': trash,
+                               'widgets': clean_widgets},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def dashboard_widget_add(request, module_name=None, widget_name=None, response_format='html'):
+    "Add a Widget to the Dashboard"
+    trash = Object.filter_by_request(request, manager=Object.objects.filter(trash=True),
+                                     mode='r', filter_trash=False).count()
+
+    if module_name and widget_name:
+        widget = _create_widget_object(request, module_name, widget_name)
+        if widget:
+            return HttpResponseRedirect(reverse('core_dashboard_index'))
+
+    widgets = _get_all_widgets(request)
+
+    return render_to_response('core/dashboard/widget_add',
+                              {'trash': trash,
+                               'widgets': widgets},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def dashboard_widget_edit(request, widget_id, response_format='html'):
+    "Edit an existing Widget on the Dashboard"
+
+    user = request.user.profile
+
+    widget_object = get_object_or_404(Widget, pk=widget_id)
+    if widget_object.user == user:
+        perspective = user.get_perspective()
+        module = perspective.get_modules().filter(
+            name=widget_object.module_name)[0]
+        widget = _get_widget(request, module, widget_object.widget_name)
+        widget_object.widget = widget
+        if 'view' in widget:
+            try:
+                content = unicode(
+                    widget['view'](request, response_format=response_format).content, 'utf_8')
+                widget_content = _get_widget_content(
+                    content, response_format=response_format)
+            except Exception:
+                widget_content = ""
+            widget['content'] = widget_content
+        if request.POST:
+            form = WidgetForm(user, request.POST, instance=widget_object)
+            if form.is_valid():
+                form.save()
+                return HttpResponseRedirect(reverse('core_dashboard_index'))
+        else:
+            form = WidgetForm(user, instance=widget_object)
+        return render_to_response('core/dashboard/widget_edit',
+                                  {'widget': widget_object,
+                                   'form': form},
+                                  context_instance=RequestContext(request), response_format=response_format)
+
+    return HttpResponseRedirect(reverse('home'))
+
+
+@handle_response_format
+@treeio_login_required
+def dashboard_widget_delete(request, widget_id, response_format='html'):
+    "Delete an existing Widget from the Dashboard"
+
+    widget = get_object_or_404(Widget, pk=widget_id)
+
+    if widget.user == request.user.profile:
+        widget.delete()
+
+    return HttpResponseRedirect(reverse('core_dashboard_index'))
+
+
+@handle_response_format
+@treeio_login_required
+def dashboard_widget_arrange(request, panel='left', response_format='html'):
+    "Arrange widgets with AJAX request"
+    user = request.user.profile
+
+    if panel == 'left' or not panel:
+        shift = -100
+    else:
+        shift = 100
+
+    if request.GET and 'id_widget[]' in request.GET:
+        widget_ids = request.GET.getlist('id_widget[]')
+        widgets = Widget.objects.filter(user=user, pk__in=widget_ids)
+        for widget in widgets:
+            if unicode(widget.id) in widget_ids:
+                widget.weight = shift + widget_ids.index(unicode(widget.id))
+                widget.save()
+
+    return HttpResponseRedirect(reverse('core_dashboard_index'))
diff --git a/data/treeio/treeio/treeio/core/db/__init__.py b/data/treeio/treeio/treeio/core/db/__init__.py
new file mode 100644
index 0000000..94667fc
--- /dev/null
+++ b/data/treeio/treeio/treeio/core/db/__init__.py
@@ -0,0 +1,13 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+# -*- encoding: utf-8 -*-
+"""
+Database extension
+"""
+__author__ = 'Kirill Yakovenko, crystalnix'
+__email__ = 'kirill.yakovenko@gmail.com'
+
+from db import *
diff --git a/data/treeio/treeio/treeio/core/db/creation.py b/data/treeio/treeio/treeio/core/db/creation.py
new file mode 100644
index 0000000..257bdf5
--- /dev/null
+++ b/data/treeio/treeio/treeio/core/db/creation.py
@@ -0,0 +1,77 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+# -*- encoding: utf-8 -*-
+"""
+Database creator
+"""
+__author__ = 'Kirill Yakovenko, crystalnix'
+__email__ = 'kirill.yakovenko@gmail.com'
+
+from django.conf import settings
+from django.db import connections
+from django.utils.importlib import import_module
+
+
+def DatabaseCreation(domain):
+    connection = connections[domain]
+    try:
+        BaseDatabaseCreation = import_module(
+            '.creation', connection.settings_dict['ENGINE']).DatabaseCreation
+    except:
+        BaseDatabaseCreation = import_module(
+            '.creation', 'django.db.backends').BaseDatabaseCreation
+
+    class DBCreation(BaseDatabaseCreation):
+
+        def __init__(self, connection):
+            super(DBCreation, self).__init__(connection)
+            self.database_name = self.connection.settings_dict.get(
+                'NAME') or super(DBCreation, self)._get_test_db_name()
+
+        def _get_test_db_name(self):
+            return self.database_name
+
+        def create_db(self, load_initial):
+            from django.core.management import call_command
+
+            # Deletes database name because if database doesn't exist,
+            # django orm isn't able to connect to it.
+            self.connection.settings_dict["NAME"] = None
+            self._create_test_db(0, True)
+            self.connection.settings_dict["NAME"] = self.database_name
+
+            self.connection.close()
+            # Confirm the feature set of the database
+            self.connection.features.confirm()
+
+            # Report syncdb messages at one level lower than that requested.
+            # This ensures we don't get flooded with messages during testing
+            # (unless you really ask to be flooded)
+            call_command('syncdb',
+                         verbosity=0,
+                         interactive=False,
+                         database=domain,
+                         load_initial_data=load_initial,
+                         migrate_all=True)
+
+            from django.core.cache import get_cache
+            from django.core.cache.backends.db import BaseDatabaseCache
+
+            for cache_alias in settings.CACHES:
+                cache = get_cache(cache_alias)
+                if isinstance(cache, BaseDatabaseCache):
+                    from django.db import router
+
+                    if router.allow_syncdb(self.connection.alias, cache.cache_model_class):
+                        call_command(
+                            'createcachetable', cache._table, database=self.connection.alias)
+
+            # Get a cursor (even though we don't need one yet). This has
+            # the side effect of initializing the test database.
+            cursor = self.connection.cursor()
+            return self.database_name
+
+    return DBCreation(connection)
diff --git a/data/treeio/treeio/treeio/core/db/db.py b/data/treeio/treeio/treeio/core/db/db.py
new file mode 100644
index 0000000..f0e317c
--- /dev/null
+++ b/data/treeio/treeio/treeio/core/db/db.py
@@ -0,0 +1,119 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+"""
+Database manipulations
+
+Dynamically identifies the correct database to use for the current domain
+"""
+from pandora import box
+from django.utils import simplejson as json
+import UserDict
+
+from os import path
+
+FILE_ROOT = path.abspath(path.dirname(__file__))
+
+HARDTREE_DB_SETTINGS_FILE = path.join(FILE_ROOT, 'dbsettings.json')
+NO_DEFAULT = False
+
+
+class DatabaseNotFound(Exception):
+    pass
+
+
+class DatabaseDict(UserDict.DictMixin, dict):
+
+    """A dictionary which applies an arbitrary key-altering function before accessing the keys"""
+
+    def _ensure_defaults(self):
+        for db in self.values():
+            db.setdefault('ENGINE', 'django.db.backends.dummy')
+            if db['ENGINE'] == 'django.db.backends.' or not db['ENGINE']:
+                db['ENGINE'] = 'django.db.backends.dummy'
+            db.setdefault('OPTIONS', {})
+            db.setdefault('TEST_CHARSET', None)
+            db.setdefault('TEST_COLLATION', None)
+            db.setdefault('TEST_NAME', None)
+            db.setdefault('TEST_MIRROR', None)
+            db.setdefault('TIME_ZONE', 'UTC0')
+            for setting in ('NAME', 'USER', 'PASSWORD', 'HOST', 'PORT'):
+                db.setdefault(setting, '')
+
+    def __init__(self, *args, **kwargs):
+        self._load_databases(*args, **kwargs)
+
+    def _load_databases(self, *args, **kwargs):
+        dbfile = open(HARDTREE_DB_SETTINGS_FILE, 'r')
+        self.store = json.load(dbfile)
+        self.update(dict(*args, **kwargs))  # use the free update to set keys
+        self._ensure_defaults()
+
+    def _save_databases(self):
+        f = open(HARDTREE_DB_SETTINGS_FILE, 'w')
+        json.dump(self.store, f)
+        f.close()
+
+    def __getitem__(self, key):
+        try:
+            return self.store[key]
+        except KeyError:
+            self._load_databases()
+            try:
+                return self.store[key]
+            except KeyError:
+                try:
+                    if NO_DEFAULT:
+                        raise DatabaseNotFound(
+                            'No database found for %s' % key)
+                    return self.store['default']
+                except KeyError:
+                    raise RuntimeError(
+                        'Default database is not specified in the config file and the current database is unavailable')
+
+    def __setitem__(self, key, value):
+        self.store[key] = value
+        self._save_databases()
+
+    def __delitem__(self, key):
+        del self.store[key]
+        self._save_databases()
+
+    def __iter__(self):
+        return iter(self.store)
+
+    def __len__(self):
+        return len(self.store)
+
+
+class DBRouter(object):
+
+    """A router to control all database operations and dynamically select the correct database"""
+
+    def _get_current_database(self):
+        "Returns the database that should be used for the current request"
+        if 'request' in box and 'CURRENT_DATABASE_NAME' not in box:
+            current_db = box['request'].get_host().split('.')[0]
+        else:
+            current_db = box.get('CURRENT_DATABASE_NAME', 'default')
+        return current_db
+
+    def db_for_read(self, model, **hints):
+        "Point all operations to the current database"
+        if 'instance' in hints:
+            return hints['instance']._state.db
+        return self._get_current_database()
+
+    def db_for_write(self, model, **hints):
+        "Point all operations to the current database"
+        return self._get_current_database()
+
+    def allow_relation(self, obj1, obj2, **hints):
+        "Allow any relation"
+        return True
+
+    def allow_syncdb(self, db, model):
+        "Allow syncdb"
+        return True
diff --git a/data/treeio/treeio/treeio/core/forms.py b/data/treeio/treeio/treeio/core/forms.py
new file mode 100644
index 0000000..b820013
--- /dev/null
+++ b/data/treeio/treeio/treeio/core/forms.py
@@ -0,0 +1,383 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+"""
+Core module forms
+"""
+
+import os
+import sys
+from django import forms
+from django.db import router
+from django.core.exceptions import ValidationError
+from django.core.urlresolvers import reverse
+from treeio.core.models import Object
+from captcha.fields import CaptchaField
+from django.utils.translation import ugettext as _
+from treeio.core.conf import settings
+from django.db.models import Q
+import django.contrib.auth.models as django_auth
+from jinja2.filters import do_striptags, do_truncate
+from treeio.core.models import Location, User, Widget, Tag, ConfigSetting
+from treeio.core.mail import EmailPassword
+from treeio.identities.models import Contact, ContactType, ContactValue
+
+
+class PermissionForm(forms.ModelForm):
+
+    "Permission Form"
+
+    def __init__(self, *args, **kwargs):
+        "Prepare form"
+        super(PermissionForm, self).__init__(*args, **kwargs)
+
+        self.fields['read_access'].help_text = ""
+        self.fields['read_access'].required = False
+        self.fields['read_access'].widget.attrs.update({'class': 'multicomplete',
+                                                        'callback': reverse('identities_ajax_access_lookup')})
+
+        self.fields['full_access'].help_text = ""
+        self.fields['full_access'].required = False
+        self.fields['full_access'].widget.attrs.update({'class': 'multicomplete',
+                                                        'callback': reverse('identities_ajax_access_lookup')})
+
+    class Meta:
+
+        "Permission Form"
+        model = Object
+        fields = ('read_access', 'full_access')
+
+
+class SubscribeForm(forms.Form):
+
+    "Subscribe Form"
+
+    subscriber = forms.ModelChoiceField(queryset=User.objects.all())
+
+    def __init__(self, instance, *args, **kwargs):
+        "Prepare form"
+        subscriptions = instance.subscribers.all()
+
+        super(SubscribeForm, self).__init__(*args, **kwargs)
+        self.subscriptions = subscriptions
+        self.instance = instance
+
+        self.fields['subscriber'].label = ""
+        self.fields['subscriber'].queryset = User.objects.exclude(
+            pk__in=subscriptions)
+        self.fields['subscriber'].widget.attrs.update({'class': 'autocomplete',
+                                                       'callback': reverse('identities_ajax_user_lookup')})
+
+    def save(self):
+        "Subscribe"
+
+        user = self.cleaned_data['subscriber']
+        object = self.instance
+
+        if user not in self.subscriptions:
+            object.subscribers.add(user)
+        self.subscriptions = object.subscribers.all()
+
+        return self.subscriptions
+
+
+class ObjectLinksForm(forms.Form):
+
+    """ Object Links Form """
+
+    links = forms.ModelChoiceField(queryset=[], empty_label=None, label='')
+
+    def __init__(self, user, response_format, instance, *args, **kwargs):
+
+        super(ObjectLinksForm, self).__init__(*args, **kwargs)
+
+        queryset = Object.filter_permitted(user, Object.objects)
+        self.fields['links'].queryset = queryset
+
+        if 'ajax' not in response_format:
+            if instance:
+                queryset = queryset.exclude(pk__in=instance.links.all())
+
+            choices = []
+            for obj in queryset:
+                human_type = obj.get_human_type()
+                name = do_truncate(
+                    do_striptags(unicode(obj.object_name)), 20, True)
+                if human_type:
+                    name += u" (" + human_type + u")"
+                choices.append((obj.id, name))
+            self.fields['links'].choices = choices
+
+        self.fields['links'].label = ""
+        self.fields['links'].initial = ""
+        self.fields['links'].widget.attrs.update({'class': 'autocomplete',
+                                                  'callback': reverse('core_ajax_object_lookup')})
+
+
+class TagsForm(forms.Form):
+
+    tags = forms.ModelMultipleChoiceField(queryset=Tag.objects.all())
+
+    def __init__(self, tags, *args, **kwargs):
+        super(TagsForm, self).__init__(*args, **kwargs)
+
+        self.fields['tags'].label = ""
+        self.fields['tags'].initial = [tag.id for tag in tags]
+        self.fields['tags'].required = False
+        self.fields['tags'].widget.attrs.update({'class': 'multicomplete',
+                                                 'callback': reverse('core_ajax_tag_lookup')})
+
+    def save(self):
+        return self.cleaned_data['tags']
+
+
+class LoginForm(forms.Form):
+
+    """ Login form"""
+
+    captcha = CaptchaField(label=_("Enter text from the image"))
+
+    def __init__(self, *args, **kwargs):
+        super(LoginForm, self).__init__(*args, **kwargs)
+        if settings.CAPTCHA_DISABLE:
+            del self.fields['captcha']
+
+
+class PasswordResetForm(forms.Form):
+
+    "Password reset form"
+
+    username = forms.CharField(label=("Username or E-mail"), max_length=75)
+
+    def __init__(self, *args, **kwargs):
+        super(PasswordResetForm, self).__init__(*args, **kwargs)
+        self.fields['username'].label = _("Username or E-mail")
+
+    def clean_username(self):
+        """
+        Validates that a user exists with the given e-mail address.
+        """
+        username = self.cleaned_data["username"]
+        if '@' in username:
+            # The user entered an email, so try to log them in by e-mail
+            emails = ContactValue.objects.filter(value=username,
+                                                 field__field_type='email',
+                                                 contact__trash=False,
+                                                 contact__related_user__isnull=False)
+            users = [email.contact.related_user.user for email in emails]
+        else:
+            users = User.objects.filter(user__username=username)
+        if len(users) == 0:
+            raise forms.ValidationError(
+                _("Sorry, we don't know that user or e-mail."))
+        else:
+            username = users[0]
+        return username
+
+    def save(self):
+        "Send e-mail"
+        user = self.cleaned_data["username"]
+        if user:
+            toaddr = user.get_contact().get_email()
+            if toaddr:
+                password = user.generate_new_password()
+                email = EmailPassword(toaddr, user.user.username, password)
+                email.send_email()
+
+
+class InvitationForm(forms.Form):
+
+    """ Create account from Invitation form """
+
+    invitation = None
+
+    def __init__(self, invitation=None, *args, **kwargs):
+
+        super(InvitationForm, self).__init__(*args, **kwargs)
+
+        self.fields['username'] = forms.CharField(
+            max_length=255, label=_("Username"))
+        self.fields['name'] = forms.CharField(
+            max_length=255, label=_("Your name"))
+        self.fields['password'] = forms.CharField(max_length=255, label=_("Password"),
+                                                  widget=forms.PasswordInput(render_value=False))
+        self.fields['password_again'] = forms.CharField(max_length=255, label=_("Confirm Password"),
+                                                        widget=forms.PasswordInput(render_value=False))
+
+        self.invitation = invitation
+
+    def clean_username(self):
+        "Clean Name"
+        data = self.cleaned_data['username']
+        query = Q(name=data)
+        existing = User.objects.filter(query)
+        if existing:
+            raise forms.ValidationError(
+                _("User with username %s already exists.") % data)
+        # Check Hardtree Subscription user limit
+        user_limit = getattr(settings, 'HARDTREE_SUBSCRIPTION_USER_LIMIT', 0)
+        if user_limit > 0:
+            user_number = User.objects.filter(disabled=False).count()
+            if user_number >= user_limit:
+                raise forms.ValidationError(
+                    _("Sorry, but your subscription does not allow more than %d users. You're currently at your limit.") % (user_limit))
+        return data
+
+    def clean_password_again(self):
+        "Clean password again"
+        password1 = self.cleaned_data['password']
+        password2 = self.cleaned_data['password_again']
+        if not password1 == password2:
+            raise forms.ValidationError(_("Passwords do not match"))
+        return password2
+
+    def save(self, *args, **kwargs):
+        "Form processor"
+
+        profile = None
+
+        if self.invitation:
+            # Create DjangoUser
+            django_user = django_auth.User(
+                username=self.cleaned_data['username'], password='')
+            django_user.set_password(self.cleaned_data['password'])
+            django_user.save()
+
+            # Crate profile
+            try:
+                profile = django_user.profile
+            except:
+                profile = User()
+                profile.user = django_user
+
+            profile.name = django_user.username
+            profile.default_group = self.invitation.default_group
+            profile.save()
+
+            # Create contact
+            try:
+                contact_type = ContactType.objects.get(
+                    Q(name='Person') | Q(slug='person'))
+            except:
+                contact_type = ContactType.objects.all()[0]
+
+            try:
+                # Check if contact has already been created (e.g. by a signals
+                contact = profile.get_contact()
+                if not contact:
+                    contact = Contact()
+            except:
+                contact = Contact()
+
+            contact.name = self.cleaned_data['name']
+            contact.contact_type = contact_type
+            contact.related_user = profile
+            contact.save()
+
+            # Set email
+            try:
+                emailfield = contact_type.fields.filter(field_type='email')[0]
+                email = ContactValue(
+                    value=self.invitation.email, field=emailfield, contact=contact)
+                email.save()
+            except:
+                pass
+
+            # Add quick start widget
+            widget = Widget(user=profile,
+                            perspective=profile.get_perspective(),
+                            module_name='treeio.core',
+                            widget_name='widget_welcome')
+            widget.save()
+
+        return profile
+
+
+class LocationForm(forms.ModelForm):
+
+    """ Item location form """
+
+    def __init__(self, user, location_id, *args, **kwargs):
+        super(LocationForm, self).__init__(*args, **kwargs)
+
+        self.fields['name'].label = _("Name")
+
+        self.fields['parent'].label = _("Parent")
+        self.fields['parent'].queryset = Object.filter_permitted(
+            user, Location.objects, mode='x')
+        if location_id:
+            self.fields['parent'].initial = location_id
+
+    class Meta:
+
+        "Location Form"
+        model = Location
+        fields = ('name', 'parent')
+
+
+class SqlSettingsForm(forms.Form):
+    sql_engine = forms.ChoiceField(choices=(("postgresql", _('PostgreSQL'),), ("postgresql_psycopg2", _("Psycopg")),
+                                            ("sqlite3", _("SQLite")), ("mysql", _('MySql')), ("oracle", _("Oracle"))))
+    sql_database = forms.CharField(max_length=256)
+    sql_user = forms.CharField(max_length=30)
+    sql_password = forms.CharField(
+        max_length=128, required=False, widget=forms.PasswordInput)
+
+    def clean_sql_engine(self):
+        engine = self.cleaned_data['sql_engine']
+        return "django.db.backends.%s" % engine
+
+    def create_database(self):
+        if not self._errors:
+            from django.db import connections
+            from django.core.exceptions import ImproperlyConfigured
+            from treeio.core.domains import setup_domain_database
+            database = {
+                'ENGINE': self.cleaned_data['sql_engine'],
+                'NAME': self.cleaned_data['sql_database'],
+                'USER': self.cleaned_data['sql_user'],
+                'PASSWORD': self.cleaned_data['sql_password'],
+            }
+            # creates database
+            settings.DATABASES['treeio_new_db'] = database
+            try:
+                setup_domain_database('treeio_new_db', True)
+            except ImproperlyConfigured as exc:
+                self._errors['sql_engine'] = self.error_class(
+                    [_("Can't connect to engine. Error is ") + exc.message])
+                del self.cleaned_data['sql_engine']
+            except Exception as exc:
+                del connections._connections['treeio_new_db']
+                raise ValidationError(
+                    _("Can't create database. SQL error is") + ' %s' % exc)
+            finally:
+                del settings.DATABASES['treeio_new_db']
+
+            # save database settings
+            settings.DATABASES[router.db_for_read(ConfigSetting)] = database
+            connections._connections.clear()
+            if not getattr(settings, 'HARDTREE_MULTITENANCY', False):
+                settings_filepath = sys.modules[
+                    os.environ['DJANGO_SETTINGS_MODULE']].__file__
+                if settings_filepath.endswith('.pyc'):
+                    settings_filepath = settings_filepath[:-1]
+                with open(settings_filepath, 'r') as fl:
+                    lines = fl.readlines()
+                with open(settings_filepath, 'w') as fl:
+                    lines = iter(lines)
+                    for line in lines:
+                        if 'DATABASES' not in line:
+                            fl.write(line)
+                        else:
+                            fl.write('DATABASES = ')
+                            break
+                    fl.write(repr(settings.DATABASES))
+                    fl.write('\n\n')
+                    for line in lines:
+                        if '=' in line:
+                            fl.write(line)
+                            break
+                    for line in lines:
+                        fl.write(line)
diff --git a/data/treeio/treeio/treeio/core/mail.py b/data/treeio/treeio/treeio/core/mail.py
new file mode 100644
index 0000000..5215655
--- /dev/null
+++ b/data/treeio/treeio/treeio/core/mail.py
@@ -0,0 +1,522 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+"""
+Core Mail Framework
+"""
+from treeio.core.conf import settings
+
+import re
+import time
+import base64
+import smtplib
+import imaplib
+import email
+import poplib
+from datetime import datetime
+
+from email.MIMEText import MIMEText
+from email.header import decode_header
+from email.MIMEMultipart import MIMEMultipart
+
+from threading import Thread
+from django.utils.encoding import smart_unicode
+from django.utils.translation import ugettext as _
+from django.template.defaultfilters import removetags
+
+EMAIL_SERVER = getattr(settings, 'EMAIL_SERVER', '127.0.0.1')
+IMAP_SERVER = getattr(settings, 'IMAP_SERVER', '')
+EMAIL_USERNAME = getattr(settings, 'EMAIL_USERNAME', None)
+EMAIL_PASSWORD = getattr(settings, 'EMAIL_PASSWORD', None)
+EMAIL_FROM = getattr(settings, 'EMAIL_FROM', 'noreply@tree.io')
+DEFAULT_SIGNATURE = getattr(settings, 'DEFAULT_SIGNATURE', '')
+
+
+class BaseEmail(Thread):
+
+    "Generic e-mail class to send any emails"
+
+    def __init__(self, server, username, password, fromaddr,
+                 toaddr, subject, body, signature=None, html=None,
+                 port=None, ssl=False):
+        Thread.__init__(self)
+        self.server = server
+        self.port = port
+        self.ssl = ssl
+        self.username = username
+        self.password = password
+        self.toaddr = toaddr
+        self.fromaddr = fromaddr
+        self.subject = subject
+        self.body = body
+        self.signature = signature
+        self.html = html
+        self.multipart = self.body and self.html
+
+    def run(self):
+        "Run"
+        self.process_email()
+
+    def send_email(self):
+        "Send email"
+        self.start()
+
+    def get_smtp_port(self, server):
+        "Returns appropriate SMTP port number depending on incoming server name and boolean ssl"
+        # http://www.emailaddressmanager.com/tips/mail-settings.html
+
+        port = 25  # default
+        ssl = False
+
+        if "gmail.com" in server or "googlemail.com" in server:
+            port = 587
+            ssl = False
+        elif server == "plus.smtp.mail.yahoo.com":
+            if hasattr(smtplib, 'SMTP_SSL'):
+                port = 465
+            ssl = True
+        if server == "smtp.live.com" or server == "smtp.isp.netscape.com":
+            ssl = True
+
+        return port, ssl
+
+    def process_email(self):
+        "Create a message and send it"
+        try:
+            msg = MIMEMultipart('alternative')
+
+            msg['From'] = self.fromaddr
+            msg['To'] = self.toaddr
+            msg['Subject'] = self.subject
+
+            text = self.body
+            html = self.html
+
+            # adding signature
+            if self.signature:
+                text += self.signature
+
+            # Record the MIME types of both parts - text/plain and text/html.
+            part1 = MIMEText(text.encode('utf-8'), 'plain', 'utf-8')
+            msg.attach(part1)
+
+            if html:
+                part2 = MIMEText(html.encode('utf-8'), 'html', 'utf-8')
+                msg.attach(part2)
+
+            if not self.port:
+                self.port, self.ssl = self.get_smtp_port(self.server)
+
+            if self.ssl and hasattr(smtplib, 'SMTP_SSL'):
+                s = smtplib.SMTP_SSL(self.server, self.port)
+            else:
+                s = smtplib.SMTP(self.server, self.port)
+            s.set_debuglevel(0)
+            s.ehlo()
+            try:
+                s.starttls()
+            except smtplib.SMTPException:
+                pass
+            s.ehlo()
+            if self.username is not None:
+                s.login(self.username, self.password)
+            s.sendmail(self.fromaddr, self.toaddr, msg.as_string())
+            s.close()
+            return True
+        except:
+            if settings.DEBUG:
+                raise
+            else:
+                import traceback
+                import sys
+                from treeio import core
+                from django.core.mail import mail_admins
+                exc_type, exc_value, exc_traceback = sys.exc_info()
+                domain = getattr(settings, 'CURRENT_DOMAIN', 'default')
+                subject = "Exception for %s: %s %s" % (
+                    domain, unicode(exc_type), unicode(exc_value))
+                body = subject + "\n\n"
+                body += unicode(core.__file__) + "\n\n"
+                body += u"Server: %s\n\n" % self.server
+                body += u"Port: %s\n\n" % unicode(self.port)
+                body += u"Username: %s\n\n" % self.username
+                body += u"From: %s\n\n" % self.fromaddr
+                body += u"To: %s\n\n" % self.toaddr
+                for s in traceback.format_tb(exc_traceback):
+                    body += s + '\n'
+                mail_admins(subject, body)
+
+
+class SystemEmail(BaseEmail):
+
+    "E-mail class to send messages on behalf of Tree.io team"
+
+    def __init__(self, toaddr, subject, body, signature=None, html=None):
+
+        if not signature:
+            signature = _(DEFAULT_SIGNATURE)
+
+        BaseEmail.__init__(self, EMAIL_SERVER, EMAIL_USERNAME, EMAIL_PASSWORD, EMAIL_FROM,
+                           toaddr, subject, body, signature, html)
+
+#
+# Specific email classes
+#
+
+
+class EmailInvitation(SystemEmail):
+
+    "Email Invitation"
+
+    invitation = None
+    sender = None
+
+    def __init__(self, invitation, sender, domain):
+        self.invitation = invitation
+        self.sender = sender
+        self.domain = domain
+
+        subject = '%s has invited you to Tree.io' % (self.sender)
+
+        toaddr = self.invitation.email
+
+        signature = """
+\r\n
+- %s""" % unicode(self.sender)
+
+        body = """
+Hi!
+\r\n
+I've invited you to Tree.io.
+\r\n
+Tree.io is a new online service that helps you manage your business online.
+\r\n
+Use this link to join me:
+\r\n
+http://%s/accounts/invitation/?email=%s&key=%s
+        """ % (unicode(self.domain),
+               unicode(self.invitation.email),
+               unicode(self.invitation.key))
+
+        super(EmailInvitation, self).__init__(toaddr, subject, body, signature)
+
+
+class EmailPassword(SystemEmail):
+
+    "Email Message"
+
+    def __init__(self, toaddr, username, password):
+
+        subject = "Password reset on Tree.io"
+
+        body = """
+Hello!
+\r\n
+You have requested a password reset for your Tree.io account.
+\r\n
+New password for: %s\r\n\r\n Password: %s\r\n\r\n
+""" % (username, password)
+
+        super(EmailPassword, self).__init__(toaddr, subject, body)
+
+
+#
+# Abstract email receiver
+#
+
+def intcmp(a, b):
+    try:
+        return cmp(int(a), int(b))
+    except:
+        return cmp(a, b)
+
+
+class EmailReceiver(Thread):
+
+    """EmailReceiver fetches email from imap and pop email servers.
+       This class can be used only as parent. You should redefine
+       the process_msg method.
+    """
+
+    def __init__(self, server_type, server_name, username, password, folder_name=None):
+        Thread.__init__(self)
+        self.incoming_server_type = server_type
+        self.incoming_server_name = server_name
+        self.incoming_server_username = username
+        self.incoming_password = password
+        self.folder_name = folder_name or getattr(
+            settings, 'HARDTREE_MESSAGING_IMAP_DEFAULT_FOLDER_NAME', 'UNSEEN')
+
+        default_timezone = settings.HARDTREE_SERVER_DEFAULT_TIMEZONE
+        all_timezones = getattr(settings, 'HARDTREE_SERVER_TIMEZONE', [
+                                (1, '(GMT-11:00) International Date Line West')])
+        title = all_timezones[int(default_timezone)][1]
+        GMT = title[4:10]  # with sign e.g. +06:00
+        sign = GMT[0:1]  # + or -
+        hours = int(GMT[1:3])  # e.g. 06
+        mins = int(GMT[4:6])
+        self.tzoffset = hours * 3600 + mins * 60
+        if sign == "-":
+            self.tzoffset *= -1
+
+    def run(self):
+        "Run"
+        self.get_emails()
+
+    def get_pop_port(self):
+        "Returns appropriate POP port number depending on incoming server name"
+
+        port = 110  # default
+        ssl = False
+
+        if self.incoming_server_type == 'POP3-SSL':
+            port = 995
+            ssl = True
+
+        return port, ssl
+
+    def get_imap_port(self):
+        "Returns appropriate IMAP port number depending on incoming server name"
+
+        port = 143  # default
+        ssl = False
+
+        if self.incoming_server_type == 'IMAP-SSL':
+            port = 993
+            ssl = True
+
+        return port, ssl
+
+    def get_emails(self):
+        "Fetches emails"
+
+        if self.incoming_server_type == 'IMAP' or self.incoming_server_type == 'IMAP-SSL':
+
+            HARDTREE_MESSAGING_IMAP_LIMIT = getattr(
+                settings, 'HARDTREE_MESSAGING_IMAP_LIMIT', 100)
+            # connect to the server
+            port, ssl = self.get_imap_port()
+
+            if ssl:
+                M = imaplib.IMAP4_SSL(self.incoming_server_name, port)
+            else:
+                M = imaplib.IMAP4(self.incoming_server_name, port)
+            M.login(self.incoming_server_username, self.incoming_password)
+            M.select()
+
+            msgnums = []
+            try:
+                # fetch mail from ALL or UNSEEN]
+                typ, data = M.sort('REVERSE DATE', 'UTF-8', self.folder_name)
+                msgnums = data[0].split() if data[0] else []
+            except:
+                # fetch mail from ALL or UNSEEN]
+                typ, data = M.search(None, self.folder_name)
+                msgnums = data[0].split() if data[0] else []
+                msgnums = sorted(msgnums, cmp=intcmp, reverse=True)
+
+            for num in msgnums[:HARDTREE_MESSAGING_IMAP_LIMIT]:
+                resp, msg = M.fetch(num, '(RFC822)')
+                mail = email.message_from_string(msg[0][1])
+                self.process_mail(mail)
+                if self.folder_name == 'UNSEEN':
+                    M.store(num, '+FLAGS', '\\Seen')
+
+            M.close()
+            M.logout()
+
+        if self.incoming_server_type == 'POP3' or self.incoming_server_type == 'POP3-SSL':
+
+            HARDTREE_MESSAGING_POP3_LIMIT = getattr(
+                settings, 'HARDTREE_MESSAGING_POP3_LIMIT', 100)
+            # connect to the server
+            port, ssl = self.get_pop_port()
+
+            if ssl:
+                M = poplib.POP3_SSL(self.incoming_server_name, port)
+            else:
+                M = poplib.POP3(self.incoming_server_name, port)
+            M.user(self.incoming_server_username)
+            M.pass_(self.incoming_password)
+
+            numMessages = len(M.list()[1])
+
+            # Select correct limit for range(limit, numMessages)
+            if numMessages >= HARDTREE_MESSAGING_POP3_LIMIT:
+                limit = numMessages - HARDTREE_MESSAGING_POP3_LIMIT
+            else:
+                limit = 0
+
+            # select new emails
+            for i in range(limit, numMessages):
+                lines = M.retr(i)[1]
+                mail = email.message_from_string("\n".join(lines))
+                self.process_mail(mail)
+            M.quit()
+
+    def process_mail(self, mail):
+        # process message
+        body = None
+        attachments = []
+
+        if mail.is_multipart():
+            text = None
+            html = None
+            for part in mail.walk():
+                # multipart are just containers, so we skip them
+                if part.get_content_maintype() == 'multipart':
+                    continue
+
+                if part.get_filename() and part.get('Content-Transfer-Encoding', '') == 'base64':
+                    attachments.append(part)
+                    continue
+
+                if part.get_content_type() == 'text/plain':
+                    text = part.get_payload(decode=True)
+
+                if part.get_content_type() == 'text/html':
+                    html = part.get_payload(decode=True)
+
+            body = html if html else text
+        else:
+            body = mail.get_payload(decode=True)
+
+        class MailAttrs:
+            pass
+        attrs = MailAttrs()
+        attrs.subject, encoding = self.decode_subject(mail['subject'])
+        # replace annoying characters
+        attrs.body = self.decode(body, encoding)
+        if not mail.is_multipart() and not mail.get_content_type().endswith('html'):
+            attrs.body = attrs.body.replace('&', '&amp;').replace('<', '&lt;').replace(
+                '>', '&gt;').replace('"', '&quot;').replace("'", '&#39;')
+        attrs.body = self.parse_email_body(attrs.body)
+        attrs.author_name, attrs.author_email = self.get_email_author(mail)
+
+        attrs.email_date = None
+        try:
+            date_tuple = email.utils.parsedate_tz(mail['Date'])
+            email_ts = time.mktime(
+                date_tuple[:9]) - int(date_tuple[9]) + self.tzoffset
+            attrs.email_date = datetime.fromtimestamp(email_ts)
+        except:
+            pass
+
+        self.process_msg(mail, attrs, attachments)
+
+    def process_msg(self, msg, attrs, attachments):
+        raise NotImplementedError
+
+    def decode(self, string, encoding):
+        if encoding:
+            return smart_unicode(string, encoding, errors='ignore')
+        else:
+            return self.make_unicode(string)
+
+    def make_unicode(self, string):
+        "Detects string encoding and make it unicode"
+
+        utf8_detector = re.compile(r"""^(?:
+            [\x09\x0A\x0D\x20-\x7E]            # ASCII
+          | [\xC2-\xDF][\x80-\xBF]             # non-overlong 2-byte
+          |  \xE0[\xA0-\xBF][\x80-\xBF]        # excluding overlongs
+          | [\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}  # straight 3-byte
+          |  \xED[\x80-\x9F][\x80-\xBF]        # excluding surrogates
+          |  \xF0[\x90-\xBF][\x80-\xBF]{2}     # planes 1-3
+          | [\xF1-\xF3][\x80-\xBF]{3}          # planes 4-15
+          |  \xF4[\x80-\x8F][\x80-\xBF]{2}     # plane 16
+         )*$""", re.X)
+
+        cp1252_detector = re.compile(r'^(?:[\x80-\xBF])*$', re.X)
+        xa4_detector = re.compile(r'^(?:\xA4)*$', re.X)
+
+        try:
+            if re.match(utf8_detector, string):
+                return unicode(string, 'utf_8')
+            if re.match(cp1252_detector, string):
+                if re.match(xa4_detector, string):
+                    return smart_unicode(string, 'iso8859_15')
+                else:
+                    return smart_unicode(string, 'cp1252')
+            return smart_unicode(string, 'koi8-r', errors='ignore')
+        except:
+            return smart_unicode(string, 'utf-8', errors='ignore')
+
+    def decode_subject(self, subject):
+        "Decodes email subjects"
+        if not subject:
+            subject = 'No subject'
+            encoding = None
+        else:
+            subject, encoding = decode_header(subject)[0]
+            subject = self.decode(subject, encoding)
+        return subject, encoding
+
+    def decode_body(self, body):
+        "Decodes Base64-encoded string"
+        if body is None:
+            body = 'No message'
+        else:
+            body = str(body)
+            body = base64.b64decode(body)
+
+        return body
+
+    def parse_email_body(self, body):
+        "Removes all the dangerous and useless staff"
+
+        # Replace annoying characters
+        body = body.replace('\r', '').replace('=\n', '').replace('=\n\r', '')
+        body = body.replace('=20\n', '\n\n')
+
+        HARDTREE_MESSAGING_UNSAFE_BLOCKS = getattr(settings, 'HARDTREE_MESSAGING_UNSAFE_BLOCKS',
+                                                   ('head', 'object', 'embed', 'applet', 'noframes',
+                                                    'noscript', 'noembed', 'iframe', 'frame', 'frameset'))
+
+        # Strip unsafe tags
+        tags_str = ' '.join(HARDTREE_MESSAGING_UNSAFE_BLOCKS)
+        body = removetags(body, tags_str)
+
+        # Remove multiple <br /> tags
+        rules = [
+            {r'\s*<br\s*/?>\s*': u'\n'}
+        ]
+
+        for rule in rules:
+            for (k, v) in rule.items():
+                regex = re.compile(k)
+                body = regex.sub(v, body)
+
+        # displaying messages correctly
+        if body.startswith('<!DOCTYPE') or body.startswith('<html') or body.startswith('<meta'):
+            body = body.replace('\n\n\n', '\n').replace(
+                '\n\n', '\n').replace('>\n<', '><')
+        elif '<html' not in body:
+            body = body.replace('\n', '<br />\n')
+
+        return body
+
+    def get_email_author(self, msg):
+        "Returns author's name and email if any"
+        try:
+            header_from = msg['From']
+            splits = header_from.split('<', 1)
+            name, email = splits if len(splits) == 2 else ('', header_from)
+            email = email.split('>', 1)[0]
+            if name:
+                name, encoding = decode_header(name.strip(' "\''))[0]
+                name = self.decode(name, encoding)
+                name = name.strip(' \'"')
+        except:
+            email = name = None
+
+        if not email:
+            try:
+                email = msg['Return-path']
+                email.strip(' \'"<>')
+            except Exception:
+                email = None
+
+        return name, email
diff --git a/data/treeio/treeio/treeio/core/management/commands/installdb.py b/data/treeio/treeio/treeio/core/management/commands/installdb.py
new file mode 100644
index 0000000..26b8537
--- /dev/null
+++ b/data/treeio/treeio/treeio/core/management/commands/installdb.py
@@ -0,0 +1,92 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+from distutils.util import strtobool
+from django.core.management.base import BaseCommand, CommandError
+from treeio.core.conf import settings
+import json
+import subprocess
+import sys
+
+
+class Command(BaseCommand):
+    args = ''
+    help = 'Installs the database prompting the user for all details'
+
+    def handle(self, *args, **options):
+
+        initial_db = {
+            'ENGINE': 'django.db.backends.sqlite3',
+            'NAME': './initial.db',
+            'HOST': '',
+            'USER': '',
+            'PASSWORD': ''
+        }
+
+        db = {}
+
+        dbengine = raw_input(
+            'Enter database engine <mysql,postgresql,postgresql_psycopg2,oracle,sqlite3> (defaults to postgres): ')
+        if not dbengine:
+            dbengine = 'postgresql_psycopg2'
+        if dbengine in ('mysql', 'postgresql', 'postgresql_psycopg2', 'oracle', 'sqlite3'):
+            dbengine = 'django.db.backends.' + dbengine
+        else:
+            raise CommandError('Unknown database engine: %s' % dbengine)
+
+        if dbengine.endswith('sqlite3'):
+            dbname = raw_input(
+                'Enter database name (defaults to treeio.db): ')
+            if not dbname:
+                dbname = 'treeio.db'
+        else:
+            dbname = raw_input(
+                'Enter database name (defaults to treeio): ')
+            if not dbname:
+                dbname = 'treeio'
+
+            dbuser = raw_input('Database user (defaults to treeio): ')
+            if not dbuser:
+                dbuser = 'treeio'
+
+            dbpassword = raw_input('Database password: ')
+
+            dbhost = raw_input('Hostname (defaults to 127.0.0.1): ')
+            if not dbhost:
+                dbhost = '127.0.0.1'
+            dbport = raw_input('Port (empty for default): ')
+
+        self.stdout.write('\n-- Saving database configuration...\n')
+        self.stdout.flush()
+        settings.CONF.set('db', 'ENGINE', dbengine)
+        settings.CONF.set('db', 'NAME', dbname)
+        if not dbengine.endswith('sqlite3'):
+            settings.CONF.set('db', 'USER', dbuser)
+            settings.CONF.set('db', 'PASSWORD', dbpassword)
+            settings.CONF.set('db', 'HOST', dbhost)
+            settings.CONF.set('db', 'PORT', dbport)
+
+        with open(settings.USER_CONFIG_FILE, 'w') as f:
+            settings.CONF.write(f)
+
+        answer = raw_input(
+            'Would you like to create the tables (say no to use an existing database) [y/n] (defaults to yes): ')
+        if not len(answer):
+            answer = True
+        else:
+            answer = strtobool(answer)
+
+        if answer:
+            exit_code = subprocess.call(
+                [sys.executable, 'manage.py', 'syncdb', '--all', '--noinput'])
+            if not exit_code == 0:
+                self.stdout.flush()
+                raise CommandError('Failed to install database.')
+
+            exit_code = subprocess.call(
+                [sys.executable, 'manage.py', 'migrate', '--all', '--fake', '--noinput', '--no-initial-data'])
+
+            self.stdout.write(
+                '\n-- Successfully installed database. \n-- You\'re ready to go!\n\n')
diff --git a/data/treeio/treeio/treeio/core/management/commands/runcron.py b/data/treeio/treeio/treeio/core/management/commands/runcron.py
new file mode 100644
index 0000000..3e7d37c
--- /dev/null
+++ b/data/treeio/treeio/treeio/core/management/commands/runcron.py
@@ -0,0 +1,261 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+"""
+Cron commands
+"""
+from django.core.management.base import BaseCommand
+from django.conf import settings
+from django.core.cache import cache
+from core.domains import setup_domain
+from optparse import make_option
+import multiprocessing
+import logging
+import logging.handlers
+import signal
+import time
+import sys
+
+LOG_LEVELS = {'debug': logging.DEBUG,
+              'info': logging.INFO,
+              'warning': logging.WARNING,
+              'error': logging.ERROR,
+              'critical': logging.CRITICAL}
+
+cronlogger = logging.getLogger('CronLogger')
+cronlogger.setLevel(logging.DEBUG)
+
+
+class CronJob(multiprocessing.Process):
+
+    "Single Cron job"
+
+    job = None
+    database = 'default'
+    priority = 5
+
+    def __init__(self, job, database='default', priority=5, *args, **kwargs):
+        super(CronJob, self).__init__(*args, **kwargs)
+        self.job = job
+        self.priority = priority
+        self.database = database
+        self._stopped = False
+
+    def sigterm(self, *args, **kwargs):
+        cronlogger = logging.getLogger('CronLogger')
+        if self._stopped:
+            cronlogger.critical('JOB - Terminated ' + unicode(self))
+            sys.exit(1)
+        else:
+            self._stopped = True
+            cronlogger.warning('JOB - Early shutdown ' + unicode(self))
+            raise KeyboardInterrupt()
+
+    def run(self):
+        signal.signal(signal.SIGTERM, self.sigterm)
+        setup_domain(self.database)
+        cronlogger = logging.getLogger('CronLogger')
+        cronlogger.debug('JOB - Starting ' + unicode(self))
+        try:
+            self.job()
+        except KeyboardInterrupt:
+            self._stopped = True
+        except SystemExit:
+            self._stopped = True
+        except:
+            import traceback
+            from hardtree import core
+            from django.core.mail import mail_admins
+            exc_type, exc_value, exc_traceback = sys.exc_info()
+            subject = "CRON Exception for " + \
+                unicode(self) + ": " + unicode(exc_type) + \
+                " " + unicode(exc_value)
+            body = subject + "\n\n"
+            body += unicode(core.__file__) + "\n\n"
+            for s in traceback.format_tb(exc_traceback):
+                body += s + '\n'
+            cronlogger.error(subject + '\n' + body)
+            mail_admins(subject, body)
+        cronlogger.debug('JOB - Finished ' + unicode(self))
+
+    def __repr__(self):
+        return 'CronJob ' + unicode(self.database) + ': ' + unicode(self.job)
+
+    def __unicode__(self):
+        return self.__repr__()
+
+
+class CronRunner():
+
+    "Cron runner"
+
+    pool = []
+    queue = []
+    jobs = []
+    sleeptime = 60
+    cycle = 1
+    _stopped = False
+
+    def __init__(self, databases=None, noloop=False, *args, **kwargs):
+        "Capture all cron jobs"
+        if databases is None:
+            databases = []
+
+        signal.signal(signal.SIGTERM, self.stop)
+
+        self.databases = databases or []
+        self.jobs = []
+        self.sleeptime = getattr(settings, 'HARDTREE_CRON_PERIOD', 60)
+        self.priority_high = getattr(
+            settings, 'HARDTREE_CRON_HIGH_PRIORITY', 10)
+        self.priority_low = getattr(settings, 'HARDTREE_CRON_LOW_PRIORITY', 3)
+        self.qualify_high = getattr(settings, 'HARDTREE_CRON_QUALIFY_HIGH', 10)
+        self.qualify_run = getattr(
+            settings, 'HARDTREE_CRON_QUALIFY_RUN', 86400)
+        self.poolsize = getattr(settings, 'HARDTREE_CRON_POOL_SIZE', 10)
+        self.softkill = getattr(settings, 'HARDTREE_CRON_SOFT_KILL', 0)
+        self.hardkill = getattr(settings, 'HARDTREE_CRON_HARD_KILL', -1)
+        self.gracewait = getattr(settings, 'HARDTREE_CRON_GRACE_WAIT', 5)
+        self.noloop = noloop
+
+        for module in settings.INSTALLED_APPS:
+            import_name = str(
+                module) + "." + settings.HARDTREE_MODULE_IDENTIFIER
+            try:
+                hmodule = __import__(import_name, fromlist=[str(module)])
+                self.jobs.extend(hmodule.CRON)
+            except ImportError:
+                pass
+            except AttributeError:
+                pass
+
+        if not self.databases:
+            self.databases = [db for db in settings.DATABASES]
+
+        cronlogger.info('Starting cron...')
+        cronlogger.debug('DATABASES: ' + unicode(self.databases))
+        cronlogger.debug('CRON_PERIOD: ' + unicode(self.sleeptime))
+        cronlogger.debug('CRON_HIGH_PRIORITY: ' + unicode(self.priority_high))
+        cronlogger.debug('CRON_LOW_PRIORITY: ' + unicode(self.priority_low))
+        cronlogger.debug('CRON_QUALIFY_HIGH: ' + unicode(self.qualify_high))
+        cronlogger.debug('CRON_POOL_SIZE: ' + unicode(self.poolsize))
+        cronlogger.debug('CRON_SOFT_KILL: ' + unicode(self.softkill))
+        cronlogger.debug('CRON_HARD_KILL: ' + unicode(self.hardkill))
+        cronlogger.debug('CRON_GRACE_WAIT: ' + unicode(self.gracewait))
+        cronlogger.debug('CRON_NO_LOOP: ' + unicode(self.noloop))
+
+    def add_jobs(self):
+        "Adds all jobs to the queue"
+        cronlogger.info(
+            'Adding ' + unicode(len(self.jobs)) + ' jobs to the queue.')
+        for db in self.databases:
+            cronlogger.debug('ADDING JOBS FOR ' + unicode(db))
+            cache_key = 'hardtree_' + db + '_last'
+            last_accessed = cache.get(cache_key)
+            if last_accessed:
+                if last_accessed >= time.time() - int(self.qualify_run):
+                    for job in self.jobs:
+                        cron = CronJob(job, db, self.priority_low)
+                        self.queue.append(cron)
+                        cronlogger.debug('JOB ADDED ' + unicode(cron))
+                else:
+                    cronlogger.debug(
+                        'JOB DOES NOT QUALIFY ' + unicode(db) + ': NOT USED in last ' + unicode(self.qualify_run))
+            else:
+                cronlogger.debug(
+                    'JOB DOES NOT QUALIFY ' + unicode(db) + ': NO KEY IN cache')
+        cronlogger.debug('Queue: ' + unicode(self.jobs))
+
+    def start(self):
+        "Start cron runner"
+        self.add_jobs()
+        try:
+            while not self._stopped:
+                if len(self.pool) < self.poolsize:
+                    while len(self.queue) > 0 and len(self.pool) < self.poolsize:
+                        cron = self.queue.pop()
+                        self.pool.append(cron)
+                        if 'hardtree_%s_last' % (cron.database) in cache:
+                            last_accessed = cache.get(
+                                'hardtree_%s_last' % (cron.database))
+                            if last_accessed > (time.time() - int(self.qualify_high)):
+                                cron.priority = self.priority_high
+                                cronlogger.debug(
+                                    'HIGH PRIORITY set to ' + unicode(cron))
+                        cron.start()
+                if len(self.queue) == 0:
+                    cronlogger.info(
+                        'Cron cycle ' + unicode(self.cycle) + ' completed.')
+                    self.cycle += 1
+                    if self.noloop:
+                        self._stopped = True
+                    else:
+                        self.add_jobs()
+                        time.sleep(self.sleeptime)
+                cronlogger.debug("POOL SIZE: " + unicode(len(self.pool)))
+                for cron in self.pool:
+                    cronlogger.debug("POOL JOB: " + unicode(cron) + ', PRIORITY ' +
+                                     unicode(cron.priority) + ', ACTIVE: ' + unicode(cron.is_alive()))
+                    if not cron.is_alive():
+                        self.pool.remove(cron)
+                        continue
+                    if cron.priority == self.softkill:
+                        cron.terminate()
+                    elif cron.priority <= self.hardkill:
+                        cron.terminate()
+                    cron.priority -= 1
+                time.sleep(self.sleeptime)
+        except KeyboardInterrupt:
+            self.stop()
+
+    def stop(self, *args, **kwargs):
+        cronlogger.info('Stopping...')
+        self._stopped = True
+        for cron in self.pool:
+            while cron.is_alive():
+                cron.terminate()
+                time.sleep(self.gracewait)
+        cronlogger.debug('Stopped.')
+        sys.exit(0)
+
+
+class Command(BaseCommand):
+    args = '[database database ...]'
+    help = 'Starts cron runner'
+    option_list = BaseCommand.option_list + (
+        make_option('-l', '--logfile',
+                    action='store',
+                    dest='logfile',
+                    default='/tmp/hardtree-cron.log',
+                    help='Cron log file'
+                    ),
+        make_option('-d', '--loglevel',
+                    type='choice',
+                    action='store',
+                    dest='loglevel',
+                    default='info',
+                    choices=[i for i in LOG_LEVELS],
+                    help='Logging level'
+                    ),
+        make_option('-n', '--noloop',
+                    action='store_true',
+                    dest='noloop',
+                    default=False,
+                    help='Exit after all jobs are finished'
+                    )
+
+    )
+
+    def handle(self, *args, **options):
+        loghandler = logging.handlers.RotatingFileHandler(
+            options.get('logfile'), maxBytes=100 * 1024 * 1024, backupCount=5)
+        formatter = logging.Formatter(
+            "%(asctime)s - %(name)s - %(levelname)s - %(message)s")
+        loghandler.setFormatter(formatter)
+        loghandler.setLevel(LOG_LEVELS[options.get('loglevel')])
+        cronlogger.setLevel(LOG_LEVELS[options.get('loglevel')])
+        cronlogger.addHandler(loghandler)
+        self.runner = CronRunner(args, noloop=options.get('noloop'))
+        self.runner.start()
diff --git a/data/treeio/treeio/treeio/core/middleware/chat.py b/data/treeio/treeio/treeio/core/middleware/chat.py
new file mode 100644
index 0000000..f0330b4
--- /dev/null
+++ b/data/treeio/treeio/treeio/core/middleware/chat.py
@@ -0,0 +1,519 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+# -*- coding:utf-8 -*-
+
+import json
+from time import sleep
+from django.http import HttpResponse, HttpRequest
+from treeio.core.conf import settings
+import threading
+from datetime import datetime
+from time import strftime
+from hashlib import md5
+import sys
+from django.core.cache import cache
+import cPickle
+from django.contrib.messages.storage import default_storage
+
+
+def get_key(postfix=""):
+    """
+    Return key for memcached
+    :param postfix: postfix key
+    :type postfix: basestring
+    """
+    domain = getattr(settings, 'CURRENT_DOMAIN', 'default')
+    key = "treeio_%s_chat_%s" % (domain, postfix)
+    return key
+
+
+def create_lock(key):
+    try:
+        while True:
+            if cache.add(key + '_lock', '1', 10):  # lifetime lock 10 seconds
+                break
+        return True
+    except:
+        print "Error: ", sys.exc_info()
+        return False
+
+
+def delete_lock(key):
+    cache.delete(key + '_lock')
+
+
+def set_memcached(key, obj, lock=True):
+    """
+    Serialization object and add his in memcached
+    """
+    if lock:
+        if create_lock(key):
+            # 60 sec * 60 min * 24 hour * 30 day = 2 592 000 sec
+            cache.set(key, cPickle.dumps(obj), 2592000)
+            delete_lock(key)
+    else:
+        cache.set(key, cPickle.dumps(obj), 2592000)
+
+
+def get_memcached(key):
+    """
+    Return deserialize object from memcached
+    """
+    data = cache.get(key)
+    if not data:
+        set_memcached(key, {})
+    obj = cPickle.loads(cache.get(key))
+    return obj
+
+
+def get_notifications(user):
+    """
+    Return list notifications
+    :param user: object user
+    """
+    notifications = []
+    try:
+        user.id
+    except:
+        return []
+    try:
+        if not getattr(settings, 'HARDTREE_ALLOW_GRITTER_NOTIFICATIONS', False):
+            return notifications
+        request = HttpRequest()
+        request.user = user
+        storage = default_storage(request)
+        for msg in storage._get()[0]:
+            notifications.append({'message': msg.message,
+                                  'tags': msg._get_tags()})
+        storage._store(None)
+    except:
+        pass
+    return notifications
+
+
+def get_user_profile(user):
+    """
+    return user profile
+    """
+    try:
+        listeners = get_memcached(get_key("listeners"))
+        return listeners[user]["profile"]
+    except:
+        return user
+
+
+def update_user(user, location):
+    """
+    update location and the last time request Users
+    :param user: object user
+    :param location: location user on site
+    :type location: basestring
+    """
+    try:
+        listeners = get_memcached(get_key("listeners"))
+        _user_profile = str(user.profile)
+        _user = str(user)
+        listeners[_user] = {
+            "datetime": datetime.now(), "locations": location, "profile": _user_profile}
+        set_memcached(get_key("listeners"), listeners)
+    except:
+        print "Error: ", sys.exc_info()
+
+
+def remove_user(id, user):
+    """
+    Remove user from conference
+    :param id: ID conference
+    :type id: basestring
+    :type user: basestring
+    """
+    conferences = get_memcached(get_key("conferences"))
+    if verification_user(id, user):
+        del conferences[id]["users"][user]
+        set_memcached(get_key("conferences"), conferences)
+    return get_new_message_for_user(user)
+
+
+def verification_user(id, user):
+    """
+    Verification user in conference
+    return True if the user is present in conference, else return False
+    :param id: ID conference
+    :type id: basestring
+    :type user: basestring
+    """
+    conferences = get_memcached(get_key("conferences"))
+    if user not in conferences[id]["users"].keys():
+        return False
+    return True
+
+
+def checking_conference(id_conference):
+    """
+    Checking for the existence of the conference
+    :param id_conference: ID conference
+    :type id_conference: basestring
+    """
+    conferences = get_memcached(get_key("conferences"))
+    if id_conference in conferences.keys():
+        return True
+    return False
+
+
+def is_owner_user(id, user):
+    """
+    Checks whether user is owner of conferences
+    :param id: ID conference
+    :type id: basestring
+    :type user: basestring
+    """
+    conferences = get_memcached(get_key("conferences"))
+    if conferences[id]["info"]["creator"] == user:
+        return True
+    return False
+
+
+def exit_from_conference(id, user):
+    """
+    Remove user from conference if user exited from conference
+    :param id: ID conference
+    :type id: basestring
+    :type user: basestring
+    """
+    if checking_conference(id):
+        if verification_user(id, user):
+            conferences = get_memcached(get_key("conferences"))
+            if is_owner_user(id, user):
+                delete_conference(id, user)
+            del conferences[id]["users"][user]
+            set_memcached(get_key("conferences"), conferences)
+    return get_new_message_for_user(user)
+
+
+def delete_conference(id, user):
+    """
+    Delete conference (if user is owner conference)
+    :param id: ID conference
+    :type id: basestring
+    :type user: basestring
+    """
+    if is_owner_user(id, user):
+        conferences = get_memcached(get_key("conferences"))
+        del conferences[id]
+        set_memcached(get_key("conferences"), conferences)
+    return get_new_message_for_user(user)
+
+
+def remove_users_in_conference(id, user, users):
+    """
+    Remove users from conference (if user is owner conference)
+    :param id: ID conference
+    :type id: basestring
+    :type user: basestring
+    :type users: baselist
+    :param users: List of users to remove from conferences
+    """
+    if checking_conference(id) and is_owner_user(id, user):
+        conferences = get_memcached(get_key("conferences"))
+        for val in users:
+            del conferences[id]["users"][val]
+        set_memcached(get_key("conferences"), conferences)
+    return get_new_message_for_user(user)
+
+
+def add_users_in_conference(id, user, users):
+    """
+    Add users in conference (if user is owner conference)
+    :param id: ID conference
+    :type id: basestring
+    :type user: basestring
+    :type users: baselist
+    :param users: List of users to add in conference
+    """
+    if checking_conference(id):
+        conferences = get_memcached(get_key("conferences"))
+        for val in users:
+            conferences[id]["users"][val] = {"messages": [], "locations": []}
+        set_memcached(get_key("conferences"), conferences)
+    return get_new_message_for_user(user)
+
+
+def create_conference(user, users, title):
+    """
+    Create conference
+    :type user: basestring
+    :type users: baselist
+    :param users: List of users to add in conference
+    :type title: basestring
+    """
+    id = md5()
+    id.update(str(datetime.now()))
+    id = user + "_" + id.hexdigest()
+    users.append(user)
+    conferences = get_memcached(get_key("conferences"))
+    if id in conferences.keys():
+        return get_new_message_for_user(user)
+    conferences[id] = {}
+    conferences[id]["users"] = {}
+    conferences[id]["info"] = {
+        "creator": user,
+        "title": title,
+        "creation_date": datetime.now()
+    }
+    set_memcached(get_key("conferences"), conferences)
+    add_users_in_conference(id, user, users)
+    return get_new_message_for_user(user)
+
+
+def get_active_conferences(user):
+    """
+    get_active_conferences(user) -> list active conferences
+    Return active conferences
+    :type user: basestring
+    :return: list
+    """
+    conferences = get_memcached(get_key("conferences"))
+    list_conferences = []
+    for key in conferences.keys():
+        if user in conferences[key]["users"].keys():
+            list_conferences.append(
+                dict(id=key,
+                     title=conferences[key]["info"]["title"],
+                     creator=conferences[key]["info"]["creator"],
+                     creation_date=str(
+                         conferences[key]["info"]["creation_date"]),
+                     users=[dict(username=username, profile=get_user_profile(username)) for username in conferences[key]["users"].keys() if not username == user])
+            )
+    return list_conferences
+
+
+def get_new_message_for_user(user, **kwargs):
+    """
+    get_new_message_for_user(user, **kwargs) -> HTTPResponse(json(new_data))
+    Return HTTP response to new data
+    :type user: basestring
+    """
+    def __update_data(_data):
+        conferences = get_memcached(get_key("conferences"))
+        for key in conferences.keys():
+            if user in conferences[key]["users"].keys():
+                try:
+                    msg = conferences[key]["users"][user]["messages"]
+                except:
+                    msg = []
+                if msg:
+                    _data["new_data"].append({key: {"messages": msg}})
+                    conferences[key]["users"][user]["messages"] = []
+                    set_memcached(get_key("conferences"), conferences)
+        notifications = get_notifications(kwargs["user_obj"])
+        if notifications:
+            _data["notifications"] = _data["notifications"] + notifications
+        return _data
+
+    def __get_new_data():
+        listeners = get_memcached(get_key("listeners"))
+        _new_data = {
+            "users": [dict(name=key,
+                           location=listeners[key]["locations"],
+                           profile=listeners[key]["profile"]) for key in listeners.keys() if not key == str(user)],
+            "new_data": [],
+            "conferences": get_active_conferences(user),
+            "notifications": get_notifications(kwargs["user_obj"])
+        }
+        return _new_data.copy()
+
+    if "flag" not in kwargs.keys():
+        kwargs["flag"] = None
+    if "long_polling" not in kwargs.keys():
+        kwargs["long_polling"] = False
+    if "user_obj" in kwargs.keys() and "location" in kwargs.keys():
+        _location = kwargs['location']
+    else:
+        kwargs["user_obj"] = None
+
+    data = __get_new_data()
+
+    if settings.CHAT_LONG_POLLING and kwargs["long_polling"]:
+
+        out_time = 0
+        while not data["new_data"] and out_time < settings.CHAT_TIMEOUT:
+
+            if kwargs["user_obj"]:
+                if _location:
+                    update_user(kwargs["user_obj"], _location)
+
+            out_time += 1
+
+            _temp_data = __get_new_data()
+            _temp_data = __update_data(_temp_data)
+
+            if not _temp_data == data:
+                data = _temp_data.copy()
+                break
+
+            if kwargs["flag"] == "connect":
+                break
+
+            if not _temp_data["new_data"]:
+                sleep(settings.CHAT_TIME_SLEEP_NEWDATA)
+            else:
+                data = _temp_data.copy()
+
+    data = json.dumps(data)
+    return HttpResponse(data, content_type='application/json', status=200)
+
+
+def add_new_message(id, user, user_profile, text):
+    """
+    Add new message
+    :param id: ID conference
+    :type id: basestring
+    :type user: basestring
+    :type user_profile: basestring
+    :type text: basestring
+    """
+    try:
+        if not verification_user(id, user):
+            return get_new_message_for_user(user)
+        if checking_conference(id):
+            conferences = get_memcached(get_key("conferences"))
+            for key in conferences[id]["users"].keys():
+                conferences[id]["users"][key]["messages"].append(
+                    dict(user=user,
+                         text=text,
+                         time=strftime("%H:%M:%S"),
+                         date=strftime("%Y-%m-%d"),
+                         profile=user_profile)
+                )
+            set_memcached(get_key("conferences"), conferences)
+    except:
+        data = json.dumps(
+            {"cmd": "Error", "data": {"msg": str(sys.exc_info())}})
+        return HttpResponse(data, content_type='application/json', status=200)
+
+    return get_new_message_for_user(user)
+
+
+def connect(user, location):
+    update_user(user, location)
+    # if first response, then long_polling = False
+    return get_new_message_for_user(str(user).lower(), location=location, long_polling=False, user_obj=user)
+
+
+def disconnect(user):
+    listeners = get_memcached(get_key("listeners"))
+    del listeners[user]
+    set_memcached(get_key("listeners"), listeners)
+    return HttpResponse(json.dumps({"cmd": "Disconnect"}), content_type='application/json', status=200)
+
+
+def cmd(message, user):
+    """
+    Handler AJAX query
+    :param user: object user
+    :param message: content POST
+    :type message: basedict
+    """
+    try:
+        user_obj = user
+        user_profile = str(user.profile)
+        user = str(user).lower()
+        data = json.loads(message["json"])
+    except:
+        print "error: ", sys.exc_info()
+        data = json.dumps(
+            {"cmd": "Error", "data": {"msg": str(sys.exc_info())}})
+        return HttpResponse(data, content_type='application/json', status=200)
+
+    try:
+
+        update_user(user_obj, data['location'])
+
+        if data['cmd'] == 'Connect':
+            return connect(user_obj, data['location'])
+
+        if data['cmd'] == 'Disconnect':
+            return disconnect(user)
+
+        if data['cmd'] == 'Get':
+            return get_new_message_for_user(user, user_obj=user_obj, location=data['location'], long_polling=True)
+
+        if data['cmd'] == 'Message':
+            return add_new_message(data["data"]["id"], user, user_profile, data["data"]["text"])
+
+        if data['cmd'] == 'Exit':
+            return exit_from_conference(data["data"]["id"], user)
+
+        if data['cmd'] == 'Delete':
+            return delete_conference(data['data']['id'], user)
+
+        if data['cmd'] == 'Remove':
+            return remove_users_in_conference(data['data']['id'], user, data['data']['users'])
+
+        if data['cmd'] == 'Add':
+            return add_users_in_conference(data['data']['id'], user, data['data']['users'])
+
+        if data['cmd'] == 'Create':
+            return create_conference(user, data['data']['users'], data['data']['title'])
+
+    except:
+        print "Error: ", sys.exc_info()
+        data = json.dumps(
+            {"cmd": "Error", "data": {"msg": str(sys.exc_info())}})
+        return HttpResponse(data, content_type='application/json', status=200)
+
+    return HttpResponse(json.dumps({"cmd": "Error", "data": {"msg": "unknown command"}}),
+                        content_type='application/json', status=200)
+
+
+class Search_Inactive_Users(threading.Thread):
+
+    """
+    Delete inactive users
+    """
+
+    def __init__(self):
+        threading.Thread.__init__(self)
+
+    def run(self):
+        while True:
+            try:
+                sleep(settings.CHAT_TIME_SLEEP_THREAD)
+                listeners = get_memcached(get_key("listeners"))
+                for user in listeners.keys():
+                    time = datetime.now() - listeners[user]['datetime']
+                    if time.seconds > settings.CHAT_TIMEOUT:
+                        del listeners[user]
+                set_memcached(get_key("listeners"), listeners)
+            except:
+                print "error: ", sys.exc_info()
+
+
+class ChatAjaxMiddleware(object):
+
+    def __init__(self, *args, **kwargs):
+        if not settings.HARDTREE_CRON_DISABLED:
+            Search_Inactive_Users().start()
+            pass
+        # noinspection PyArgumentList
+        super(ChatAjaxMiddleware, self).__init__(*args, **kwargs)
+
+    def process_request(self, request):
+
+        if not request.META['PATH_INFO'] == '/chat':
+            return
+
+        if not request.user.is_authenticated():
+            data = json.dumps(
+                {"cmd": "Error", "data": "User is not authenticated"})
+            response = HttpResponse(content_type='application/json')
+            response.write(data)
+            return response
+
+        if request.method == "POST":
+            return cmd(request.POST, request.user)
+
+        return
diff --git a/data/treeio/treeio/treeio/core/middleware/user.py b/data/treeio/treeio/treeio/core/middleware/user.py
new file mode 100644
index 0000000..1298c08
--- /dev/null
+++ b/data/treeio/treeio/treeio/core/middleware/user.py
@@ -0,0 +1,354 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+"""
+User middleware: performs user-specific request pre-processing
+"""
+import urllib
+import urlparse
+
+from django.db.models import signals
+from django.utils.functional import curry
+from django.core.urlresolvers import resolve
+from django.contrib.auth import logout, login, authenticate
+from django.http import HttpResponse, HttpResponseRedirect
+from django.utils import translation
+from treeio.core.models import Object, ModuleSetting, UpdateRecord
+from treeio.core.views import ajax_popup
+from treeio.core.conf import settings
+from django.db import models
+from django.core.cache import cache
+import json
+import time
+
+
+class CommonMiddleware(object):
+    "Set up Object notifications"
+
+    objects = {}
+
+    def process_request(self, request):
+        "Process request"
+
+        # check mobile:
+        if getattr(request, 'mobile', False) and \
+                not request.POST and \
+                        '/m' not in request.path[:2] and \
+                        '/static' not in request.path[:7]:
+
+            if request.GET.get('nomobile', False):
+                request.session['nomobile'] = True
+            elif 'nomobile' not in request.session:
+                return HttpResponseRedirect('/m' + request.path)
+
+        if hasattr(request, 'user') and request.user.is_authenticated():
+
+            domain = getattr(settings, 'CURRENT_DOMAIN', 'default')
+            cache.set('treeio_%s_last' % (domain), time.time())
+            if getattr(settings, 'HARDTREE_SUBSCRIPTION_BLOCKED', False) and '/accounts' not in request.path:
+                return HttpResponseRedirect('/accounts/logout')
+
+            user = None
+            try:
+                user = request.user.profile
+                self.objects[unicode(user.id)] = {}
+            except Exception:
+                pass
+
+            if not user:
+                logout(request)
+                return HttpResponseRedirect('/')
+
+            do_fresh_subscribers = curry(
+                self.do_fresh_subscribers, user, request)
+            send_notifications_on_save = curry(
+                self.send_notifications_on_save, user, request)
+            send_notifications_on_delete = curry(
+                self.send_notifications_on_delete, user, request)
+            send_notifications_on_m2m = curry(
+                self.send_notifcations_on_m2m, user, request)
+
+            signals.pre_save.connect(
+                send_notifications_on_save, dispatch_uid=request, weak=False)
+            signals.post_save.connect(
+                do_fresh_subscribers, dispatch_uid=request, weak=False)
+            signals.pre_delete.connect(
+                send_notifications_on_delete, dispatch_uid=request, weak=False)
+            signals.m2m_changed.connect(
+                send_notifications_on_m2m, dispatch_uid=request, weak=False)
+
+    def do_fresh_subscribers(self, user, request, sender, instance, created, **kwargs):
+        "Adds current user to Subscribers of an Object on creation"
+        auto_notify = getattr(instance, 'auto_notify', True)
+        if auto_notify and created:
+            if isinstance(instance, Object) and instance.is_searchable():
+                instance.subscribers.add(user)
+                try:
+                    instance.create_notification('create', user)
+                except:
+                    pass
+
+    def send_notifications_on_save(self, user, request, sender, instance, **kwargs):
+        "Send notifications to subscribers of an Object on Object change"
+        auto_notify = getattr(instance, 'auto_notify', True)
+        if auto_notify and isinstance(instance, Object) and instance.id:
+            try:
+                instance.create_notification('update', user)
+            except:
+                pass
+        if isinstance(instance, Object):
+            process_timezone_field(user, instance)
+
+    def send_notifications_on_delete(self, user, request, sender, instance, **kwargs):
+        "Send notifications to subscribers of an Object on Object delete"
+        auto_notify = getattr(instance, 'auto_notify', True)
+        if auto_notify and isinstance(instance, Object) and instance.get_related_object():
+            try:
+                instance.create_notification('delete', user)
+            except:
+                pass
+            instance.subscribers.clear()
+
+    def send_notifcations_on_m2m(self, user, request, sender, instance, action, reverse, model, pk_set, **kwargs):
+        "Send notification on changes ManyToMany field (needs to be handled separately due to Django design)"
+
+        if isinstance(instance, Object):
+            attr = sender._meta.object_name.split('_', 1)[1]
+            if attr in settings.HARDTREE_OBJECT_BLACKLIST:
+                return
+
+            if action == "pre_clear" or action == "pre_remove":
+                original = list(getattr(instance, attr).all())
+                self.objects[unicode(user.id)].update(
+                    {unicode(instance.id): original})
+            elif action == "post_add" or action == "post_remove":
+                updated = list(getattr(instance, attr).all())
+                if unicode(user.id) in self.objects and unicode(instance.id) in self.objects[unicode(user.id)]:
+                    original = self.objects[
+                        unicode(user.id)][unicode(instance.id)]
+                    if not original == updated:
+                        try:
+                            instance.create_notification(
+                                'm2m', user, field=attr, original=original, updated=updated)
+                        except:
+                            pass
+                    del self.objects[unicode(user.id)][unicode(instance.id)]
+        elif isinstance(instance, UpdateRecord):
+            attr = sender._meta.object_name.split('_', 1)[1]
+            if action == "post_add" and attr == 'about':
+                obj_query = model.objects.filter(pk__in=pk_set)
+                subscribers = set()
+                # Send notifications to author Contact's subscribers too
+                if instance.author:
+                    contact = instance.author.get_contact()
+                    if contact:
+                        subscribers.update(contact.subscribers.all())
+                    subscribers.add(instance.author)
+                for obj in obj_query:
+                    # add object's subscribes to update record
+                    subscribers.update(obj.subscribers.all())
+                for subscriber in subscribers:
+                    instance.recipients.add(subscriber)
+                for obj in obj_query:
+                    instance.notify_subscribers(obj, request=request)
+
+    def process_response(self, request, response):
+        "Process response"
+        signals.pre_save.disconnect(dispatch_uid=request)
+        signals.post_save.disconnect(dispatch_uid=request)
+        signals.m2m_changed.disconnect(dispatch_uid=request)
+        signals.pre_delete.disconnect(dispatch_uid=request)
+
+        try:
+            user = request.user.profile
+            self.objects[unicode[user.id]] = {}
+        except:
+            pass
+
+        return response
+
+
+class PopupMiddleware():
+    "Tracks Object creation for popups"
+
+    objects = {}
+
+    def __init__(self):
+        "Initialize objects"
+        self.objects = {}
+
+    def process_request(self, request):
+        "Process request"
+
+        view = None
+        try:
+            view, args, kwargs = resolve(request.path)
+        except Exception:
+            pass
+
+        if view == ajax_popup:
+            process_created_object = curry(
+                self.process_created_object, request)
+            signals.post_save.connect(
+                process_created_object, dispatch_uid=request.user, weak=False)
+
+    def process_created_object(self, request, sender, instance, created, **kwargs):
+        "Store a newly created object and request during which it was created"
+        if isinstance(instance, Object) and created and not instance.is_attached():
+            self.objects.update(
+                {unicode(instance.id): {'object': instance, 'request': request}})
+
+    def process_response(self, request, response):
+        "Process response"
+        if not getattr(request, 'user', None) or not request.user.username:
+            return response
+
+        try:
+            signals.post_save.disconnect(dispatch_uid=request.user)
+        except AttributeError:
+            pass
+
+        view = None
+        try:
+            view, args, kwargs = resolve(request.path)
+        except Exception:
+            pass
+
+        if view == ajax_popup and response.status_code == 302:
+            for obj in self.objects:
+                if self.objects[obj]['request'] == request:
+                    hobject = self.objects[obj]['object']
+                    content = json.loads(response.content)
+                    content['popup'].update({'object': {'name': unicode(hobject),
+                                                        'id': obj}})
+                    response = HttpResponse(json.dumps(content),
+                                            content_type=settings.HARDTREE_RESPONSE_FORMATS['json'])
+                    break
+
+            content = json.loads(response.content)
+            content['popup'].update({'redirect': True})
+            response = HttpResponse(json.dumps(content),
+                                    content_type=settings.HARDTREE_RESPONSE_FORMATS['json'])
+
+        return response
+
+
+from django.utils.translation.trans_real import to_language
+
+
+class LanguageMiddleware(object):
+    "Automatically set chosen language"
+
+    def process_request(self, request):
+        "Set language for the current user"
+
+        lang = getattr(settings, 'HARDTREE_LANGUAGES_DEFAULT', 'en')
+
+        if request.user.username:
+            try:
+                user = request.user.profile
+                conf = ModuleSetting.get('language', user=user)[0]
+                lang = conf.value
+            except IndexError:
+                pass
+            except AttributeError:
+                pass
+        else:
+            try:
+                conf = ModuleSetting.get(
+                    'language', user__isnull=True, strict=True)[0]
+                lang = conf.value
+            except IndexError:
+                pass
+        lang = to_language(lang)
+        request.session['django_language'] = lang
+
+
+def process_timezone_field(user, instance):
+    "Processes date and datetime fields according to the selected time zone"
+    from datetime import date, datetime, timedelta
+
+    default_timezone = settings.HARDTREE_SERVER_DEFAULT_TIMEZONE
+    try:
+        conf = ModuleSetting.get('default_timezone')[0]
+        default_timezone = conf.value
+    except Exception:
+        pass
+
+    try:
+        conf = ModuleSetting.get('default_timezone', user=user)[0]
+        default_timezone = conf.value
+    except Exception:
+        default_timezone = getattr(
+            settings, 'HARDTREE_SERVER_TIMEZONE')[default_timezone][0]
+
+    all_timezones = getattr(settings, 'HARDTREE_SERVER_TIMEZONE', [
+        (1, '(GMT-11:00) International Date Line West')])
+    title = all_timezones[int(default_timezone)][1]
+    GMT = title[4:10]  # with sign e.g. +06:00
+    sign = GMT[0:1]  # + or -
+    hours = int(GMT[1:3])  # e.g. 06
+    mins = int(GMT[4:6])
+
+    for field in instance.get_fields():
+        if field.name not in getattr(settings, 'HARDTREE_TIMEZONE_BLACKLIST', []):
+            if isinstance(field, models.DateTimeField) or \
+                    isinstance(field, models.DateField):
+                if getattr(instance, field.name):
+                    cur_date = getattr(instance, field.name)
+                    if sign == "-":
+                        new_date = cur_date + \
+                                   timedelta(hours=hours, minutes=mins)
+                    else:
+                        new_date = cur_date - \
+                                   timedelta(hours=hours, minutes=mins)
+                    setattr(instance, field.name, new_date)
+            elif isinstance(field, models.TimeField):
+                if getattr(instance, field.name):
+                    datetime.combine(date.today(), getattr(
+                        instance, field.name)) + timedelta(hours=hours, minutes=mins)
+
+
+class SSLMiddleware(object):
+    """ Keep protocol the same on redirects """
+
+    def process_request(self, request):
+        """ Revert to SSL/no SSL depending on settings """
+        if getattr(settings, 'HARDTREE_SUBSCRIPTION_SSL_ENABLED', True):
+            if getattr(settings, 'HARDTREE_SUBSCRIPTION_SSL_ENFORCE', False) and not request.is_secure():
+                redirect_url = request.build_absolute_uri()
+                return HttpResponseRedirect(redirect_url.replace('https://', 'http://'))
+        else:
+            if request.is_secure():
+                redirect_url = request.build_absolute_uri()
+                return HttpResponseRedirect(redirect_url.replace('https://', 'http://'))
+
+    def process_response(self, request, response):
+        """ Keep protocol """
+        if getattr(settings, 'HARDTREE_SUBSCRIPTION_SSL_ENABLED', True):
+            if response.status_code == 302:
+                redirect_url = request.build_absolute_uri(response['Location'])
+                if request.is_secure() or getattr(settings, 'HARDTREE_SUBSCRIPTION_SSL_ENFORCE', False):
+                    response['Location'] = redirect_url.replace(
+                        'http://', 'https://')
+        return response
+
+
+class AuthMiddleware(object):
+    """ Log in by hash """
+
+    def process_request(self, request):
+        authkey = request.GET.get('authkey', '')
+        user = authenticate(authkey=authkey)
+
+        if user:
+            login(request, user)
+            url = request.build_absolute_uri()
+            p = urlparse.urlparse(url)
+            params = urlparse.parse_qs(p.query)
+            del params['authkey']
+            url = urlparse.urlunparse(
+                (p.scheme, p.netloc, p.path, p.params, urllib.urlencode(params, doseq=True), p.fragment))
+            return HttpResponseRedirect(url)
diff --git a/data/treeio/treeio/treeio/core/models.py b/data/treeio/treeio/treeio/core/models.py
new file mode 100644
index 0000000..31d5f15
--- /dev/null
+++ b/data/treeio/treeio/treeio/core/models.py
@@ -0,0 +1,1544 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+"""
+Treeio Core system objects
+"""
+
+from django.contrib import messages
+from django.http import HttpRequest
+from django.contrib.messages.storage import default_storage
+from django.contrib.messages.storage.base import Message
+
+from django.db import models
+from django.core.exceptions import MultipleObjectsReturned
+from django.contrib.sites.models import RequestSite
+from django.core.urlresolvers import reverse, NoReverseMatch
+from django.utils.translation import ugettext as _
+from django.utils.html import strip_tags
+from django.shortcuts import get_object_or_404
+from django.template.defaultfilters import date as djangodate
+import django.contrib.auth.models as django_auth
+
+from treeio.core.conf import settings
+from treeio.core.mail import SystemEmail
+
+from datetime import datetime
+import re
+import os
+import pickle
+import base64
+import random
+import hashlib
+import string
+
+
+class AccessEntity(models.Model):
+    """Generic model for both User and Group"""
+    last_updated = models.DateTimeField(auto_now=True)
+
+    def get_entity(self):
+        try:
+            return self.group
+        except Group.DoesNotExist:
+            try:
+                return self.user
+            except User.DoesNotExist:
+                return None
+
+    def is_user(self):
+        try:
+            return self.user is not None
+        except User.DoesNotExist:
+            return False
+
+    def __unicode__(self):
+        try:
+            return self.get_entity().__unicode__()
+        except AttributeError:
+            return unicode(self.id)
+
+    def get_absolute_url(self):
+        try:
+            return self.get_entity().get_absolute_url()
+        except AttributeError:
+            return ''
+
+
+class Group(AccessEntity):
+    """Group record"""
+    name = models.CharField(max_length=256)
+    parent = models.ForeignKey(
+        'self', blank=True, null=True, related_name='child_set')
+    details = models.TextField(blank=True, null=True)
+
+    def __unicode__(self):
+        return self.name
+
+    def get_absolute_url(self, module='identities'):
+        """Returns absolute URL of the Group"""
+        if not module or module == 'identities':
+            try:
+                return reverse('identities_group_view', args=[self.id])
+            except NoReverseMatch:
+                return ""
+        else:
+            try:
+                return reverse('core_administration_group_view', args=[self.id])
+            except NoReverseMatch:
+                return ""
+
+    def get_root(self):
+        """Get the root Group"""
+
+        root = self
+        # keep track of items we've looked at to avoid infinite looping
+        stack = [self]
+        while getattr(root, 'parent', None):
+            root = getattr(root, 'parent')
+            if root in stack:
+                break
+            stack.append(root)
+        return root
+
+    def get_tree_path(self, skipself=False):
+        """Get tree path as a list() starting with root Group"""
+
+        if skipself:
+            path = []
+        else:
+            path = [self]
+
+        current = self
+        while getattr(current, 'parent', None):
+            parent = getattr(current, 'parent')
+            if parent in path:
+                # To avoid infinite looping, check that we don't add existing
+                # parent on the path again
+                break
+            else:
+                path.insert(0, parent)
+            current = parent
+
+        return path
+
+    def get_contact(self):
+        """Returns first available Contact"""
+        try:
+            return self.contact_set.all()[0]
+        except IndexError:
+            return None
+
+    def has_contact(self):
+        """Returns true if any Contacts exist for this Group"""
+        return self.contact_set.exists()
+
+    def get_fullname(self, save=True):
+        """Returns the full name with parent(s) separated by slashes"""
+        current = self
+        fullname = self.name
+        while current.parent:
+            current = current.parent
+            fullname = current.name + " / " + fullname
+        return fullname
+
+    def get_perspective(self):
+        """Returns currently set Perspective for the Group"""
+        ids = []
+        try:
+            for setting in ModuleSetting.get_for_module('treeio.core', name='default_perspective', group=self):
+                ids.append(long(setting.value))
+            _id = ids[0]
+            perspective = get_object_or_404(Perspective, pk=_id)
+        except:
+            try:
+                conf = ModuleSetting.get_for_module(
+                    'treeio.core', 'default_perspective')[0]
+                perspective = Perspective.objects.get(pk=long(conf.value))
+            except:
+                try:
+                    perspective = Perspective.objects.all()[0]
+                    ModuleSetting.set_for_module(
+                        'default_perspective', perspective.id, 'treeio.core', group=self)
+                except:
+                    raise Perspective.DoesNotExist('No Perspective exists')
+        return perspective
+
+    def set_perspective(self, perspective):
+        """Sets the Perspective for the Group"""
+        ModuleSetting.set_for_module(
+            'default_perspective', perspective.id, 'treeio.core', group=self)
+
+        # Ensure the Group has access to the modules in the Perspective
+        modules = perspective.modules.all() or Module.objects.all()
+        try:
+            for module in modules:
+                full_access = not module.full_access.exists() or module.full_access.filter(
+                    pk=self.id).exists()
+                read_access = not module.read_access.exists() or module.read_access.filter(
+                    pk=self.id).exists()
+                if not (read_access or full_access):
+                    module.read_access.add(self)
+        except:
+            pass
+
+    class Meta:
+        """Group"""
+        ordering = ['name']
+
+
+class User(AccessEntity):
+    """A record about a user registered within the system"""
+    name = models.CharField(max_length=256)
+    user = models.OneToOneField(django_auth.User, related_name='profile')
+    default_group = models.ForeignKey(
+        Group, related_name='default_user_set', blank=True, null=True)
+    other_groups = models.ManyToManyField(Group, blank=True, null=True)
+    disabled = models.BooleanField(default=False)
+    last_access = models.DateTimeField(default=datetime.now)
+
+    class Meta:
+        """User"""
+        ordering = ['name']
+
+    def __unicode__(self):
+        """Returns Contact name if available, username otherwise"""
+        contact = self.get_contact()
+        if contact:
+            return unicode(contact)
+        return unicode(self.name)
+
+    def save(self, *args, **kwargs):
+        """Override to automatically set User.name from attached Django User"""
+        if not self.name and self.user:
+            self.name = self.user.username
+        if not self.default_group:
+            try:
+                self.default_group = Group.objects.all()[0]
+            except Exception:
+                pass
+
+        super(User, self).save(*args, **kwargs)
+        # Check Hardtree Subscription user limit
+        if not self.id:
+            user_limit = getattr(
+                settings, 'HARDTREE_SUBSCRIPTION_USER_LIMIT', 0)
+            if user_limit > 0:
+                user_number = User.objects.all().count()
+                if user_number >= user_limit:
+                    self.delete()
+
+    def delete(self, *args, **kwargs):
+        user = self.user
+        super(User, self).delete(*args, **kwargs)
+        try:
+            user.delete()
+        except:
+            pass
+
+    def get_absolute_url(self, module='identities'):
+        """Returns absolute URL of the User"""
+        if not module or module == 'identities':
+            try:
+                return reverse('identities_user_view', args=[self.id])
+            except Exception:
+                return ""
+        else:
+            try:
+                return reverse('core_administration_user_view', args=[self.id])
+            except Exception:
+                return ""
+
+    def generate_new_password(self, size=8):
+        """Generates a new password and sets it to the user"""
+        # todo: use XKCD technique
+        password = ''.join(
+            [random.choice(string.letters + string.digits) for i in range(size)])
+
+        self.user.set_password(password)
+        self.user.save()
+
+        return password
+
+    def get_groups(self):
+        """Returns the list of all groups the user belongs to"""
+        groups = list(self.other_groups.all())
+        groups.append(self.default_group)
+
+        return groups
+
+    def _check_permission(self, obj, mode='r'):
+        """Helper for User.has_permissions(), accepts only one character for mode"""
+
+        query = models.Q(pk=self.id)
+        for group in self.get_groups():
+            if group:
+                query = query | models.Q(pk=group.id)
+
+        if obj.full_access.filter(query).exists():
+            return True
+
+        if mode == 'r' or mode == 'x':
+            if obj.read_access.filter(query).exists():
+                return True
+
+        if not obj.full_access.exists():
+            # if no one can have full access, then allow everyone
+            return True
+
+        return False
+
+    def has_permission(self, obj, mode="r"):
+        """Checks permissions on a given object for a given mode"""
+        if self.is_admin() or not obj:
+            return True
+
+        for imode in mode:
+            if not self._check_permission(obj, imode):
+                return False
+
+        return True
+
+    def is_admin(self, module_name=''):
+        """True if the user has write permissions on the given module"""
+        access = False
+        if not module_name:
+            module_name = 'treeio.core'
+
+        try:
+            module = Module.objects.get(name=module_name)
+            access = self._check_permission(module, mode='w')
+        except Module.DoesNotExist:
+            pass
+        if access or module_name == 'treeio.core':
+            return access
+        return self.is_admin(module_name='treeio.core')
+
+    def get_username(self):
+        """String username, picked up from attached Django User or self.name string otherwise"""
+        if self.user:
+            return self.user.username
+        return self.name
+
+    def get_perspective(self):
+        """Returns currently set Perspective for the User"""
+        ids = []
+        try:
+            for setting in ModuleSetting.get_for_module('treeio.core', name='default_perspective', user=self):
+                ids.append(long(setting.value))
+            perspective_id = ids[0]
+            perspective = get_object_or_404(Perspective, pk=perspective_id)
+        except:
+            try:
+                perspective = self.default_group.get_perspective()
+            except:
+                try:
+                    conf = ModuleSetting.get_for_module(
+                        'treeio.core', 'default_perspective')[0]
+                    perspective = Perspective.objects.get(pk=long(conf.value))
+                except Exception:
+                    try:
+                        perspective = Perspective.objects.all()[0]
+                    except:
+                        perspective = Perspective(name='Default')
+                        perspective.save()
+                    ModuleSetting.set_for_module(
+                        'default_perspective', perspective.id, 'treeio.core', user=self)
+        return perspective
+
+    def set_perspective(self, perspective):
+        """Sets the Perspective for the User"""
+        ModuleSetting.set_for_module(
+            'default_perspective', perspective.id, 'treeio.core', user=self)
+
+        # Ensure the User has access to the modules in the Perspective
+        modules = perspective.modules.all() or Module.objects.all()
+        for module in modules:
+            if not self.has_permission(module):
+                module.read_access.add(self)
+
+    def get_contact(self):
+        """Returns first available Contact"""
+        try:
+            return self.contact_set.all()[0]
+        except Exception:
+            return None
+
+    def has_contact(self):
+        """Returns true if any Contacts exist for this User"""
+        try:
+            return self.contact_set.exists()
+        except Exception:
+            return False
+
+# User signals
+
+
+def user_autocreate_handler(sender, instance, created, **kwargs):
+    """When a Django User is created, automatically create a treeio User"""
+    if created:
+        try:
+            profile = instance.profile
+        except:
+            profile = User(user=instance)
+            profile.save()
+
+# Autocreate a treeio user when Django user is created
+if getattr(settings, 'HARDTREE_SIGNALS_AUTOCREATE_USER', False):
+    models.signals.post_save.connect(
+        user_autocreate_handler, sender=django_auth.User)
+
+
+class Invitation(models.Model):
+    """Invitation to register on Hardtree"""
+    email = models.EmailField()
+    key = models.CharField(max_length=256)
+    sender = models.ForeignKey(User, blank=True, null=True)
+    default_group = models.ForeignKey(Group, blank=True, null=True)
+    date_created = models.DateTimeField(default=datetime.now)
+
+    def __init__(self, *args, **kwargs):
+        """Create a hash automatically"""
+        super(Invitation, self).__init__(*args, **kwargs)
+        if self.email and not self.key:
+            hasher = hashlib.sha256()
+            hasher.update(str(random.random()) + str(self.email))
+            self.key = hasher.hexdigest()
+
+
+class Tag(models.Model):
+    """Model for Global Tagging"""
+    name = models.CharField(max_length=512)
+    date_created = models.DateTimeField(default=datetime.now)
+
+    def __unicode__(self):
+        return self.name
+
+    class Meta:
+        ordering = ['name']
+
+
+class Comment(models.Model):
+    """Comment on any Object"""
+    author = models.ForeignKey(User, blank=True, null=True)
+    body = models.TextField(blank=True, null=True)
+    likes = models.ManyToManyField(
+        User, blank=True, null=True, related_name='comments_liked')
+    dislikes = models.ManyToManyField(
+        User, blank=True, null=True, related_name='comments_disliked')
+    date_created = models.DateTimeField(default=datetime.now)
+
+    def __unicode__(self):
+        return self.body
+
+
+class Object(models.Model):
+    """Generic Treeio object"""
+    creator = models.ForeignKey(
+        User, blank=True, null=True, related_name='objects_created', on_delete=models.SET_NULL)
+    read_access = models.ManyToManyField(
+        AccessEntity, blank=True, null=True, related_name='objects_read_access')
+    full_access = models.ManyToManyField(
+        AccessEntity, blank=True, null=True, related_name='objects_full_access')
+
+    object_name = models.CharField(max_length=512, blank=True, null=True)
+    object_type = models.CharField(max_length=512, blank=True, null=True)
+    trash = models.BooleanField(default=False)
+
+    links = models.ManyToManyField('self', blank=True, null=True)
+    subscribers = models.ManyToManyField(
+        User, blank=True, null=True, related_name='subscriptions')
+    # subscribers_outside = models.ManyToManyField(Contact, blank=True, null=True, related_name='subscriptions_outside')
+    tags = models.ManyToManyField(Tag, blank=True, null=True)
+
+    comments = models.ManyToManyField(
+        Comment, blank=True, null=True, related_name='comments')
+    likes = models.ManyToManyField(
+        User, blank=True, null=True, related_name='objects_liked')
+    dislikes = models.ManyToManyField(
+        User, blank=True, null=True, related_name='objects_disliked')
+
+    last_updated = models.DateTimeField(auto_now=True)
+    date_created = models.DateTimeField(default=datetime.now)
+
+    nuvius_resource = models.TextField(blank=True, null=True)
+
+    # What to inherit permissions from:
+    #    default: Object's module first, then the user who created it.
+    access_inherit = ('*module', '*user')
+
+    def _get_query_filter_permitted(user, mode='r', filter_trash=True):
+        """Helper for filter_permitted(), accepts one character per mode"""
+
+        query = models.Q()
+        if not user.is_admin():
+            query = models.Q(full_access=user) | models.Q(
+                full_access__isnull=True)
+            query = query | models.Q(full_access=user.default_group) | models.Q(
+                full_access__in=user.other_groups.all())
+
+            if mode == 'r' or mode == 'x':
+                query = query | models.Q(read_access=user)
+                query = query | models.Q(read_access=user.default_group) | models.Q(
+                    read_access__in=user.other_groups.all())
+
+        if filter_trash:
+            query = query & models.Q(trash=False)
+
+        return query
+    _get_query_filter_permitted = staticmethod(_get_query_filter_permitted)
+
+    def filter_permitted(user, manager, mode="r", filter_trash=True):
+        """Returns Objects the given user is allowed to access, depending on mode - read(r), write(w) or execute(x)"""
+        if not user:
+            return []
+
+        query = models.Q()
+        for imode in mode:
+            query = query & Object._get_query_filter_permitted(
+                user, imode, filter_trash)
+
+        objects = manager.filter(query).distinct()
+        return objects
+    filter_permitted = staticmethod(filter_permitted)
+
+    def filter_by_request(request, manager, mode="r", filter_trash=True):
+        """Returns Objects the current user is allowed to access, depending on mode - read(r), write(w) or execute(x)"""
+        user = None
+        if request.user.username:
+            try:
+                user = request.user.profile
+            except MultipleObjectsReturned:
+                user = User.objects.filter(user__id=request.user.id)[0]
+        if user:
+            return Object.filter_permitted(user, manager, mode, filter_trash)
+        return []
+    filter_by_request = staticmethod(filter_by_request)
+
+    def __unicode__(self):
+        """String representation"""
+        try:
+            return unicode(self.get_related_object())
+        except Exception:
+            return unicode(self.object_type) + " [" + unicode(self.id) + "]"
+
+    def save(self, *args, **kwargs):
+        """Override to auto-detect object type and set default user if unset"""
+
+        try:
+            name = self.__unicode__()
+            if not name == self.object_name:
+                self.object_name = name[0:510]
+        except:
+            pass
+
+        types = re.findall('\'(.+)\'', str(self.__class__))
+        if types:
+            self.object_type = types[0]
+
+        return super(Object, self).save(*args, **kwargs)
+
+    def get_object_module(self):
+        """Returns the module for this object, e.g. 'projects'"""
+
+        return getattr(self._meta, 'app_label', None)
+
+    def get_nuvius_resources(self):
+        """Returns a list of items generated from self.nuvius_resource
+
+        The convention used is:
+        Each item is specified as '#id.key#' separated by commas
+        Returns items as tuples (id, key) from self.nuvius_resource
+        """
+        resources = []
+        if self.nuvius_resource:
+            text = unicode(self.nuvius_resource)
+            splits = text.split(',')
+            for bit in splits:
+                res = bit.strip('#').split('.', 1)
+                resources.append(res)
+        return resources
+
+    def add_nuvius_resource(self, resource_id, key=None):
+        """Add a Nuvius resource to self.nuvius_resource"""
+        existing = [res[0] for res in self.get_nuvius_resources()]
+        if not unicode(resource_id) in existing:
+            new = "#" + unicode(resource_id)
+            if key:
+                new += "." + unicode(key)
+            new += "#"
+            if self.nuvius_resource:
+                self.nuvius_resource += "," + new
+            else:
+                self.nuvius_resource = new
+        return self
+
+    def get_root(self):
+        """Get the root element, for objects implementing a tree-like structure via .parent"""
+
+        root = self
+        # keep track of items we've looked at to avoid infinite looping
+        stack = [self]
+        while getattr(root, 'parent', None):
+            root = getattr(root, 'parent')
+            if root in stack:
+                break
+            stack.append(root)
+        return root
+
+    def get_tree_path(self, skipself=False):
+        """Get tree path as a list() starting with root element,
+        for objects implementing a tree-like structure via .parent"""
+
+        if skipself:
+            path = []
+        else:
+            path = [self]
+
+        current = self
+        while getattr(current, 'parent', None):
+            parent = getattr(current, 'parent')
+            if parent in path:
+                # To avoid infinite looping, check that we don't add existing
+                # parent on the path again
+                break
+            else:
+                path.insert(0, parent)
+            current = parent
+
+        return path
+
+    def get_related_object(self):
+        """Returns a child object which inherits from self, if exists"""
+        try:
+            obj_name = re.match(
+                ".*\.(?P<name>\w+)$", self.object_type).group('name')
+            return getattr(self, obj_name.lower())
+        except Exception:
+            return None
+
+    def get_human_type(self, translate=True):
+        """Returns prettified name of the object type"""
+        try:
+            obj_name = re.match(
+                ".*\.(?P<name>\w+)$", self.object_type).group('name')
+            pattern = re.compile('([A-Z][A-Z][a-z])|([a-z][A-Z])')
+            human_type = pattern.sub(
+                lambda m: m.group()[:1] + " " + m.group()[1:], obj_name)
+            if translate:
+                human_type = _(human_type)
+            return human_type
+        except Exception:
+            return self.object_type
+
+    def get_absolute_url(self):
+        """Returns a URL to the child object, if available"""
+        try:
+            return self.get_related_object().get_absolute_url()
+        except Exception:
+            return ""
+
+    def is_searchable(self):
+        """Returns True if the item should be included in Search index"""
+        return getattr(self, 'searchable', True)
+
+    def is_attached(self):
+        """Returns True if item is attached to some other Object and serves as a part of it"""
+        return getattr(self, 'attached', False)
+
+    def get_search_item(self):
+        """Constructs a search item as a dictionary with title, content and URL"""
+
+        obj = self.get_related_object()
+        if not obj:
+            obj = self
+
+        item = {
+            'id': u'',
+            'name': u'',
+            'type': unicode(obj.get_human_type()),
+            'content': u'',
+            'url': unicode(obj.get_absolute_url())
+        }
+
+        if obj.id:
+            item['id'] = unicode(obj.id)
+
+        if hasattr(obj, 'title'):
+            item['name'] = unicode(obj.title)
+        elif hasattr(obj, 'name'):
+            item['name'] = unicode(obj.name)
+        else:
+            item['name'] = unicode(obj)
+
+        if hasattr(self, 'body'):
+            item['content'] = unicode(self.body)
+        elif hasattr(self, 'details'):
+            item['content'] = unicode(self.details)
+        else:
+            for field in self.get_fields():
+                try:
+                    value = self.get_field_value(field.name)
+                    item['content'] += ' ' + unicode(value)
+                except:
+                    pass
+
+        if hasattr(self, 'tags'):
+            for tag in self.tags.all():
+                item['content'] += ' ' + unicode(tag)
+
+        return item
+
+    def create_notification(self, action='update', author=None, *args, **kwargs):
+        """Creates an UpdateRecord to be submitted to all subscribers of an Object"""
+
+        if not (self.subscribers.all().count() or author):
+            return None
+
+        notification = UpdateRecord()
+        updated = False
+
+        if action == 'delete':
+            notification.format_message = "%s \"%s\" deleted."
+            notification.set_format_strings(
+                [unicode(self.get_human_type(translate=False)), unicode(self)])
+            notification.record_type = 'delete'
+            updated = True
+
+        elif action == 'm2m':
+            notification.record_type = 'update'
+            if 'field' in kwargs and 'original' in kwargs and 'updated' in kwargs:
+                if kwargs['updated']:
+                    updated_text = ""
+                    for obj in kwargs['updated']:
+                        updated_text += '<a href="%s" class="popup-link">%s</a>' % (
+                            obj.get_absolute_url(), unicode(obj))
+                        if kwargs['updated'].index(obj) < len(kwargs['updated']) - 1:
+                            updated_text += ', '
+                else:
+                    updated_text = "None"
+
+                field = unicode(kwargs['field'])
+
+                if field == 'assigned':
+                    notification.format_message = "%s assigned to %s.<br />"
+                    notification.set_format_strings(
+                        [self.get_human_type(translate=False), updated_text])
+                    notification.save()
+                    for obj in kwargs['updated']:
+                        if isinstance(obj, AccessEntity) or isinstance(obj, User):
+                            notification.recipients.add(obj)
+                            self.subscribers.add(obj)
+                            try:
+                                if not obj.has_permission(self, mode='w'):
+                                    self.full_access.add(obj)
+                            except:
+                                pass
+                        else:
+                            try:
+                                notification.recipients.add(obj.related_user)
+                                self.subscribers.add(obj.related_user)
+                            except:
+                                pass
+                            try:
+                                if not obj.related_user.has_permission(self, mode='w'):
+                                    self.full_access.add(obj.related_user)
+                            except:
+                                pass
+                else:
+                    notification.format_message = "%s changed to \"%s\".<br />"
+                    notification.set_format_strings(
+                        [field.replace('_', ' ').capitalize(), updated_text])
+
+                updated = True
+
+        elif action == 'create':
+            notification.format_message = "%s created."
+            notification.set_format_strings(
+                [unicode(self.get_human_type(translate=False))])
+            notification.record_type = 'create'
+            updated = True
+
+        else:
+            notification.record_type = 'update'
+
+            fields = self.get_field_names()
+            original = self.get_related_object()
+
+            notification.format_message = ""
+            strings = []
+
+            for field in fields:
+                if hasattr(getattr(self, field), 'all'):
+                    # Skip ManyToMany fields - they handled differently
+                    continue
+
+                if field in getattr(settings, 'HARDTREE_UPDATE_BLACKLIST', []):
+                    # Skip blacklisted items
+                    continue
+
+                if 'password' in field:
+                    # Skip password fields - it's not nice to give them away in
+                    # plain-text
+                    continue
+
+                current = self.get_field_value(field)
+                before = original.get_field_value(field)
+                if current != before:
+                    # cut out '_display' from some fields
+                    if '_display' in field:
+                        field = field.replace('_display', '')
+                    if isinstance(self._meta.get_field(field), models.TextField):
+                        notification.format_message += "%s changed.<br />"
+                        strings.extend(
+                            [unicode(field).replace('_', ' ').capitalize()])
+                    elif isinstance(self._meta.get_field(field), models.DateTimeField):
+                        notification.format_message += "%s changed from \"%s\" to \"%s\".<br />"
+                        # this needs to be done properly, via getting current
+                        # locale's format
+                        localeformat = "j F Y, H:i"
+                        strings.extend([unicode(field).replace('_', ' ').capitalize(),
+                                        unicode(
+                                            djangodate(before, localeformat)),
+                                        unicode(djangodate(current, localeformat))])
+                    else:
+                        notification.format_message += "%s changed from \"%s\" to \"%s\".<br />"
+                        strings.extend([unicode(field).replace('_', ' ').capitalize(),
+                                        unicode(before), unicode(current)])
+                    updated = True
+
+            notification.set_format_strings(strings)
+
+        if self.trash:
+            try:
+                old_object = Object.objects.get(pk=self.id)
+                if not old_object.trash:
+                    notification.format_message += " %s moved to <a href=\"%s\">%s</a>"
+                    strings = notification.get_format_strings()
+                    strings.extend([unicode(self.get_human_type(translate=False)),
+                                    reverse('core_trash'), "Trash"])
+                    notification.set_format_strings(strings)
+                    notification.record_type = 'delete'
+                    updated = True
+            except Exception:
+                pass
+
+        if 'body' in kwargs:
+            notification.body = kwargs['body']
+            updated = True
+
+        if not updated:
+            return None
+
+        notification.url = self.get_absolute_url()
+        notification.author = author
+
+        if action != 'delete':
+            notification.sender = self
+
+        notification.save()
+        notification.about.add(self)
+        return notification
+
+    def set_user(self, user):
+        """Sets owner of the Object to the given user
+        :param User:
+        """
+        # TODO: check every call that it send only treeio.core.User model
+        if user is None:
+            return self
+        if isinstance(user, django_auth.User):
+            user = user.profile
+        elif not isinstance(user, User):
+            raise ValueError('user argument should be either a django_auth.User or treeio.core.User object got %s' % type(user))
+
+        # get default permissions from settings
+        try:
+            conf = ModuleSetting.get_for_module(
+                'treeio.core', 'default_permissions')[0]
+            default_permissions = conf.value
+        except:
+            default_permissions = settings.HARDTREE_DEFAULT_PERMISSIONS
+
+        if not self.creator:
+            self.creator = user
+            self.save()
+
+        if default_permissions == 'everyone':
+            return self
+
+        if 'force' in default_permissions:
+            # Don't do automatic inheritance
+            do_user = True
+
+        else:
+            # try to inherit permissions first from any parent objects as
+            # specified in models.py
+            cascade = getattr(self, 'access_inherit', [])
+            do_user = False
+            if cascade:
+                for attr in cascade:
+                    if attr == '*user':
+                        do_user = True
+                        break
+                    elif attr == '*module':
+                        if 'nomodule' not in default_permissions:
+                            modules = Module.objects.filter(
+                                name__contains=self.get_object_module())
+                            if modules:
+                                for module in modules:
+                                    self.copy_permissions(module)
+                                if not user.has_permission(self, 'w'):
+                                    do_user = True
+                                break
+                        else:
+                            do_user = True
+                            break
+                    else:
+                        try:
+                            obj = getattr(self, attr)
+                            if obj:
+                                self.copy_permissions(obj)
+                                if not user.has_permission(self, 'w'):
+                                    do_user = True
+                                break
+                        except:
+                            pass
+        if do_user:
+            # if we can't inherit set permissions to the user as specified in the settings
+
+            if 'readonly' in default_permissions:
+                access_container = self.read_access
+            else:
+                access_container = self.full_access
+
+            if 'user' in default_permissions:
+                access_container.add(user)
+
+            if 'usergroup' in default_permissions and user.default_group:
+                access_container.add(user.default_group)
+
+            if 'userallgroups' in default_permissions:
+                if user.default_group:
+                    access_container.add(user.default_group)
+                for group in user.other_groups.all():
+                    access_container.add(group)
+
+        # process assigned fields to give auto-permissions to assignees
+        if hasattr(self, 'assigned'):
+            for obj in self.assigned.all():
+                if isinstance(obj, AccessEntity) or isinstance(obj, User):
+                    try:
+                        if not obj.has_permission(self, mode='w'):
+                            self.full_access.add(obj)
+                    except:
+                        pass
+                else:
+                    try:
+                        if not obj.related_user.has_permission(self, mode='w'):
+                            self.full_access.add(obj.related_user)
+                    except:
+                        pass
+
+        return self
+
+    def set_default_user(self):
+        """Sets the user defined in settings.HARDTREE_DEFAULT_USER_ID and default mode"""
+        try:
+            user = User.objects.get(pk=settings.HARDTREE_DEFAULT_USER_ID)
+        except:
+            try:
+                user = User.objects.all()[0]
+            except IndexError:
+                user = None
+        self.set_user(user)
+        return self
+
+    def set_user_from_request(self, request, mode=None):
+        """Sets the user to the current in request and default mode for the user"""
+        user = request.user.profile
+        self.set_user(user)
+        return self
+
+    def copy_permissions(self, object):
+        """Copies all permissions from object. Existing permissions will NOT be removed or dropped"""
+        read_access = object.read_access.all()
+        for entity in read_access:
+            self.read_access.add(entity)
+
+        full_access = object.full_access.all()
+        for entity in full_access:
+            self.full_access.add(entity)
+
+        return self
+
+    def get_fields(self):
+        """Returns list of fields for given object"""
+        return filter(lambda f: f.name not in settings.HARDTREE_OBJECT_BLACKLIST, self._meta.fields)
+
+    def get_field_names(self):
+        """Returns list of field names for given object"""
+        x = []
+        for f in self._meta.fields:
+            if f.name not in settings.HARDTREE_OBJECT_BLACKLIST:
+                x.append(f.name)
+        for f in self._meta.many_to_many:
+            if f.name not in settings.HARDTREE_OBJECT_BLACKLIST:
+                x.append(f.name)
+        return x
+
+    def get_field_value(self, field_name, default=None):
+        """Returns the value of a given field"""
+        value = getattr(self, field_name, default)
+        if hasattr(value, 'all'):
+            # Returns value for ManyToMany fields
+            value = value.all()
+        if hasattr(self, 'get_%s_display' % field_name):
+            # Handle choices to ChoiceFields
+            try:
+                value = getattr(self, 'get_%s_display' % field_name)()
+            except:
+                pass
+        return value
+
+    def set_field_value(self, field_name, value):
+        """Sets the value of a given field"""
+        return setattr(self, field_name)
+
+    def set_last_updated(self, last_updated=datetime.now()):
+        self.last_updated = last_updated
+        self.save()
+
+
+class Revision(models.Model):
+    previous = models.OneToOneField(
+        'self', blank=True, null=True, related_name='next')
+    object = models.ForeignKey(Object)
+    change_type = models.CharField(max_length=512, null=True, blank=True)
+    date_created = models.DateTimeField(default=datetime.now)
+
+
+class RevisionField(models.Model):
+    revision = models.ForeignKey(Revision)
+    field_type = models.CharField(max_length=512, null=True, blank=True)
+    field = models.CharField(max_length=512, null=True, blank=True)
+    value = models.TextField(null=True, blank=True)
+    value_key = models.ForeignKey(
+        Object, null=True, blank=True, related_name='revisionfield_key', on_delete=models.SET_NULL)
+    value_m2m = models.ManyToManyField(
+        Object, related_name='revisionfield_m2m')
+    value_key_acc = models.ForeignKey(
+        AccessEntity, null=True, blank=True, related_name='revisionfield_key_acc', on_delete=models.SET_NULL)
+    value_m2m_acc = models.ManyToManyField(
+        AccessEntity, related_name='revisionfield_m2m_acc')
+
+
+class UpdateRecord(models.Model):
+    """Update of an Object"""
+    author = models.ForeignKey(
+        User, blank=True, null=True, related_name="sent_updates")
+    sender = models.ForeignKey(
+        Object, blank=True, null=True, related_name="sent_updates", on_delete=models.SET_NULL)
+    about = models.ManyToManyField(
+        Object, blank=True, null=True, related_name="updates")
+    recipients = models.ManyToManyField(
+        AccessEntity, blank=True, null=True, related_name="received_updates")
+    # recipients_outside = models.ManyToManyField(Contact, blank=True, null=True, related_name="outside_received_updates")
+    record_type = models.CharField(max_length=32,
+                                   choices=(('create', 'create'), ('update', 'update'),
+                                            ('delete', 'delete'), (
+                                                'trash', 'trash'),
+                                            ('message', 'message'),
+                                            ('manual', 'manual'), ('share', 'share')))
+    url = models.CharField(max_length=512, blank=True, null=True)
+    body = models.TextField(default='', blank=True, null=True)
+    score = models.IntegerField(default=0)
+    format_message = models.TextField(blank=True, null=True)
+    format_strings = models.TextField(blank=True, null=True)
+    comments = models.ManyToManyField(
+        Comment, blank=True, null=True, related_name='comments_on_updates')
+    likes = models.ManyToManyField(
+        User, blank=True, null=True, related_name='updates_liked')
+    dislikes = models.ManyToManyField(
+        User, blank=True, null=True, related_name='updates_disliked')
+    date_created = models.DateTimeField(default=datetime.now)
+
+    class Meta:
+        """UpdateRecord"""
+        ordering = ['-date_created']
+
+    def __unicode__(self):
+        return self.body
+
+    def set_user_from_request(self, request):
+        """Sets .author to current user and .sender to user's Contact (if available)"""
+        user = request.user.profile
+        self.author = user
+        self.recipients.add(user)
+        contact = user.get_contact()
+        if contact:
+            self.sender = contact
+        self.save()
+
+    def set_format_strings(self, strings):
+        """Sets format_strings to the list of strings"""
+        self.format_strings = base64.b64encode(
+            pickle.dumps(strings, pickle.HIGHEST_PROTOCOL))
+        return self
+
+    def extend_format_strings(self, strings):
+        """Extends existing format strings"""
+        existing = self.get_format_strings()
+        if existing:
+            existing.extend(strings)
+        else:
+            existing = strings
+        self.set_format_strings(existing)
+        return self
+
+    def get_format_strings(self):
+        """Gets format_strings as a list of strings"""
+        result = None
+        if self.format_strings:
+            try:
+                result = pickle.loads(base64.b64decode(self.format_strings))
+            except pickle.PickleError:
+                pass
+        return result
+
+    def get_format_message(self):
+        """Returns translatable message in the current language with all attributes applied"""
+        strings = self.get_format_strings()
+        result = ''
+        if self.format_message:
+            result = self.format_message
+        if result and strings:
+            try:
+                # first, try to translate
+                translated = []
+                for item in strings:
+                    if item:
+                        translated.append(_(item))
+                    else:
+                        translated.append(_("None"))
+                result = _(self.format_message) % tuple(translated)
+            except TypeError:
+                # then try untranslated
+                try:
+                    result = self.format_message % tuple(strings)
+                except TypeError:
+                    # give up
+                    pass
+        return result
+
+    def get_full_message(self):
+        """Return full message"""
+        result = ''
+        format_message = self.get_format_message()
+        if format_message:
+            result += format_message
+        if self.body:
+            result += '<p>' + self.body + '</p>'
+        if result.endswith('<br />'):
+            result = result[:len(result) - 6]
+        return result
+    full_message = property(get_full_message)
+
+    def notify_subscribers(self, obj, *args, **kwargs):
+        if obj not in self.about.all():
+            return
+        author = self.author
+        if author:
+            # E-mail contents for e-mail notifications
+            full_message = self.get_full_message()
+            html = '%s:<br /><br />\n\n<a href="%s">%s</a> (%s):<br /><br />\n\n%s<br /><br />\n\n' % \
+                (unicode(author), obj.get_absolute_url(), unicode(obj),
+                 unicode(obj.get_human_type()), full_message)
+            grittertext = '%s:<br />\n\n<a href="#%s">%s</a> (%s):<br />\n\n%s<br />\n\n' % \
+                (unicode(author), obj.get_absolute_url(), unicode(obj),
+                 unicode(obj.get_human_type()), full_message)
+            if 'request' in kwargs:
+                domain = RequestSite(kwargs['request']).domain
+                html = html.replace('href="', 'href="http://' + domain)
+            body = strip_tags(html)
+            signature = "This is an automated message from Tree.io service (http://tree.io). Please do not reply to this e-mail."
+            subject = "[Tree.io%s] %s: %s - %s" % (' #%d' % obj.id if self.record_type != 'delete' else '', unicode(author),
+                                                   unicode(obj.get_human_type()), unicode(strip_tags(full_message)[:100]))
+
+            for recipient in self.recipients.all():
+                if author and author.id == recipient.id:
+                    continue
+                email_notifications = getattr(
+                    settings, 'HARDTREE_ALLOW_EMAIL_NOTIFICATIONS', False)
+                gritter_notifications = getattr(
+                    settings, 'HARDTREE_ALLOW_GRITTER_NOTIFICATIONS', False)
+                try:
+                    conf = ModuleSetting.get(
+                        'email_notifications', user=recipient)[0]
+                    email_notifications = conf.value
+                except:
+                    pass
+
+                if email_notifications == 'True':
+                    try:
+                        toaddr = recipient.get_entity(
+                        ).get_contact().get_email()
+                    except:
+                        toaddr = None
+                    if toaddr:
+                        SystemEmail(
+                            toaddr, subject, body, signature, html + signature).send_email()
+
+                if gritter_notifications:
+                    try:
+                        request = HttpRequest()
+                        request.user = recipient.user.user
+                        storage = default_storage(request)
+                        storage._add(
+                            Message(messages.constants.INFO, "%s" % grittertext))
+                    except:
+                        pass
+
+
+class Module(Object):
+    """Record of a module (application) existing within the system"""
+    name = models.CharField(max_length=256)
+    title = models.CharField(max_length=256)
+    details = models.TextField(blank=True)
+    url = models.CharField(max_length=512)
+    display = models.BooleanField(default=True)
+    system = models.BooleanField(default=True)
+
+    searcheable = False
+
+    class Meta:
+        """Module"""
+        ordering = ['name']
+
+    def get_absolute_url(self):
+        """Returns absolute URL"""
+        try:
+            return reverse('core_admin_module_view', args=[self.id])
+        except Exception:
+            pass
+
+    def __unicode__(self):
+        return self.title
+
+
+class Perspective(Object):
+    """Defines a set of modules enabled for a given user"""
+    name = models.CharField(max_length=256)
+    details = models.TextField(blank=True)
+    modules = models.ManyToManyField(Module, blank=True, null=True)
+
+    def __unicode__(self):
+        return self.name
+
+    def get_absolute_url(self):
+        """Returns absolute URL"""
+        try:
+            return reverse('core_admin_perspective_view', args=[self.id])
+        except Exception:
+            pass
+
+    def get_modules(self):
+        """Get Modules"""
+        modules = self.modules.all()
+        if not modules:
+            modules = Module.objects.all()
+        return modules
+
+
+class ModuleSetting(models.Model):
+    """Free-type Module setting"""
+    name = models.CharField(max_length=512)
+    label = models.CharField(max_length=512)
+    perspective = models.ForeignKey(Perspective, blank=True, null=True)
+    module = models.ForeignKey(Module, blank=True, null=True)
+    user = models.ForeignKey(User, blank=True, null=True)
+    group = models.ForeignKey(Group, blank=True, null=True)
+    value = models.TextField()
+
+    def loads(self):
+        """Unpickle a ModuleSetting value"""
+        result = None
+        if self.value:
+            try:
+                result = pickle.loads(base64.b64decode((self.value)))
+            except pickle.PickleError:
+                pass
+        return result
+
+    def dumps(self, value):
+        """Pickle a ModuleSetting value"""
+        self.value = base64.b64encode(
+            pickle.dumps(value, pickle.HIGHEST_PROTOCOL))
+        return self
+
+    def get(name='', strict=False, **kwargs):
+        """Setting getter"""
+        if name:
+            settings_qs = ModuleSetting.objects.filter(name=name)
+        else:
+            settings_qs = ModuleSetting.objects.all()
+        if strict:
+            settings_qs = settings_qs.filter(**kwargs)
+        elif settings_qs:
+            new_settings = settings_qs
+            for arg in kwargs:
+                new_settings = new_settings.filter(**{arg: kwargs[arg]})
+                if new_settings:
+                    settings_qs = new_settings
+
+        return settings_qs
+    get = staticmethod(get)
+
+    def get_for_module(module_name, name='', strict=False, **kwargs):
+        """Get a setting per module"""
+        try:
+            module = Module.objects.get(name=module_name)
+            return ModuleSetting.get(name=name, module=module, strict=strict, **kwargs)
+        except Exception:
+            return None
+    get_for_module = staticmethod(get_for_module)
+
+    def set(name, value, **kwargs):
+        """Define a ModuleSetting"""
+        existing = ModuleSetting.objects.filter(name=name, **kwargs)
+        if existing:
+            for setting in existing:
+                setting.value = value
+                setting.save()
+        else:
+            setting = ModuleSetting(name=name, value=value, **kwargs)
+            setting.save()
+        return setting
+    set = staticmethod(set)
+
+    def add(name, value, **kwargs):
+        """Add a ModuleSetting"""
+        setting = ModuleSetting(name=name, value=value, **kwargs)
+        setting.save()
+        return setting
+    add = staticmethod(add)
+
+    def set_for_module(name, value, module_name, **kwargs):
+        """Define a ModuleSetting per module"""
+        try:
+            module = Module.objects.get(name=module_name)
+            return ModuleSetting.set(name=name, value=value, module=module, **kwargs)
+        except Exception:
+            return None
+    set_for_module = staticmethod(set_for_module)
+
+    def add_for_module(name, value, module_name, **kwargs):
+        """Add a ModuleSetting per module"""
+        try:
+            module = Module.objects.get(name=module_name)
+            return ModuleSetting.add(name=name, value=value, module=module, **kwargs)
+        except Exception:
+            return None
+    add_for_module = staticmethod(add_for_module)
+
+    def __unicode__(self):
+        return unicode(self.name) + ": " + unicode(self.value)
+
+    def save(self, *args, **kwargs):
+        """Override to set label from name if undefined"""
+        if not self.label:
+            self.label = self.name
+        super(ModuleSetting, self).save(*args, **kwargs)
+
+
+class ConfigSetting(models.Model):
+    """Config setting to be activated dynamically from the database on request"""
+    name = models.CharField(max_length=255, unique=True)
+    value = models.TextField(blank=True, null=True)
+    last_updated = models.DateTimeField(auto_now=True)
+
+    def __unicode__(self):
+        return unicode(self.loads())
+
+    def loads(self):
+        """Unpickle a ModuleSetting value"""
+        result = None
+        try:
+            result = pickle.loads(base64.b64decode((self.value)))
+        except:
+            result = self.value
+        return result
+
+    def dumps(self, value):
+        """Pickle a ModuleSetting value"""
+        self.value = base64.b64encode(
+            pickle.dumps(value, pickle.HIGHEST_PROTOCOL))
+        return self
+
+    def save(self, *args, **kwargs):
+        self.dumps(self.value)
+        super(ConfigSetting, self).save(*args, **kwargs)
+
+
+class IntegrationResource:
+
+    """ Resource set for integration via Nuvius
+
+    nuvius_id     = <ID of the user on Nuvius (may be obtained via JSONP call>
+    resource_id   = <Application ID, i.e. 1 for Facebook>
+    resource_name = <Application name, i.e. Google Contacts>
+    services      = <Data points ID on Nuvius, e.g. for /services/news/ ID is 37rw to read/write>
+    role          = <Usually master or slave>
+
+    """
+
+    nuvius_id = 0
+    resource_id = 0
+    resource_name = ''
+    service = ''
+    role = 'slave'
+
+    def __init__(self, nuvius_id, resource_id, resource_name, services='', role='slave'):
+        """Initialize an Integration Resource"""
+
+        self.nuvius_id = nuvius_id
+        self.resource_id = resource_id
+        self.resource_name = resource_name
+        self.services = services
+        if not self.service:
+            self.service = getattr(settings, 'NUVIUS_SERVICES', '')
+        self.role = role
+
+
+class Location(Object):
+    """Location for users, assets, etc."""
+    name = models.CharField(max_length=512)
+    parent = models.ForeignKey(
+        'self', blank=True, null=True, related_name='child_set')
+
+    def __unicode__(self):
+        return self.name
+
+    def get_absolute_url(self):
+        "Returns absolute URL"
+        try:
+            return reverse('identities_location_view', args=[self.id])
+        except Exception:
+            pass
+
+
+class PageFolder(Object):
+    """Folder for static Pages"""
+    name = models.CharField(max_length=256)
+    details = models.TextField(blank=True)
+
+    searchable = False
+
+    def __unicode__(self):
+        return self.name
+
+    def get_absolute_url(self):
+        """Returns absolute URL"""
+        try:
+            return reverse('core_admin_pagefolder_view', args=[self.id])
+        except Exception:
+            pass
+
+
+class Page(Object):
+    """Static page"""
+    name = models.CharField(max_length=256)
+    title = models.CharField(max_length=256)
+    folder = models.ForeignKey(PageFolder)
+    body = models.TextField(blank=True)
+    published = models.BooleanField(default=True)
+
+    searchable = False
+
+    class Meta:
+        """Page"""
+        ordering = ['name']
+
+    def __unicode__(self):
+        return self.title
+
+    def get_absolute_url(self):
+        """Returns absolute URL"""
+        try:
+            return reverse('core_admin_page_view', args=[self.id])
+        except Exception:
+            pass
+
+
+class Widget(models.Model):
+    """Widget object to remember the set and order of Widget for a user"""
+    user = models.ForeignKey(User)
+    perspective = models.ForeignKey(Perspective)
+    module_name = models.CharField(max_length=256)
+    widget_name = models.CharField(max_length=256)
+    weight = models.IntegerField(default=0)
+
+    def __unicode__(self):
+        return self.widget_name
+
+    class Meta:
+        """Widget"""
+        ordering = ['weight']
+
+
+class Attachment(models.Model):
+    """Attachment object to upload and reference a file"""
+    filename = models.CharField(max_length=64)
+    attached_object = models.ForeignKey(Object, blank=True, null=True)
+    attached_record = models.ForeignKey(UpdateRecord, blank=True, null=True)
+    attached_file = models.FileField(upload_to='attachments')
+    mimetype = models.CharField(max_length=64, editable=False)
+    created = models.DateTimeField(auto_now_add=True, editable=False)
+    uploaded_by = models.ForeignKey(User)
+
+    class Meta:
+        ordering = ['-id']
+
+    def __unicode__(self):
+        return unicode(self.filename)
+
+    def get_file_type(self):
+        match = re.match(
+            '.*\.(?P<extension>[a-zA-Z0-9]+)$', unicode(self.filename))
+        if match:
+            return unicode(match.group('extension')).upper()
+        else:
+            return ''
+
+    def can_preview(self):
+        filetype = self.get_file_type()
+        exts = ('PNG', 'JPG', 'JPEG', 'BMP', 'GIF', 'SVG')
+        if filetype.upper() in exts:
+            return True
+        return False
+
+    def get_icon(self):
+        if self.get_file_type() == 'PDF':
+            # PDF
+            return 'pdf'
+        elif self.get_file_type() in ['DOCX', 'DOC', 'TXT']:
+            # Documents
+            return 'blue-document-word'
+        elif self.get_file_type() in ['JPG', 'JPEG', 'GIF', 'PNG', 'TIFF', 'PSD', 'BMP']:
+            # Images
+            return 'image'
+        else:
+            # Other
+            return 'blue-document'
+
+    def delete(self, *args, **kwargs):
+        filepath = os.path.join(
+            getattr(settings, 'MEDIA_ROOT'), 'attachments', self.attached_file.name)
+        try:
+            self.attached_file.delete()
+            os.remove(filepath)
+        except:
+            pass
+        super(Attachment, self).delete(*args, **kwargs)
diff --git a/data/treeio/treeio/treeio/core/rendering.py b/data/treeio/treeio/treeio/core/rendering.py
new file mode 100644
index 0000000..9c53433
--- /dev/null
+++ b/data/treeio/treeio/treeio/core/rendering.py
@@ -0,0 +1,246 @@
+"""
+Rendering routines for Hardtree
+"""
+
+from django.http import HttpResponse
+from django.contrib.sites.models import RequestSite
+from django.utils.translation import ugettext as _
+from django.forms import BaseForm
+from django.contrib import messages
+from jinja2 import Template
+from coffin.template import loader
+from treeio.core.conf import settings
+from treeio.core.models import UpdateRecord
+from treeio.core.ajax.converter import preprocess_context as preprocess_context_ajax, convert_to_ajax
+import hashlib
+import random
+import os
+import codecs
+import re
+import subprocess
+import json
+
+
+def _preprocess_context_html(context):
+    "Prepares context to be rendered for HTML"
+
+    # Process popuplink fields
+    for key in context:
+        if isinstance(context[key], BaseForm):
+            form = context[key]
+            for fname in form.fields:
+                field = form.fields[fname]
+                try:
+                    # find popuplink fields
+                    if field.widget.attrs and 'popuplink' in field.widget.attrs:
+                        field.help_text += '<a href="%s" field="id_%s" id="link-%s" class="inline-link add-link popup-link">%s</a>' % \
+                                           (field.widget.attrs['popuplink'], fname, fname, _("New"))
+                except Exception:
+                    pass
+
+    return context
+
+
+def render_to_string(template_name, context=None, context_instance=None, response_format='html'):
+    "Picks up the appropriate template to render to string"
+    if context is None:
+        context = {}
+    if not response_format or 'pdf' in response_format or response_format not in settings.HARDTREE_RESPONSE_FORMATS:
+        response_format = 'html'
+
+    if not ("." + response_format) in template_name:
+        template_name += "." + response_format
+
+    template_name = response_format + "/" + template_name
+
+    context['response_format'] = response_format
+    if context_instance:
+        context['site_domain'] = RequestSite(
+            context_instance['request']).domain
+
+    context = _preprocess_context_html(context)
+
+    rendered_string = loader.render_to_string(
+        template_name, context, context_instance)
+    return rendered_string
+
+
+def render_to_ajax(template_name, context=None, context_instance=None):
+    "Render request into JSON object to be handled by AJAX on the server-side"
+    if context is None:
+        context = {}
+    response_format = 'html'
+    if 'response_format_tags' not in context:
+        context['response_format_tags'] = 'ajax'
+
+    context = preprocess_context_ajax(context)
+    content = render_to_string(
+        template_name, context, context_instance, response_format)
+    content = convert_to_ajax(content, context_instance)
+    context['content'] = json.dumps(content)
+
+    notifications = []
+    if context_instance and 'request' in context_instance:
+        request = context_instance['request']
+        maxmsgs = 5
+        try:
+            for message in list(messages.get_messages(request))[:maxmsgs]:
+                msgtext = unicode(message)
+                if 'updaterecord:' in msgtext[:13]:
+                    try:
+                        update_id = int(msgtext.split(':', 1)[1])
+                        update = UpdateRecord.objects.get(pk=update_id)
+                        message = {'message': update.get_full_message(),
+                                   'tags': message.tags}
+                        if update.author:
+                            if update.record_type == 'manual' or update.record_type == 'share':
+                                try:
+                                    message[
+                                        'image'] = update.author.get_contact().get_picture()
+                                except:
+                                    pass
+                            message['title'] = unicode(update.author)
+                        for obj in update.about.all():
+                            message['message'] = "(%s) %s:<br />%s" % (
+                                obj.get_human_type(), unicode(obj), message['message'])
+                        notifications.append(message)
+                    except:
+                        pass
+                else:
+                    notifications.append({'message': unicode(message),
+                                          'tags': message.tags})
+        except:
+            pass
+    context['notifications'] = json.dumps(notifications)
+
+    rendered_string = render_to_string(
+        'ajax_base', context, context_instance, response_format='json')
+
+    return rendered_string
+
+
+def render_to_response(template_name, context=None, context_instance=None, response_format='html'):
+    "Extended render_to_response to support different formats"
+    if context is None:
+        context = {}
+    if not response_format:
+        response_format = 'html'
+
+    if response_format not in settings.HARDTREE_RESPONSE_FORMATS:
+        response_format = 'html'
+
+    content_type = settings.HARDTREE_RESPONSE_FORMATS[response_format]
+
+    if 'pdf' in response_format:
+        while True:
+            hasher = hashlib.md5()
+            hasher.update(str(random.random()))
+            filepath = u"pdfs/" + hasher.hexdigest()
+            output = settings.MEDIA_ROOT + filepath
+            if not os.path.exists(output + ".pdf"):
+                break
+
+        while True:
+            hasher = hashlib.md5()
+            hasher.update(str(random.random()))
+            filepath = hasher.hexdigest() + ".html"
+            source = getattr(settings, 'WKCWD', './') + filepath
+            if not os.path.exists(source):
+                break
+
+        page_size = "A4"
+        orientation = "portrait"
+
+        rendered_string = render_to_string(
+            template_name, context, context_instance, response_format)
+
+        f = codecs.open(source, encoding='utf-8', mode='w')
+        pdf_string = unicode(rendered_string)
+
+        if context_instance and context_instance['request']:
+            pdf_string = pdf_string.replace(
+                "a href=\"/", "a href=\"http://" + RequestSite(context_instance['request']).domain + "/")
+
+        pdf_string.replace("href=\"/", "href=\"")
+
+        pattern = """Content-Type: text/html|<td>\n\W*<div class="content-list-tick">\n\W.*\n.*</div></td>|<th scope="col">Select</th>"""
+        pdf_string = re.sub(pattern, "", pdf_string).replace(
+            '/static/', 'static/')
+
+        f.write(pdf_string)
+        f.close()
+
+        wkpath = getattr(settings, 'WKPATH', './bin/wkhtmltopdf-i386')
+        x = subprocess.Popen("%s --print-media-type --orientation %s --page-size %s %s %s" %
+                             (wkpath,
+                              orientation,
+                              page_size,
+                              source,
+                              output),
+                             shell=True,
+                             cwd=getattr(settings, 'WKCWD', './'))
+        x.wait()
+
+        f = open(output)
+        response = HttpResponse(f.read(), content_type='application/pdf')
+        f.close()
+
+        os.remove(output)
+        os.remove(source)
+
+        # response['Content-Disposition'] = 'attachment; filename=%s'%(pdf_name)
+
+        return response
+
+    if 'ajax' in response_format:
+        rendered_string = render_to_ajax(
+            template_name, context, context_instance)
+
+    else:
+
+        if response_format == 'html' and context_instance and context_instance['request'].path[:3] == '/m/':
+            context['response_format'] = response_format = 'mobile'
+
+        if getattr(settings, 'HARDTREE_FORCE_AJAX_RENDERING', False):
+            context = preprocess_context_ajax(context)
+
+        rendered_string = render_to_string(
+            template_name, context, context_instance, response_format)
+
+    response = HttpResponse(rendered_string, content_type=content_type)
+
+    return response
+
+
+def render_string_template(template_string, context=None, context_instance=None):
+    """
+    Performs rendering using template_string instead of a file, and context.
+    context_instance is only used to feed user into context (unless already defined)
+
+    Returns string.
+    """
+    if context is None:
+        context = {}
+    template = Template(template_string)
+    if 'user' not in context and context_instance:
+        if 'request' in context_instance:
+            context.update({'user': context_instance['request']})
+
+    return template.render(context)
+
+
+def get_template_source(template_name, response_format='html'):
+    "Returns source of the template file"
+
+    if not response_format or 'pdf' in response_format or response_format not in settings.HARDTREE_RESPONSE_FORMATS:
+        response_format = 'html'
+
+    if not ("." + response_format) in template_name:
+        template_name += "." + response_format
+
+    template_name = response_format + "/" + template_name
+
+    t = loader.get_template(template_name)
+    f = open(t.filename, 'r')
+
+    return f.read()
diff --git a/data/treeio/treeio/treeio/core/rss.py b/data/treeio/treeio/treeio/core/rss.py
new file mode 100644
index 0000000..5d097b9
--- /dev/null
+++ b/data/treeio/treeio/treeio/core/rss.py
@@ -0,0 +1,117 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+"""
+Global RSS Framework
+"""
+from django.contrib.syndication.views import Feed
+from django.contrib.sites.models import RequestSite
+from treeio.core.models import Object, UpdateRecord, User
+import hashlib
+import random
+
+
+class ObjectFeed(Feed):
+
+    "Generic RSS class"
+
+    def __init__(self, title, link, description, objects, *args, **kwargs):
+        self.title = title
+        self.link = link
+        self.description = description
+        self.key = ''
+        self.objects = objects
+        super(ObjectFeed, self).__init__(*args, **kwargs)
+
+    def __call__(self, request, *args, **kwargs):
+        "Generates response"
+        self.site_url = 'http://' + RequestSite(request).domain
+        self.link = self.site_url + self.link
+        response = super(ObjectFeed, self).__call__(request, *args, **kwargs)
+        # Dirty hack for "example.com" - I hate it too but it works (contrast to all other solutions)
+        # TODO: proper workaround for "example.com" in URLs
+        # P.S. worship Ctulhu before you attempt this
+        response.content = response.content.replace(
+            'http://example.com', self.site_url)
+        return response
+
+    def get_object(self, request, *args, **kwargs):
+        "Returns feed objects"
+        return self.objects[:50]
+
+    def items(self, obj):
+        "Returns a single object"
+        return obj
+
+    def item_title(self, obj):
+        "Returns object title"
+        if isinstance(obj, Object):
+            return obj.creator
+        elif isinstance(obj, UpdateRecord):
+            return obj.author
+
+    def item_pubdate(self, obj):
+        "Returns object's date_created"
+        return obj.date_created
+
+    def item_description(self, obj):
+        "Returns object's body, details or full message"
+        if isinstance(obj, Object):
+            if obj.body:
+                return obj.body
+            else:
+                return obj.details
+        elif isinstance(obj, UpdateRecord):
+            body = ''
+            for object in obj.about.all():
+                body += '<a href="' + self.site_url + \
+                    object.get_absolute_url(
+                    ) + '">' + unicode(object) + ' (' + object.get_human_type() + ')</a><br />'
+            body += obj.get_full_message()
+            return body
+
+    def item_link(self, obj):
+        "Returns object's full url"
+        if isinstance(obj, Object):
+            return self.site_url + obj.get_absolute_url()
+        elif isinstance(obj, UpdateRecord):
+            # link must be unique
+            return self.link + '?' + str(random.random())
+
+
+def verify_secret_key(request):
+    "Verifies secret key for a request"
+    if request.user.username:
+        # always allow authenticated users
+        return True
+    else:
+        key = request.GET['secret']
+        user_id, secret = key.split('.', 1)
+        try:
+            profile = User.objects.get(pk=user_id)
+        except:
+            return False
+        if key == get_secret_key(request, profile):
+            request.user = profile.user
+            return True
+    return False
+
+
+def get_secret_key(request, profile=None):
+    "Generates secret key for a request in RSS format"
+    if not profile:
+        if request.user.username:
+            profile = request.user.profile
+    if profile:
+        params = request.GET.copy()
+        if 'secret' in params:
+            del params['secret']
+        hash = hashlib.sha224()
+        hash.update(unicode(params))
+        hash.update(unicode(profile.id))
+        hash.update(unicode(profile.user.date_joined))
+        key = unicode(profile.id) + '.' + hash.hexdigest()
+        return key
+    return ''
diff --git a/data/treeio/treeio/treeio/core/sanitizer.py b/data/treeio/treeio/treeio/core/sanitizer.py
new file mode 100644
index 0000000..485658f
--- /dev/null
+++ b/data/treeio/treeio/treeio/core/sanitizer.py
@@ -0,0 +1,318 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+import re
+from xml.sax.saxutils import escape, unescape
+import html5lib
+from html5lib import treebuilders, treewalkers, serializer
+from html5lib.tokenizer import HTMLTokenizer
+from html5lib.constants import tokenTypes
+
+
+class HTMLSanitizerMixin(object):
+
+    """ sanitization of XHTML+MathML+SVG and of inline style attributes."""
+
+    acceptable_elements = ['a', 'abbr', 'acronym', 'address', 'area',
+                           'article', 'aside', 'audio', 'b', 'big', 'blockquote', 'br', 'button',
+                           'canvas', 'caption', 'center', 'cite', 'code', 'col', 'colgroup',
+                           'command', 'datagrid', 'datalist', 'dd', 'del', 'details', 'dfn',
+                           'dialog', 'dir', 'div', 'dl', 'dt', 'em', 'event-source', 'fieldset',
+                           'figcaption', 'figure', 'footer', 'font', 'form', 'header', 'h1',
+                           'h2', 'h3', 'h4', 'h5', 'h6', 'hr', 'i', 'img', 'input', 'ins',
+                           'keygen', 'kbd', 'label', 'legend', 'li', 'm', 'map', 'menu', 'meter',
+                           'multicol', 'nav', 'nextid', 'ol', 'output', 'optgroup', 'option',
+                           'p', 'pre', 'progress', 'q', 's', 'samp', 'section', 'select',
+                           'small', 'sound', 'source', 'spacer', 'span', 'strike', 'strong',
+                           'sub', 'sup', 'table', 'tbody', 'td', 'textarea', 'time', 'tfoot',
+                           'th', 'thead', 'tr', 'tt', 'u', 'ul', 'var', 'video']
+
+    mathml_elements = ['maction', 'math', 'merror', 'mfrac', 'mi',
+                       'mmultiscripts', 'mn', 'mo', 'mover', 'mpadded', 'mphantom',
+                       'mprescripts', 'mroot', 'mrow', 'mspace', 'msqrt', 'mstyle', 'msub',
+                       'msubsup', 'msup', 'mtable', 'mtd', 'mtext', 'mtr', 'munder',
+                       'munderover', 'none']
+
+    svg_elements = ['a', 'animate', 'animateColor', 'animateMotion',
+                    'animateTransform', 'clipPath', 'circle', 'defs', 'desc', 'ellipse',
+                    'font-face', 'font-face-name', 'font-face-src', 'g', 'glyph', 'hkern',
+                    'linearGradient', 'line', 'marker', 'metadata', 'missing-glyph',
+                    'mpath', 'path', 'polygon', 'polyline', 'radialGradient', 'rect',
+                    'set', 'stop', 'svg', 'switch', 'text', 'tspan', 'use']
+
+    acceptable_attributes = ['abbr', 'accept', 'accept-charset', 'accesskey',
+                             'action', 'align', 'alt', 'autocomplete', 'autofocus', 'axis',
+                             'background', 'balance', 'bgcolor', 'bgproperties', 'border',
+                             'bordercolor', 'bordercolordark', 'bordercolorlight', 'bottompadding',
+                             'cellpadding', 'cellspacing', 'ch', 'challenge', 'char', 'charoff',
+                             'choff', 'charset', 'checked', 'cite', 'class', 'clear', 'color', 'callback',
+                             'cols', 'colspan', 'compact', 'contenteditable', 'controls', 'coords',
+                             'data', 'datafld', 'datapagesize', 'datasrc', 'datetime', 'default',
+                             'delay', 'dir', 'disabled', 'draggable', 'dynsrc', 'enctype', 'end',
+                             'face', 'for', 'form', 'field', 'frame', 'galleryimg', 'gutter', 'headers',
+                             'height', 'hidefocus', 'hidden', 'high', 'href', 'hreflang', 'hspace',
+                             'icon', 'id', 'inputmode', 'ismap', 'keytype', 'label', 'leftspacing',
+                             'lang', 'list', 'longdesc', 'loop', 'loopcount', 'loopend',
+                             'loopstart', 'low', 'lowsrc', 'max', 'maxlength', 'media', 'method',
+                             'min', 'multiple', 'name', 'nohref', 'noshade', 'nowrap', 'open',
+                             'optimum', 'pattern', 'ping', 'point-size', 'prompt', 'pqg',
+                             'radiogroup', 'readonly', 'rel', 'repeat-max', 'repeat-min',
+                             'replace', 'required', 'rev', 'rightspacing', 'rows', 'rowspan',
+                             'rules', 'scope', 'selected', 'shape', 'size', 'span', 'src', 'start',
+                             'step', 'style', 'summary', 'suppress', 'tabindex', 'target',
+                             'template', 'title', 'toppadding', 'type', 'unselectable', 'usemap',
+                             'urn', 'valign', 'value', 'variable', 'volume', 'vspace', 'vrml',
+                             'width', 'wrap', 'xml:lang']
+
+    mathml_attributes = ['actiontype', 'align', 'columnalign', 'columnalign',
+                         'columnalign', 'columnlines', 'columnspacing', 'columnspan', 'depth',
+                         'display', 'displaystyle', 'equalcolumns', 'equalrows', 'fence',
+                         'fontstyle', 'fontweight', 'frame', 'height', 'linethickness', 'lspace',
+                         'mathbackground', 'mathcolor', 'mathvariant', 'mathvariant', 'maxsize',
+                         'minsize', 'other', 'rowalign', 'rowalign', 'rowalign', 'rowlines',
+                         'rowspacing', 'rowspan', 'rspace', 'scriptlevel', 'selection',
+                         'separator', 'stretchy', 'width', 'width', 'xlink:href', 'xlink:show',
+                         'xlink:type', 'xmlns', 'xmlns:xlink']
+
+    svg_attributes = ['accent-height', 'accumulate', 'additive', 'alphabetic',
+                      'arabic-form', 'ascent', 'attributeName', 'attributeType',
+                      'baseProfile', 'bbox', 'begin', 'by', 'calcMode', 'cap-height',
+                      'class', 'clip-path', 'color', 'color-rendering', 'content', 'cx',
+                      'cy', 'd', 'dx', 'dy', 'descent', 'display', 'dur', 'end', 'fill',
+                      'fill-opacity', 'fill-rule', 'font-family', 'font-size',
+                      'font-stretch', 'font-style', 'font-variant', 'font-weight', 'from',
+                      'fx', 'fy', 'g1', 'g2', 'glyph-name', 'gradientUnits', 'hanging',
+                      'height', 'horiz-adv-x', 'horiz-origin-x', 'id', 'ideographic', 'k',
+                      'keyPoints', 'keySplines', 'keyTimes', 'lang', 'marker-end',
+                      'marker-mid', 'marker-start', 'markerHeight', 'markerUnits',
+                      'markerWidth', 'mathematical', 'max', 'min', 'name', 'offset',
+                      'opacity', 'orient', 'origin', 'overline-position',
+                      'overline-thickness', 'panose-1', 'path', 'pathLength', 'points',
+                      'preserveAspectRatio', 'r', 'refX', 'refY', 'repeatCount',
+                      'repeatDur', 'requiredExtensions', 'requiredFeatures', 'restart',
+                      'rotate', 'rx', 'ry', 'slope', 'stemh', 'stemv', 'stop-color',
+                      'stop-opacity', 'strikethrough-position', 'strikethrough-thickness',
+                      'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap',
+                      'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity',
+                      'stroke-width', 'systemLanguage', 'target', 'text-anchor', 'to',
+                      'transform', 'type', 'u1', 'u2', 'underline-position',
+                      'underline-thickness', 'unicode', 'unicode-range', 'units-per-em',
+                      'values', 'version', 'viewBox', 'visibility', 'width', 'widths', 'x',
+                      'x-height', 'x1', 'x2', 'xlink:actuate', 'xlink:arcrole',
+                      'xlink:href', 'xlink:role', 'xlink:show', 'xlink:title', 'xlink:type',
+                      'xml:base', 'xml:lang', 'xml:space', 'xmlns', 'xmlns:xlink', 'y',
+                      'y1', 'y2', 'zoomAndPan']
+
+    attr_val_is_uri = ['href', 'src', 'cite', 'action', 'longdesc',
+                       'xlink:href', 'xml:base']
+
+    svg_attr_val_allows_ref = ['clip-path', 'color-profile', 'cursor', 'fill',
+                               'filter', 'marker', 'marker-start', 'marker-mid', 'marker-end',
+                               'mask', 'stroke']
+
+    svg_allow_local_href = ['altGlyph', 'animate', 'animateColor',
+                            'animateMotion', 'animateTransform', 'cursor', 'feImage', 'filter',
+                            'linearGradient', 'pattern', 'radialGradient', 'textpath', 'tref',
+                            'set', 'use']
+
+    acceptable_css_properties = ['azimuth', 'background-color',
+                                 'border-bottom-color', 'border-collapse', 'border-color',
+                                 'border-left-color', 'border-right-color', 'border-top-color', 'clear',
+                                 'color', 'cursor', 'direction', 'display', 'elevation', 'float', 'font',
+                                 'font-family', 'font-size', 'font-style', 'font-variant', 'font-weight',
+                                 'height', 'letter-spacing', 'line-height', 'overflow', 'pause',
+                                 'pause-after', 'pause-before', 'pitch', 'pitch-range', 'richness',
+                                 'speak', 'speak-header', 'speak-numeral', 'speak-punctuation',
+                                 'speech-rate', 'stress', 'text-align', 'text-decoration', 'text-indent',
+                                 'unicode-bidi', 'vertical-align', 'voice-family', 'volume',
+                                 'white-space', 'width']
+
+    acceptable_css_keywords = ['auto', 'aqua', 'black', 'block', 'blue',
+                               'bold', 'both', 'bottom', 'brown', 'center', 'collapse', 'dashed',
+                               'dotted', 'fuchsia', 'gray', 'green', '!important', 'italic', 'left',
+                               'lime', 'maroon', 'medium', 'none', 'navy', 'normal', 'nowrap', 'olive',
+                               'pointer', 'purple', 'red', 'right', 'solid', 'silver', 'teal', 'top',
+                               'transparent', 'underline', 'white', 'yellow']
+
+    acceptable_svg_properties = ['fill', 'fill-opacity', 'fill-rule',
+                                 'stroke', 'stroke-width', 'stroke-linecap', 'stroke-linejoin',
+                                 'stroke-opacity']
+
+    acceptable_protocols = ['ed2k', 'ftp', 'http', 'https', 'irc',
+                            'mailto', 'news', 'gopher', 'nntp', 'telnet', 'webcal',
+                            'xmpp', 'callto', 'feed', 'urn', 'aim', 'rsync', 'tag',
+                            'ssh', 'sftp', 'rtsp', 'afs']
+
+    remove_tags = ['script', 'style']
+
+    # subclasses may define their own versions of these constants
+    allowed_elements = acceptable_elements + mathml_elements + svg_elements
+    allowed_attributes = acceptable_attributes + \
+        mathml_attributes + svg_attributes
+    allowed_css_properties = acceptable_css_properties
+    allowed_css_keywords = acceptable_css_keywords
+    allowed_svg_properties = acceptable_svg_properties
+    allowed_protocols = acceptable_protocols
+
+    # Sanitize the +html+, escaping all elements not in ALLOWED_ELEMENTS, and
+    # stripping out all # attributes not in ALLOWED_ATTRIBUTES. Style
+    # attributes are parsed, and a restricted set, # specified by
+    # ALLOWED_CSS_PROPERTIES and ALLOWED_CSS_KEYWORDS, are allowed through.
+    # attributes in ATTR_VAL_IS_URI are scanned, and only URI schemes specified
+    # in ALLOWED_PROTOCOLS are allowed.
+    #
+    #   sanitize_html('<script> do_nasty_stuff() </script>')
+    #    => &lt;script> do_nasty_stuff() &lt;/script>
+    #   sanitize_html('<a href="javascript: sucker();">Click here for $100</a>')
+    #    => <a>Click here for $100</a>
+    def sanitize_token(self, token):
+
+        # accommodate filters which use token_type differently
+        token_type = token["type"]
+        if token_type in tokenTypes.keys():
+            token_type = tokenTypes[token_type]
+
+        if token_type in (tokenTypes["StartTag"], tokenTypes["EndTag"],
+                          tokenTypes["EmptyTag"]):
+            token["name"] = token["name"].lower()
+            if token["name"] in self.allowed_elements:
+                if "data" in token:
+                    attrs = dict([(name, val) for name, val in
+                                  token["data"][::-1]
+                                  if name in self.allowed_attributes])
+                    for attr in self.attr_val_is_uri:
+                        if not attrs.has_key(attr):
+                            continue
+                        val_unescaped = re.sub("[`\000-\040\177-\240\s]+", '',
+                                               unescape(attrs[attr])).lower()
+                        # remove replacement characters from unescaped
+                        # characters
+                        val_unescaped = val_unescaped.replace(u"\ufffd", "")
+                        if (re.match("^[a-z0-9][-+.a-z0-9]*:", val_unescaped) and
+                            (val_unescaped.split(':')[0] not in
+                             self.allowed_protocols)):
+                            del attrs[attr]
+                    for attr in self.svg_attr_val_allows_ref:
+                        if attr in attrs:
+                            attrs[attr] = re.sub(r'url\s*\(\s*[^#\s][^)]+?\)',
+                                                 ' ',
+                                                 unescape(attrs[attr]))
+                    if (token["name"] in self.svg_allow_local_href and
+                        'xlink:href' in attrs and re.search('^\s*[^#\s].*',
+                                                            attrs['xlink:href'])):
+                        del attrs['xlink:href']
+                    if 'style' in attrs:
+                        attrs['style'] = self.sanitize_css(attrs['style'])
+                    token["data"] = [[name, val]
+                                     for name, val in attrs.items()]
+                return token
+            else:
+                if token["name"] in self.remove_tags:
+                    token["name"] = "toberemoved"
+
+                    if token_type == tokenTypes["EndTag"]:
+                        token["data"] = "</%s>" % token["name"]
+                    elif token["data"]:
+                        attrs = ''.join([' %s="%s"' % (k, escape(v))
+                                        for k, v in token["data"]])
+                        token["data"] = "<%s%s>" % (token["name"], attrs)
+                    else:
+                        token["data"] = "<%s>" % token["name"]
+                    if token.get("selfClosing"):
+                        token["data"] = token["data"][:-1] + "/>"
+
+                    if token["type"] in tokenTypes.keys():
+                        token["type"] = "Characters"
+                    else:
+                        token["type"] = tokenTypes["Characters"]
+
+                    if "name" in token and token["name"] == "style":
+                        print "style", token["data"], dir(token)
+
+                    return token
+        elif token_type == tokenTypes["Comment"]:
+            pass
+        else:
+            return token
+
+    def sanitize_css(self, style):
+        # disallow urls
+        style = re.compile('url\s*\(\s*[^\s)]+?\s*\)\s*').sub(' ', style)
+
+        # gauntlet
+        if not re.match("""^([:,;#%.\sa-zA-Z0-9!]|\w-\w|'[\s\w]+'|"[\s\w]+"|\([\d,\s]+\))*$""", style):
+            return ''
+        if not re.match("^\s*([-\w]+\s*:[^:;]*(;\s*|$))*$", style):
+            return ''
+
+        clean = []
+        for prop, value in re.findall("([-\w]+)\s*:\s*([^:;]*)", style):
+            if not value:
+                continue
+            if prop.lower() in self.allowed_css_properties:
+                clean.append(prop + ': ' + value + ';')
+            elif prop.split('-')[0].lower() in ['background', 'border', 'margin',
+                                                'padding']:
+                for keyword in value.split():
+                    if keyword not in self.acceptable_css_keywords and \
+                            not re.match("^(#[0-9a-f]+|rgb\(\d+%?,\d*%?,?\d*%?\)?|\d{0,2}\.?\d{0,2}(cm|em|ex|in|mm|pc|pt|px|%|,|\))?)$", keyword):
+                        break
+                else:
+                    clean.append(prop + ': ' + value + ';')
+            elif prop.lower() in self.allowed_svg_properties:
+                clean.append(prop + ': ' + value + ';')
+
+        return ' '.join(clean)
+
+
+class HTMLSanitizer(HTMLTokenizer, HTMLSanitizerMixin):
+
+    def __init__(self, stream, encoding=None, parseMeta=True, useChardet=True,
+                 lowercaseElementName=False, lowercaseAttrName=False):
+        # Change case matching defaults as we only output lowercase html anyway
+        # This solution doesn't seem ideal...
+        HTMLTokenizer.__init__(self, stream, encoding, parseMeta, useChardet,
+                               lowercaseElementName, lowercaseAttrName)
+
+    def __iter__(self):
+        for token in HTMLTokenizer.__iter__(self):
+            token = self.sanitize_token(token)
+            if token:
+                yield token
+
+
+def clean_html(buf):
+    """Cleans HTML of dangerous tags and content."""
+    buf = buf.strip()
+    if not buf:
+        return buf
+
+    html_parser = html5lib.HTMLParser(
+        tree=treebuilders.getTreeBuilder("dom"), tokenizer=HTMLSanitizer)
+    dom_tree = html_parser.parseFragment(buf)
+
+    walker = treewalkers.getTreeWalker("dom")
+    stream = walker(dom_tree)
+
+    s = serializer.htmlserializer.HTMLSerializer(
+        omit_optional_tags=False, quote_attr_values=True)
+    output = s.render(stream, 'utf-8')
+
+    while 'toberemoved' in output:
+        oldoutput = output
+        matches = re.findall(
+            r'&lt;toberemoved.*?&gt;.*?&lt;/toberemoved&gt;', output, re.DOTALL)
+        for s in matches:
+            output = output.replace(s, '')
+        matches = re.findall(r'&lt;/toberemoved&gt;', output, re.DOTALL)
+        for s in matches:
+            output = output.replace(s, '')
+        matches = re.findall(r'&lt;toberemoved.*?&gt;', output, re.DOTALL)
+        for s in matches:
+            output = output.replace(s, '')
+        if output == oldoutput:
+            break
+
+    return output
diff --git a/data/treeio/treeio/treeio/core/search/models.py b/data/treeio/treeio/treeio/core/search/models.py
new file mode 100644
index 0000000..c5be6af
--- /dev/null
+++ b/data/treeio/treeio/treeio/core/search/models.py
@@ -0,0 +1,74 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+"""
+Core Search module model hooks
+"""
+
+import os
+from django.db.models import signals
+from treeio.core.conf import settings
+from treeio.core.models import Object
+from whoosh import index
+
+
+def create_index(sender=None, **kwargs):
+    "Create initial (empty) search index"
+    if not os.path.exists(settings.WHOOSH_INDEX):
+        os.mkdir(settings.WHOOSH_INDEX)
+    index.create_in(settings.WHOOSH_INDEX, schema=settings.WHOOSH_SCHEMA)
+
+if not settings.SEARCH_DISABLED and getattr(settings, 'SEARCH_ENGINE', 'whoosh') == 'whoosh':
+    signals.post_syncdb.connect(create_index)
+
+
+def update_index(sender, instance, created, **kwargs):
+    "Add Object to search index"
+    if isinstance(instance, Object) and instance.is_searchable():
+        search_item = instance.get_search_item()
+        ix = index.open_dir(settings.WHOOSH_INDEX)
+        try:
+            writer = ix.writer()
+            try:
+                if created:
+                    writer.add_document(id=search_item['id'],
+                                        name=search_item['name'],
+                                        type=search_item['type'],
+                                        content=search_item['content'],
+                                        url=unicode(search_item['url']))
+                    writer.commit()
+                else:
+                    writer.update_document(id=search_item['id'],
+                                           name=search_item['name'],
+                                           type=search_item['type'],
+                                           content=search_item['content'],
+                                           url=search_item['url'])
+                    writer.commit()
+            except:
+                writer.cancel()
+        except:
+            pass
+
+if not settings.SEARCH_DISABLED and getattr(settings, 'SEARCH_ENGINE', 'whoosh') == 'whoosh':
+    signals.post_save.connect(update_index)
+
+
+def delete_index(sender, instance, **kwargs):
+    "Delete Object from search index"
+
+    if isinstance(instance, Object) and instance.is_searchable():
+        ix = index.open_dir(settings.WHOOSH_INDEX)
+        try:
+            writer = ix.writer()
+            try:
+                writer.delete_by_term(u'id', unicode(instance.id))
+                writer.commit()
+            except:
+                writer.cancel()
+        except:
+            pass
+
+if not settings.SEARCH_DISABLED and getattr(settings, 'SEARCH_ENGINE', 'whoosh') == 'whoosh':
+    signals.post_delete.connect(delete_index)
diff --git a/data/treeio/treeio/treeio/core/search/views.py b/data/treeio/treeio/treeio/core/search/views.py
new file mode 100644
index 0000000..7d79bac
--- /dev/null
+++ b/data/treeio/treeio/treeio/core/search/views.py
@@ -0,0 +1,67 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+"""
+Core Search module views
+"""
+
+from treeio.core.rendering import render_to_response
+from django.template import RequestContext
+from treeio.core.decorators import treeio_login_required, handle_response_format
+from treeio.core.conf import settings
+from treeio.core.models import Object, Tag
+from treeio.core.search import dbsearch
+from whoosh import index, qparser
+
+
+@treeio_login_required
+@handle_response_format
+def search_query(request, response_format='html'):
+    "Account view"
+
+    objects = []
+    query = request.GET.get('q', '')
+    if query:
+        if query[:5] == 'tags:':
+            tag_names = query[5:].strip().split(',')
+            tags = Tag.objects.filter(name__in=tag_names)
+            objects = Object.objects.filter(tags__in=tags)
+        else:
+            search_engine = getattr(settings, 'SEARCH_ENGINE', 'whoosh')
+            if search_engine == 'whoosh':
+                ix = index.open_dir(settings.WHOOSH_INDEX)
+                # Whoosh doesn't understand '+' or '-' but we can replace
+                # them with 'AND' and 'NOT'.
+                squery = query.replace(
+                    '+', ' AND ').replace('|', ' OR ').replace(' ', ' OR ')
+                parser = qparser.MultifieldParser(
+                    ["name", "url", "type", "content"], schema=ix.schema)
+                qry = parser.parse(squery)
+                try:
+                    qry = parser.parse(squery)
+                except:
+                    # don't show the user weird errors only because we don't
+                    # understand the query.
+                    # parser.parse("") would return None
+                    qry = None
+                if qry:
+                    searcher = ix.searcher()
+                    try:
+                        hits = searcher.search(qry, limit=100)
+                    except:
+                        hits = []
+
+                    hit_ids = [hit['id'] for hit in hits]
+
+                    objects = Object.objects.filter(pk__in=hit_ids)
+            elif search_engine == 'db':
+                objects = dbsearch.search(query)
+            else:
+                raise RuntimeError('Unknown Search engine: %s' % search_engine)
+
+    return render_to_response('core/search/query_view',
+                              {'query': query, 'objects': objects},
+                              context_instance=RequestContext(request),
+                              response_format=response_format)
diff --git a/data/treeio/treeio/treeio/core/south_migrations/0002_auto__del_notification__add_comment__add_tag__add_revisionfield__add_r.py b/data/treeio/treeio/treeio/core/south_migrations/0002_auto__del_notification__add_comment__add_tag__add_revisionfield__add_r.py
new file mode 100644
index 0000000..358fd08
--- /dev/null
+++ b/data/treeio/treeio/treeio/core/south_migrations/0002_auto__del_notification__add_comment__add_tag__add_revisionfield__add_r.py
@@ -0,0 +1,719 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Deleting model 'Notification'
+        db.delete_table('core_notification')
+
+        # Adding model 'Comment'
+        db.create_table('core_comment', (
+            ('id', self.gf('django.db.models.fields.AutoField')
+             (primary_key=True)),
+            ('author', self.gf('django.db.models.fields.related.ForeignKey')
+             (to=orm['core.User'], null=True, blank=True)),
+            ('body', self.gf('django.db.models.fields.TextField')
+             (null=True, blank=True)),
+            ('date_created', self.gf('django.db.models.fields.DateTimeField')
+             (default=datetime.datetime.now)),
+        ))
+        db.send_create_signal('core', ['Comment'])
+
+        # Adding M2M table for field likes on 'Comment'
+        db.create_table('core_comment_likes', (
+            ('id', models.AutoField(
+                verbose_name='ID', primary_key=True, auto_created=True)),
+            ('comment', models.ForeignKey(orm['core.comment'], null=False)),
+            ('user', models.ForeignKey(orm['core.user'], null=False))
+        ))
+        db.create_unique('core_comment_likes', ['comment_id', 'user_id'])
+
+        # Adding M2M table for field dislikes on 'Comment'
+        db.create_table('core_comment_dislikes', (
+            ('id', models.AutoField(
+                verbose_name='ID', primary_key=True, auto_created=True)),
+            ('comment', models.ForeignKey(orm['core.comment'], null=False)),
+            ('user', models.ForeignKey(orm['core.user'], null=False))
+        ))
+        db.create_unique('core_comment_dislikes', ['comment_id', 'user_id'])
+
+        # Adding model 'Tag'
+        db.create_table('core_tag', (
+            ('id', self.gf('django.db.models.fields.AutoField')
+             (primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')
+             (max_length=512)),
+            ('date_created', self.gf('django.db.models.fields.DateTimeField')
+             (default=datetime.datetime.now)),
+        ))
+        db.send_create_signal('core', ['Tag'])
+
+        # Adding model 'RevisionField'
+        db.create_table('core_revisionfield', (
+            ('id', self.gf('django.db.models.fields.AutoField')
+             (primary_key=True)),
+            ('revision', self.gf('django.db.models.fields.related.ForeignKey')
+             (to=orm['core.Revision'])),
+            ('field_type', self.gf('django.db.models.fields.CharField')
+             (max_length=512, null=True, blank=True)),
+            ('field', self.gf('django.db.models.fields.CharField')
+             (max_length=512, null=True, blank=True)),
+            ('value', self.gf('django.db.models.fields.TextField')
+             (null=True, blank=True)),
+            ('value_key', self.gf('django.db.models.fields.related.ForeignKey')(
+                blank=True, related_name='revisionfield_key', null=True, to=orm['core.Object'])),
+            ('value_key_acc', self.gf('django.db.models.fields.related.ForeignKey')(
+                blank=True, related_name='revisionfield_key_acc', null=True, to=orm['core.AccessEntity'])),
+        ))
+        db.send_create_signal('core', ['RevisionField'])
+
+        # Adding M2M table for field value_m2m on 'RevisionField'
+        db.create_table('core_revisionfield_value_m2m', (
+            ('id', models.AutoField(
+                verbose_name='ID', primary_key=True, auto_created=True)),
+            ('revisionfield', models.ForeignKey(
+                orm['core.revisionfield'], null=False)),
+            ('object', models.ForeignKey(orm['core.object'], null=False))
+        ))
+        db.create_unique(
+            'core_revisionfield_value_m2m', ['revisionfield_id', 'object_id'])
+
+        # Adding M2M table for field value_m2m_acc on 'RevisionField'
+        db.create_table('core_revisionfield_value_m2m_acc', (
+            ('id', models.AutoField(
+                verbose_name='ID', primary_key=True, auto_created=True)),
+            ('revisionfield', models.ForeignKey(
+                orm['core.revisionfield'], null=False)),
+            ('accessentity', models.ForeignKey(
+                orm['core.accessentity'], null=False))
+        ))
+        db.create_unique(
+            'core_revisionfield_value_m2m_acc', ['revisionfield_id', 'accessentity_id'])
+
+        # Adding model 'Revision'
+        db.create_table('core_revision', (
+            ('id', self.gf('django.db.models.fields.AutoField')
+             (primary_key=True)),
+            ('previous', self.gf('django.db.models.fields.related.OneToOneField')(
+                blank=True, related_name='next_set', unique=True, null=True, to=orm['core.Revision'])),
+            ('object', self.gf('django.db.models.fields.related.ForeignKey')
+             (to=orm['core.Object'])),
+            ('change_type', self.gf('django.db.models.fields.CharField')
+             (max_length=512, null=True, blank=True)),
+            ('date_created', self.gf('django.db.models.fields.DateTimeField')
+             (default=datetime.datetime.now)),
+        ))
+        db.send_create_signal('core', ['Revision'])
+
+        # Adding model 'Invitation'
+        db.create_table('core_invitation', (
+            ('id', self.gf('django.db.models.fields.AutoField')
+             (primary_key=True)),
+            ('email', self.gf('django.db.models.fields.EmailField')
+             (max_length=75)),
+            ('key', self.gf('django.db.models.fields.CharField')
+             (max_length=256)),
+            ('sender', self.gf('django.db.models.fields.related.ForeignKey')
+             (to=orm['core.User'], null=True, blank=True)),
+            ('default_group', self.gf('django.db.models.fields.related.ForeignKey')(
+                to=orm['core.Group'], null=True, blank=True)),
+            ('date_created', self.gf('django.db.models.fields.DateTimeField')
+             (default=datetime.datetime.now)),
+        ))
+        db.send_create_signal('core', ['Invitation'])
+
+        # Adding model 'AccessEntity'
+        db.create_table('core_accessentity', (
+            ('id', self.gf('django.db.models.fields.AutoField')
+             (primary_key=True)),
+            ('last_updated', self.gf('django.db.models.fields.DateTimeField')
+             (auto_now=True, blank=True)),
+        ))
+        db.send_create_signal('core', ['AccessEntity'])
+
+        # Adding model 'UpdateRecord'
+        db.create_table('core_updaterecord', (
+            ('id', self.gf('django.db.models.fields.AutoField')
+             (primary_key=True)),
+            ('author', self.gf('django.db.models.fields.related.ForeignKey')(
+                blank=True, related_name='sent_updates', null=True, to=orm['core.User'])),
+            ('sender', self.gf('django.db.models.fields.related.ForeignKey')(
+                blank=True, related_name='sent_updates', null=True, to=orm['core.Object'])),
+            ('record_type', self.gf(
+                'django.db.models.fields.CharField')(max_length=32)),
+            ('url', self.gf('django.db.models.fields.CharField')
+             (max_length=512, null=True, blank=True)),
+            ('body', self.gf('django.db.models.fields.TextField')
+             (default='', null=True, blank=True)),
+            ('score', self.gf(
+                'django.db.models.fields.IntegerField')(default=0)),
+            ('format_message', self.gf('django.db.models.fields.TextField')
+             (null=True, blank=True)),
+            ('format_strings', self.gf('django.db.models.fields.TextField')
+             (null=True, blank=True)),
+            ('date_created', self.gf('django.db.models.fields.DateTimeField')
+             (default=datetime.datetime.now)),
+        ))
+        db.send_create_signal('core', ['UpdateRecord'])
+
+        # Adding M2M table for field about on 'UpdateRecord'
+        db.create_table('core_updaterecord_about', (
+            ('id', models.AutoField(
+                verbose_name='ID', primary_key=True, auto_created=True)),
+            ('updaterecord', models.ForeignKey(
+                orm['core.updaterecord'], null=False)),
+            ('object', models.ForeignKey(orm['core.object'], null=False))
+        ))
+        db.create_unique(
+            'core_updaterecord_about', ['updaterecord_id', 'object_id'])
+
+        # Adding M2M table for field recipients on 'UpdateRecord'
+        db.create_table('core_updaterecord_recipients', (
+            ('id', models.AutoField(
+                verbose_name='ID', primary_key=True, auto_created=True)),
+            ('updaterecord', models.ForeignKey(
+                orm['core.updaterecord'], null=False)),
+            ('accessentity', models.ForeignKey(
+                orm['core.accessentity'], null=False))
+        ))
+        db.create_unique(
+            'core_updaterecord_recipients', ['updaterecord_id', 'accessentity_id'])
+
+        # Adding M2M table for field comments on 'UpdateRecord'
+        db.create_table('core_updaterecord_comments', (
+            ('id', models.AutoField(
+                verbose_name='ID', primary_key=True, auto_created=True)),
+            ('updaterecord', models.ForeignKey(
+                orm['core.updaterecord'], null=False)),
+            ('comment', models.ForeignKey(orm['core.comment'], null=False))
+        ))
+        db.create_unique(
+            'core_updaterecord_comments', ['updaterecord_id', 'comment_id'])
+
+        # Adding M2M table for field likes on 'UpdateRecord'
+        db.create_table('core_updaterecord_likes', (
+            ('id', models.AutoField(
+                verbose_name='ID', primary_key=True, auto_created=True)),
+            ('updaterecord', models.ForeignKey(
+                orm['core.updaterecord'], null=False)),
+            ('user', models.ForeignKey(orm['core.user'], null=False))
+        ))
+        db.create_unique(
+            'core_updaterecord_likes', ['updaterecord_id', 'user_id'])
+
+        # Adding M2M table for field dislikes on 'UpdateRecord'
+        db.create_table('core_updaterecord_dislikes', (
+            ('id', models.AutoField(
+                verbose_name='ID', primary_key=True, auto_created=True)),
+            ('updaterecord', models.ForeignKey(
+                orm['core.updaterecord'], null=False)),
+            ('user', models.ForeignKey(orm['core.user'], null=False))
+        ))
+        db.create_unique(
+            'core_updaterecord_dislikes', ['updaterecord_id', 'user_id'])
+
+        # Deleting field 'Group.last_updated'
+        db.delete_column('core_group', 'last_updated')
+
+        # Adding field 'Group.accessentity_ptr'
+        db.add_column('core_group', 'accessentity_ptr', self.gf('django.db.models.fields.related.OneToOneField')(
+            to=orm['core.AccessEntity'], unique=True, null=True, blank=True), keep_default=False)
+
+        # Deleting field 'Object.group_read'
+        db.delete_column('core_object', 'group_read')
+
+        # Deleting field 'Object.user_write'
+        db.delete_column('core_object', 'user_write')
+
+        # Deleting field 'Object.group'
+        db.delete_column('core_object', 'group_id')
+
+        # Deleting field 'Object.everybody_execute'
+        db.delete_column('core_object', 'everybody_execute')
+
+        # Deleting field 'Object.user_execute'
+        db.delete_column('core_object', 'user_execute')
+
+        # Deleting field 'Object.user_read'
+        db.delete_column('core_object', 'user_read')
+
+        # Deleting field 'Object.everybody_write'
+        db.delete_column('core_object', 'everybody_write')
+
+        # Deleting field 'Object.group_write'
+        db.delete_column('core_object', 'group_write')
+
+        # Deleting field 'Object.group_execute'
+        db.delete_column('core_object', 'group_execute')
+
+        # Deleting field 'Object.everybody_read'
+        db.delete_column('core_object', 'everybody_read')
+
+        # Adding field 'Object.creator'
+        db.add_column('core_object', 'creator', self.gf('django.db.models.fields.related.ForeignKey')(
+            blank=True, related_name='objects_created', null=True, to=orm['core.User']), keep_default=False)
+
+        # Adding M2M table for field read_access on 'Object'
+        db.create_table('core_object_read_access', (
+            ('id', models.AutoField(
+                verbose_name='ID', primary_key=True, auto_created=True)),
+            ('object', models.ForeignKey(orm['core.object'], null=False)),
+            ('accessentity', models.ForeignKey(
+                orm['core.accessentity'], null=False))
+        ))
+        db.create_unique(
+            'core_object_read_access', ['object_id', 'accessentity_id'])
+
+        # Adding M2M table for field full_access on 'Object'
+        db.create_table('core_object_full_access', (
+            ('id', models.AutoField(
+                verbose_name='ID', primary_key=True, auto_created=True)),
+            ('object', models.ForeignKey(orm['core.object'], null=False)),
+            ('accessentity', models.ForeignKey(
+                orm['core.accessentity'], null=False))
+        ))
+        db.create_unique(
+            'core_object_full_access', ['object_id', 'accessentity_id'])
+
+        # Adding M2M table for field tags on 'Object'
+        db.create_table('core_object_tags', (
+            ('id', models.AutoField(
+                verbose_name='ID', primary_key=True, auto_created=True)),
+            ('object', models.ForeignKey(orm['core.object'], null=False)),
+            ('tag', models.ForeignKey(orm['core.tag'], null=False))
+        ))
+        db.create_unique('core_object_tags', ['object_id', 'tag_id'])
+
+        # Adding M2M table for field comments on 'Object'
+        db.create_table('core_object_comments', (
+            ('id', models.AutoField(
+                verbose_name='ID', primary_key=True, auto_created=True)),
+            ('object', models.ForeignKey(orm['core.object'], null=False)),
+            ('comment', models.ForeignKey(orm['core.comment'], null=False))
+        ))
+        db.create_unique('core_object_comments', ['object_id', 'comment_id'])
+
+        # Adding M2M table for field likes on 'Object'
+        db.create_table('core_object_likes', (
+            ('id', models.AutoField(
+                verbose_name='ID', primary_key=True, auto_created=True)),
+            ('object', models.ForeignKey(orm['core.object'], null=False)),
+            ('user', models.ForeignKey(orm['core.user'], null=False))
+        ))
+        db.create_unique('core_object_likes', ['object_id', 'user_id'])
+
+        # Adding M2M table for field dislikes on 'Object'
+        db.create_table('core_object_dislikes', (
+            ('id', models.AutoField(
+                verbose_name='ID', primary_key=True, auto_created=True)),
+            ('object', models.ForeignKey(orm['core.object'], null=False)),
+            ('user', models.ForeignKey(orm['core.user'], null=False))
+        ))
+        db.create_unique('core_object_dislikes', ['object_id', 'user_id'])
+
+        # Changing field 'Object.user'
+        db.alter_column('core_object', 'user_id', self.gf(
+            'django.db.models.fields.related.ForeignKey')(to=orm['core.User'], null=True))
+
+        # Deleting field 'User.last_updated'
+        db.delete_column('core_user', 'last_updated')
+
+        # Adding field 'User.accessentity_ptr'
+        db.add_column('core_user', 'accessentity_ptr', self.gf('django.db.models.fields.related.OneToOneField')(
+            to=orm['core.AccessEntity'], unique=True, null=True, blank=True), keep_default=False)
+
+        # Adding field 'User.disabled'
+        db.add_column('core_user', 'disabled', self.gf(
+            'django.db.models.fields.BooleanField')(default=False), keep_default=False)
+
+        # Adding field 'User.last_access'
+        db.add_column('core_user', 'last_access', self.gf('django.db.models.fields.DateTimeField')(
+            default=datetime.datetime.now), keep_default=False)
+
+        # Changing field 'User.default_group'
+        db.alter_column('core_user', 'default_group_id', self.gf(
+            'django.db.models.fields.related.ForeignKey')(null=True, to=orm['core.AccessEntity']))
+
+    def backwards(self, orm):
+
+        # Adding model 'Notification'
+        db.create_table('core_notification', (
+            ('object', self.gf('django.db.models.fields.related.ForeignKey')
+             (to=orm['core.Object'], null=True, blank=True)),
+            ('format_strings', self.gf('django.db.models.fields.TextField')
+             (null=True, blank=True)),
+            ('object_type', self.gf('django.db.models.fields.CharField')
+             (max_length=512, null=True, blank=True)),
+            ('user', self.gf('django.db.models.fields.related.ForeignKey')
+             (to=orm['core.User'])),
+            ('message', self.gf('django.db.models.fields.TextField')
+             (null=True, blank=True)),
+            ('id', self.gf('django.db.models.fields.AutoField')
+             (primary_key=True)),
+            ('format_message', self.gf('django.db.models.fields.TextField')
+             (null=True, blank=True)),
+            ('sender', self.gf('django.db.models.fields.related.ForeignKey')(
+                related_name='notification_sent_set', null=True, to=orm['core.User'], blank=True)),
+            ('url', self.gf('django.db.models.fields.CharField')
+             (max_length=512, null=True, blank=True)),
+            ('date_created', self.gf('django.db.models.fields.DateTimeField')
+             (auto_now=True, blank=True)),
+            ('type', self.gf('django.db.models.fields.CharField')
+             (max_length=32)),
+        ))
+        db.send_create_signal('core', ['Notification'])
+
+        # Deleting model 'Comment'
+        db.delete_table('core_comment')
+
+        # Removing M2M table for field likes on 'Comment'
+        db.delete_table('core_comment_likes')
+
+        # Removing M2M table for field dislikes on 'Comment'
+        db.delete_table('core_comment_dislikes')
+
+        # Deleting model 'Tag'
+        db.delete_table('core_tag')
+
+        # Deleting model 'RevisionField'
+        db.delete_table('core_revisionfield')
+
+        # Removing M2M table for field value_m2m on 'RevisionField'
+        db.delete_table('core_revisionfield_value_m2m')
+
+        # Removing M2M table for field value_m2m_acc on 'RevisionField'
+        db.delete_table('core_revisionfield_value_m2m_acc')
+
+        # Deleting model 'Revision'
+        db.delete_table('core_revision')
+
+        # Deleting model 'Invitation'
+        db.delete_table('core_invitation')
+
+        # Deleting model 'AccessEntity'
+        db.delete_table('core_accessentity')
+
+        # Deleting model 'UpdateRecord'
+        db.delete_table('core_updaterecord')
+
+        # Removing M2M table for field about on 'UpdateRecord'
+        db.delete_table('core_updaterecord_about')
+
+        # Removing M2M table for field recipients on 'UpdateRecord'
+        db.delete_table('core_updaterecord_recipients')
+
+        # Removing M2M table for field comments on 'UpdateRecord'
+        db.delete_table('core_updaterecord_comments')
+
+        # Removing M2M table for field likes on 'UpdateRecord'
+        db.delete_table('core_updaterecord_likes')
+
+        # Removing M2M table for field dislikes on 'UpdateRecord'
+        db.delete_table('core_updaterecord_dislikes')
+
+        # User chose to not deal with backwards NULL issues for
+        # 'Group.last_updated'
+        raise RuntimeError(
+            "Cannot reverse this migration. 'Group.last_updated' and its values cannot be restored.")
+
+        # Deleting field 'Group.accessentity_ptr'
+        db.delete_column('core_group', 'accessentity_ptr_id')
+
+        # Adding field 'Object.group_read'
+        db.add_column('core_object', 'group_read', self.gf(
+            'django.db.models.fields.BooleanField')(default=False), keep_default=False)
+
+        # Adding field 'Object.user_write'
+        db.add_column('core_object', 'user_write', self.gf(
+            'django.db.models.fields.BooleanField')(default=False), keep_default=False)
+
+        # User chose to not deal with backwards NULL issues for 'Object.group'
+        raise RuntimeError(
+            "Cannot reverse this migration. 'Object.group' and its values cannot be restored.")
+
+        # Adding field 'Object.everybody_execute'
+        db.add_column('core_object', 'everybody_execute', self.gf(
+            'django.db.models.fields.BooleanField')(default=False), keep_default=False)
+
+        # Adding field 'Object.user_execute'
+        db.add_column('core_object', 'user_execute', self.gf(
+            'django.db.models.fields.BooleanField')(default=False), keep_default=False)
+
+        # Adding field 'Object.user_read'
+        db.add_column('core_object', 'user_read', self.gf(
+            'django.db.models.fields.BooleanField')(default=False), keep_default=False)
+
+        # Adding field 'Object.everybody_write'
+        db.add_column('core_object', 'everybody_write', self.gf(
+            'django.db.models.fields.BooleanField')(default=False), keep_default=False)
+
+        # Adding field 'Object.group_write'
+        db.add_column('core_object', 'group_write', self.gf(
+            'django.db.models.fields.BooleanField')(default=False), keep_default=False)
+
+        # Adding field 'Object.group_execute'
+        db.add_column('core_object', 'group_execute', self.gf(
+            'django.db.models.fields.BooleanField')(default=False), keep_default=False)
+
+        # Adding field 'Object.everybody_read'
+        db.add_column('core_object', 'everybody_read', self.gf(
+            'django.db.models.fields.BooleanField')(default=False), keep_default=False)
+
+        # Deleting field 'Object.creator'
+        db.delete_column('core_object', 'creator_id')
+
+        # Removing M2M table for field read_access on 'Object'
+        db.delete_table('core_object_read_access')
+
+        # Removing M2M table for field full_access on 'Object'
+        db.delete_table('core_object_full_access')
+
+        # Removing M2M table for field tags on 'Object'
+        db.delete_table('core_object_tags')
+
+        # Removing M2M table for field comments on 'Object'
+        db.delete_table('core_object_comments')
+
+        # Removing M2M table for field likes on 'Object'
+        db.delete_table('core_object_likes')
+
+        # Removing M2M table for field dislikes on 'Object'
+        db.delete_table('core_object_dislikes')
+
+        # User chose to not deal with backwards NULL issues for 'Object.user'
+        raise RuntimeError(
+            "Cannot reverse this migration. 'Object.user' and its values cannot be restored.")
+
+        # User chose to not deal with backwards NULL issues for
+        # 'User.last_updated'
+        raise RuntimeError(
+            "Cannot reverse this migration. 'User.last_updated' and its values cannot be restored.")
+
+        # Deleting field 'User.accessentity_ptr'
+        db.delete_column('core_user', 'accessentity_ptr_id')
+
+        # Deleting field 'User.disabled'
+        db.delete_column('core_user', 'disabled')
+
+        # Deleting field 'User.last_access'
+        db.delete_column('core_user', 'last_access')
+
+        # Changing field 'User.default_group'
+        db.alter_column('core_user', 'default_group_id', self.gf(
+            'django.db.models.fields.related.ForeignKey')(null=True, to=orm['core.Group']))
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'core.accessentity': {
+            'Meta': {'object_name': 'AccessEntity'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        },
+        'core.comment': {
+            'Meta': {'object_name': 'Comment'},
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'}),
+            'body': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"})
+        },
+        'core.group': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Group'},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['core.Group']"})
+        },
+        'core.invitation': {
+            'Meta': {'object_name': 'Invitation'},
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'default_group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'key': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'sender': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'})
+        },
+        'core.location': {
+            'Meta': {'object_name': 'Location', '_ormbases': ['core.Object']},
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['core.Location']"})
+        },
+        'core.module': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Module', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'display': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'system': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'url': ('django.db.models.fields.CharField', [], {'max_length': '512'})
+        },
+        'core.modulesetting': {
+            'Meta': {'object_name': 'ModuleSetting'},
+            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'module': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Module']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'perspective': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Perspective']", 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'}),
+            'value': ('django.db.models.fields.TextField', [], {})
+        },
+        'core.object': {
+            'Meta': {'object_name': 'Object'},
+            'comments': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.Comment']"}),
+            'creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'objects_created'", 'null': 'True', 'to': "orm['core.User']"}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'full_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_full_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'links': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'links_rel_+'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'nuvius_resource': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'object_name': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'object_type': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'read_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_read_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'subscribers': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'subscriptions'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Tag']", 'null': 'True', 'blank': 'True'}),
+            'trash': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'})
+        },
+        'core.page': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Page', '_ormbases': ['core.Object']},
+            'body': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'folder': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.PageFolder']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'published': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '256'})
+        },
+        'core.pagefolder': {
+            'Meta': {'object_name': 'PageFolder', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'core.perspective': {
+            'Meta': {'object_name': 'Perspective', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'modules': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Module']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'core.revision': {
+            'Meta': {'object_name': 'Revision'},
+            'change_type': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'object': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Object']"}),
+            'previous': ('django.db.models.fields.related.OneToOneField', [], {'blank': 'True', 'related_name': "'next_set'", 'unique': 'True', 'null': 'True', 'to': "orm['core.Revision']"})
+        },
+        'core.revisionfield': {
+            'Meta': {'object_name': 'RevisionField'},
+            'field': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'field_type': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'revision': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Revision']"}),
+            'value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'value_key': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'revisionfield_key'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'value_key_acc': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'revisionfield_key_acc'", 'null': 'True', 'to': "orm['core.AccessEntity']"}),
+            'value_m2m': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'revisionfield_m2m'", 'symmetrical': 'False', 'to': "orm['core.Object']"}),
+            'value_m2m_acc': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'revisionfield_m2m_acc'", 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"})
+        },
+        'core.tag': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Tag'},
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'})
+        },
+        'core.updaterecord': {
+            'Meta': {'ordering': "['-date_created']", 'object_name': 'UpdateRecord'},
+            'about': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'updates'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.Object']"}),
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'sent_updates'", 'null': 'True', 'to': "orm['core.User']"}),
+            'body': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
+            'comments': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_on_updates'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.Comment']"}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'updates_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'format_message': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'format_strings': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'updates_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'recipients': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'received_updates'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'record_type': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
+            'score': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'sender': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'sent_updates'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'url': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'})
+        },
+        'core.user': {
+            'Meta': {'ordering': "['name']", 'object_name': 'User'},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'default_group': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'default_user_set'", 'null': 'True', 'to': "orm['core.AccessEntity']"}),
+            'disabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_access': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'other_groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'core.widget': {
+            'Meta': {'ordering': "['weight']", 'object_name': 'Widget'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'module_name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'perspective': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Perspective']"}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']"}),
+            'weight': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'widget_name': ('django.db.models.fields.CharField', [], {'max_length': '256'})
+        }
+    }
+
+    complete_apps = ['core']
diff --git a/data/treeio/treeio/treeio/core/south_migrations/0003_treeiocore.py b/data/treeio/treeio/treeio/core/south_migrations/0003_treeiocore.py
new file mode 100644
index 0000000..b83b7f7
--- /dev/null
+++ b/data/treeio/treeio/treeio/core/south_migrations/0003_treeiocore.py
@@ -0,0 +1,245 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import DataMigration
+from django.db import models
+from treeio.core.models import Object
+
+
+class Migration(DataMigration):
+
+    def forwards(self, orm):
+        "Migrate the Users and Groups so they extend AccessEntity"
+        for user in orm['core.User'].objects.all():
+            entity = orm['core.AccessEntity'].objects.create()
+            entity.id = user.id
+            entity.save()
+            user.accessentity_ptr = entity
+            user.save()
+        for group in orm['core.Group'].objects.all():
+            group.accessentity_ptr = orm['core.AccessEntity'].objects.create()
+            group.accessentity_ptr.save()
+            if group.parent:
+                parent = orm['core.Group'].objects.get(id=group.parent_id)
+                group.parent_id = parent.accessentity_ptr_id
+            group.save()
+        for user in orm['core.User'].objects.all():
+            group = orm['core.Group'].objects.get(pk=user.default_group_id)
+            user.default_group = group.accessentity_ptr
+            user.save()
+        for obj in orm['core.Object'].objects.all():
+            obj.creator = obj.user
+            obj.save()
+
+    def backwards(self, orm):
+        raise RuntimeError("Cannot reverse this migration.")
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'core.accessentity': {
+            'Meta': {'object_name': 'AccessEntity'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        },
+        'core.comment': {
+            'Meta': {'object_name': 'Comment'},
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'}),
+            'body': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"})
+        },
+        'core.group': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Group'},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['core.Group']"})
+        },
+        'core.invitation': {
+            'Meta': {'object_name': 'Invitation'},
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'default_group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'key': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'sender': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'})
+        },
+        'core.location': {
+            'Meta': {'object_name': 'Location', '_ormbases': ['core.Object']},
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['core.Location']"})
+        },
+        'core.module': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Module', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'display': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'system': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'url': ('django.db.models.fields.CharField', [], {'max_length': '512'})
+        },
+        'core.modulesetting': {
+            'Meta': {'object_name': 'ModuleSetting'},
+            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'module': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Module']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'perspective': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Perspective']", 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'}),
+            'value': ('django.db.models.fields.TextField', [], {})
+        },
+        'core.object': {
+            'Meta': {'object_name': 'Object'},
+            'comments': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.Comment']"}),
+            'creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'objects_created'", 'null': 'True', 'to': "orm['core.User']"}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'objects_created'", 'null': 'True', 'to': "orm['core.User']"}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'full_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_full_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'links': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'links_rel_+'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'nuvius_resource': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'object_name': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'object_type': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'read_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_read_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'subscribers': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'subscriptions'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Tag']", 'null': 'True', 'blank': 'True'}),
+            'trash': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'core.page': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Page', '_ormbases': ['core.Object']},
+            'body': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'folder': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.PageFolder']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'published': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '256'})
+        },
+        'core.pagefolder': {
+            'Meta': {'object_name': 'PageFolder', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'core.perspective': {
+            'Meta': {'object_name': 'Perspective', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'modules': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Module']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'core.revision': {
+            'Meta': {'object_name': 'Revision'},
+            'change_type': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'object': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Object']"}),
+            'previous': ('django.db.models.fields.related.OneToOneField', [], {'blank': 'True', 'related_name': "'next_set'", 'unique': 'True', 'null': 'True', 'to': "orm['core.Revision']"})
+        },
+        'core.revisionfield': {
+            'Meta': {'object_name': 'RevisionField'},
+            'field': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'field_type': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'revision': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Revision']"}),
+            'value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'value_key': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'revisionfield_key'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'value_key_acc': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'revisionfield_key_acc'", 'null': 'True', 'to': "orm['core.AccessEntity']"}),
+            'value_m2m': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'revisionfield_m2m'", 'symmetrical': 'False', 'to': "orm['core.Object']"}),
+            'value_m2m_acc': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'revisionfield_m2m_acc'", 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"})
+        },
+        'core.tag': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Tag'},
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'})
+        },
+        'core.updaterecord': {
+            'Meta': {'ordering': "['-date_created']", 'object_name': 'UpdateRecord'},
+            'about': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'updates'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.Object']"}),
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'sent_updates'", 'null': 'True', 'to': "orm['core.User']"}),
+            'body': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
+            'comments': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_on_updates'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.Comment']"}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'updates_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'format_message': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'format_strings': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'updates_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'recipients': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'received_updates'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'record_type': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
+            'score': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'sender': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'sent_updates'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'url': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'})
+        },
+        'core.user': {
+            'Meta': {'ordering': "['name']", 'object_name': 'User'},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'default_group': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'default_user_set'", 'null': 'True', 'to': "orm['core.AccessEntity']"}),
+            'disabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_access': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'other_groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'core.widget': {
+            'Meta': {'ordering': "['weight']", 'object_name': 'Widget'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'module_name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'perspective': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Perspective']"}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']"}),
+            'weight': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'widget_name': ('django.db.models.fields.CharField', [], {'max_length': '256'})
+        }
+    }
+
+    complete_apps = ['core']
diff --git a/data/treeio/treeio/treeio/core/south_migrations/0004_auto__del_field_object_user.py b/data/treeio/treeio/treeio/core/south_migrations/0004_auto__del_field_object_user.py
new file mode 100644
index 0000000..581dcfb
--- /dev/null
+++ b/data/treeio/treeio/treeio/core/south_migrations/0004_auto__del_field_object_user.py
@@ -0,0 +1,228 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Deleting field 'Object.user'
+        db.delete_column('core_object', 'user_id')
+
+    def backwards(self, orm):
+
+        # Adding field 'Object.user'
+        db.add_column('core_object', 'user', self.gf('django.db.models.fields.related.ForeignKey')(
+            related_name='objects_created', null=True, to=orm['core.User'], blank=True), keep_default=False)
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'core.accessentity': {
+            'Meta': {'object_name': 'AccessEntity'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        },
+        'core.comment': {
+            'Meta': {'object_name': 'Comment'},
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'}),
+            'body': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"})
+        },
+        'core.group': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Group'},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['core.Group']"})
+        },
+        'core.invitation': {
+            'Meta': {'object_name': 'Invitation'},
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'default_group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'key': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'sender': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'})
+        },
+        'core.location': {
+            'Meta': {'object_name': 'Location', '_ormbases': ['core.Object']},
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['core.Location']"})
+        },
+        'core.module': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Module', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'display': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'system': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'url': ('django.db.models.fields.CharField', [], {'max_length': '512'})
+        },
+        'core.modulesetting': {
+            'Meta': {'object_name': 'ModuleSetting'},
+            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'module': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Module']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'perspective': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Perspective']", 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'}),
+            'value': ('django.db.models.fields.TextField', [], {})
+        },
+        'core.object': {
+            'Meta': {'object_name': 'Object'},
+            'comments': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.Comment']"}),
+            'creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'objects_created'", 'null': 'True', 'to': "orm['core.User']"}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'full_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_full_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'links': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'links_rel_+'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'nuvius_resource': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'object_name': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'object_type': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'read_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_read_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'subscribers': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'subscriptions'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Tag']", 'null': 'True', 'blank': 'True'}),
+            'trash': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'core.page': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Page', '_ormbases': ['core.Object']},
+            'body': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'folder': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.PageFolder']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'published': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '256'})
+        },
+        'core.pagefolder': {
+            'Meta': {'object_name': 'PageFolder', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'core.perspective': {
+            'Meta': {'object_name': 'Perspective', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'modules': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Module']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'core.revision': {
+            'Meta': {'object_name': 'Revision'},
+            'change_type': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'object': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Object']"}),
+            'previous': ('django.db.models.fields.related.OneToOneField', [], {'blank': 'True', 'related_name': "'next_set'", 'unique': 'True', 'null': 'True', 'to': "orm['core.Revision']"})
+        },
+        'core.revisionfield': {
+            'Meta': {'object_name': 'RevisionField'},
+            'field': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'field_type': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'revision': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Revision']"}),
+            'value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'value_key': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'revisionfield_key'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'value_key_acc': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'revisionfield_key_acc'", 'null': 'True', 'to': "orm['core.AccessEntity']"}),
+            'value_m2m': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'revisionfield_m2m'", 'symmetrical': 'False', 'to': "orm['core.Object']"}),
+            'value_m2m_acc': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'revisionfield_m2m_acc'", 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"})
+        },
+        'core.tag': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Tag'},
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'})
+        },
+        'core.updaterecord': {
+            'Meta': {'ordering': "['-date_created']", 'object_name': 'UpdateRecord'},
+            'about': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'updates'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.Object']"}),
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'sent_updates'", 'null': 'True', 'to': "orm['core.User']"}),
+            'body': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
+            'comments': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_on_updates'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.Comment']"}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'updates_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'format_message': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'format_strings': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'updates_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'recipients': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'received_updates'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'record_type': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
+            'score': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'sender': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'sent_updates'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'url': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'})
+        },
+        'core.user': {
+            'Meta': {'ordering': "['name']", 'object_name': 'User'},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'default_group': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'default_user_set'", 'null': 'True', 'to': "orm['core.AccessEntity']"}),
+            'disabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_access': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'other_groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'core.widget': {
+            'Meta': {'ordering': "['weight']", 'object_name': 'Widget'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'module_name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'perspective': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Perspective']"}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']"}),
+            'weight': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'widget_name': ('django.db.models.fields.CharField', [], {'max_length': '256'})
+        }
+    }
+
+    complete_apps = ['core']
diff --git a/data/treeio/treeio/treeio/core/south_migrations/0005_auto__del_field_group_id__chg_field_group_accessentity_ptr__del_field_.py b/data/treeio/treeio/treeio/core/south_migrations/0005_auto__del_field_group_id__chg_field_group_accessentity_ptr__del_field_.py
new file mode 100644
index 0000000..e7b5023
--- /dev/null
+++ b/data/treeio/treeio/treeio/core/south_migrations/0005_auto__del_field_group_id__chg_field_group_accessentity_ptr__del_field_.py
@@ -0,0 +1,257 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Deleting field 'Group.id'
+        db.delete_column('core_group', 'id')
+
+        # Changing field 'Group.accessentity_ptr'
+        db.alter_column('core_group', 'accessentity_ptr_id', self.gf('django.db.models.fields.related.OneToOneField')(
+            default=1, to=orm['core.AccessEntity'], unique=True, primary_key=True))
+
+        # Deleting field 'User.id'
+        db.delete_column('core_user', 'id')
+
+        # Changing field 'User.default_group'
+        db.alter_column('core_user', 'default_group_id', self.gf(
+            'django.db.models.fields.related.ForeignKey')(null=True, to=orm['core.Group']))
+
+        # Changing field 'User.accessentity_ptr'
+        db.alter_column('core_user', 'accessentity_ptr_id', self.gf('django.db.models.fields.related.OneToOneField')(
+            default=1, to=orm['core.AccessEntity'], unique=True, primary_key=True))
+
+    def backwards(self, orm):
+
+        # User chose to not deal with backwards NULL issues for 'Group.id'
+        raise RuntimeError(
+            "Cannot reverse this migration. 'Group.id' and its values cannot be restored.")
+
+        # Changing field 'Group.accessentity_ptr'
+        db.alter_column('core_group', 'accessentity_ptr_id', self.gf(
+            'django.db.models.fields.related.OneToOneField')(to=orm['core.AccessEntity'], unique=True, null=True))
+
+        # User chose to not deal with backwards NULL issues for 'User.id'
+        raise RuntimeError(
+            "Cannot reverse this migration. 'User.id' and its values cannot be restored.")
+
+        # Changing field 'User.default_group'
+        db.alter_column('core_user', 'default_group_id', self.gf(
+            'django.db.models.fields.related.ForeignKey')(null=True, to=orm['core.AccessEntity']))
+
+        # Changing field 'User.accessentity_ptr'
+        db.alter_column('core_user', 'accessentity_ptr_id', self.gf(
+            'django.db.models.fields.related.OneToOneField')(to=orm['core.AccessEntity'], unique=True, null=True))
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'core.accessentity': {
+            'Meta': {'object_name': 'AccessEntity'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        },
+        'core.comment': {
+            'Meta': {'object_name': 'Comment'},
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'}),
+            'body': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"})
+        },
+        'core.group': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Group', '_ormbases': ['core.AccessEntity']},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True', 'primary_key': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['core.Group']"})
+        },
+        'core.invitation': {
+            'Meta': {'object_name': 'Invitation'},
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'default_group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'key': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'sender': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'})
+        },
+        'core.location': {
+            'Meta': {'object_name': 'Location', '_ormbases': ['core.Object']},
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['core.Location']"})
+        },
+        'core.module': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Module', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'display': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'system': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'url': ('django.db.models.fields.CharField', [], {'max_length': '512'})
+        },
+        'core.modulesetting': {
+            'Meta': {'object_name': 'ModuleSetting'},
+            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'module': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Module']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'perspective': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Perspective']", 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'}),
+            'value': ('django.db.models.fields.TextField', [], {})
+        },
+        'core.object': {
+            'Meta': {'object_name': 'Object'},
+            'comments': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.Comment']"}),
+            'creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'objects_created'", 'null': 'True', 'to': "orm['core.User']"}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'full_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_full_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'links': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'links_rel_+'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'nuvius_resource': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'object_name': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'object_type': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'read_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_read_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'subscribers': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'subscriptions'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Tag']", 'null': 'True', 'blank': 'True'}),
+            'trash': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'core.page': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Page', '_ormbases': ['core.Object']},
+            'body': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'folder': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.PageFolder']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'published': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '256'})
+        },
+        'core.pagefolder': {
+            'Meta': {'object_name': 'PageFolder', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'core.perspective': {
+            'Meta': {'object_name': 'Perspective', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'modules': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Module']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'core.revision': {
+            'Meta': {'object_name': 'Revision'},
+            'change_type': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'object': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Object']"}),
+            'previous': ('django.db.models.fields.related.OneToOneField', [], {'blank': 'True', 'related_name': "'next_set'", 'unique': 'True', 'null': 'True', 'to': "orm['core.Revision']"})
+        },
+        'core.revisionfield': {
+            'Meta': {'object_name': 'RevisionField'},
+            'field': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'field_type': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'revision': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Revision']"}),
+            'value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'value_key': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'revisionfield_key'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'value_key_acc': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'revisionfield_key_acc'", 'null': 'True', 'to': "orm['core.AccessEntity']"}),
+            'value_m2m': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'revisionfield_m2m'", 'symmetrical': 'False', 'to': "orm['core.Object']"}),
+            'value_m2m_acc': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'revisionfield_m2m_acc'", 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"})
+        },
+        'core.tag': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Tag'},
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'})
+        },
+        'core.updaterecord': {
+            'Meta': {'ordering': "['-date_created']", 'object_name': 'UpdateRecord'},
+            'about': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'updates'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.Object']"}),
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'sent_updates'", 'null': 'True', 'to': "orm['core.User']"}),
+            'body': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
+            'comments': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_on_updates'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.Comment']"}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'updates_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'format_message': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'format_strings': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'updates_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'recipients': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'received_updates'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'record_type': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
+            'score': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'sender': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'sent_updates'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'url': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'})
+        },
+        'core.user': {
+            'Meta': {'ordering': "['name']", 'object_name': 'User', '_ormbases': ['core.AccessEntity']},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True', 'primary_key': 'True'}),
+            'default_group': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'default_user_set'", 'null': 'True', 'to': "orm['core.Group']"}),
+            'disabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_access': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'other_groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'core.widget': {
+            'Meta': {'ordering': "['weight']", 'object_name': 'Widget'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'module_name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'perspective': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Perspective']"}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']"}),
+            'weight': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'widget_name': ('django.db.models.fields.CharField', [], {'max_length': '256'})
+        }
+    }
+
+    complete_apps = ['core']
diff --git a/data/treeio/treeio/treeio/core/south_migrations/0006_auto__add_configsetting.py b/data/treeio/treeio/treeio/core/south_migrations/0006_auto__add_configsetting.py
new file mode 100644
index 0000000..143bf94
--- /dev/null
+++ b/data/treeio/treeio/treeio/core/south_migrations/0006_auto__add_configsetting.py
@@ -0,0 +1,242 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Adding model 'ConfigSetting'
+        db.create_table('core_configsetting', (
+            ('id', self.gf('django.db.models.fields.AutoField')
+             (primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')
+             (unique=True, max_length=255)),
+            ('value', self.gf('django.db.models.fields.TextField')
+             (null=True, blank=True)),
+            ('last_updated', self.gf('django.db.models.fields.DateTimeField')
+             (auto_now=True, blank=True)),
+        ))
+        db.send_create_signal('core', ['ConfigSetting'])
+
+    def backwards(self, orm):
+
+        # Deleting model 'ConfigSetting'
+        db.delete_table('core_configsetting')
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'core.accessentity': {
+            'Meta': {'object_name': 'AccessEntity'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        },
+        'core.comment': {
+            'Meta': {'object_name': 'Comment'},
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'}),
+            'body': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"})
+        },
+        'core.configsetting': {
+            'Meta': {'object_name': 'ConfigSetting'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
+            'value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'})
+        },
+        'core.group': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Group', '_ormbases': ['core.AccessEntity']},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True', 'primary_key': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['core.Group']"})
+        },
+        'core.invitation': {
+            'Meta': {'object_name': 'Invitation'},
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'default_group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'key': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'sender': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'})
+        },
+        'core.location': {
+            'Meta': {'object_name': 'Location', '_ormbases': ['core.Object']},
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['core.Location']"})
+        },
+        'core.module': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Module', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'display': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'system': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'url': ('django.db.models.fields.CharField', [], {'max_length': '512'})
+        },
+        'core.modulesetting': {
+            'Meta': {'object_name': 'ModuleSetting'},
+            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'module': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Module']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'perspective': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Perspective']", 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'}),
+            'value': ('django.db.models.fields.TextField', [], {})
+        },
+        'core.object': {
+            'Meta': {'object_name': 'Object'},
+            'comments': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.Comment']"}),
+            'creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'objects_created'", 'null': 'True', 'to': "orm['core.User']"}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'full_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_full_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'links': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'links_rel_+'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'nuvius_resource': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'object_name': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'object_type': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'read_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_read_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'subscribers': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'subscriptions'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Tag']", 'null': 'True', 'blank': 'True'}),
+            'trash': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'core.page': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Page', '_ormbases': ['core.Object']},
+            'body': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'folder': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.PageFolder']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'published': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '256'})
+        },
+        'core.pagefolder': {
+            'Meta': {'object_name': 'PageFolder', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'core.perspective': {
+            'Meta': {'object_name': 'Perspective', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'modules': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Module']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'core.revision': {
+            'Meta': {'object_name': 'Revision'},
+            'change_type': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'object': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Object']"}),
+            'previous': ('django.db.models.fields.related.OneToOneField', [], {'blank': 'True', 'related_name': "'next_set'", 'unique': 'True', 'null': 'True', 'to': "orm['core.Revision']"})
+        },
+        'core.revisionfield': {
+            'Meta': {'object_name': 'RevisionField'},
+            'field': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'field_type': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'revision': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Revision']"}),
+            'value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'value_key': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'revisionfield_key'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'value_key_acc': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'revisionfield_key_acc'", 'null': 'True', 'to': "orm['core.AccessEntity']"}),
+            'value_m2m': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'revisionfield_m2m'", 'symmetrical': 'False', 'to': "orm['core.Object']"}),
+            'value_m2m_acc': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'revisionfield_m2m_acc'", 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"})
+        },
+        'core.tag': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Tag'},
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'})
+        },
+        'core.updaterecord': {
+            'Meta': {'ordering': "['-date_created']", 'object_name': 'UpdateRecord'},
+            'about': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'updates'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.Object']"}),
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'sent_updates'", 'null': 'True', 'to': "orm['core.User']"}),
+            'body': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
+            'comments': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_on_updates'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.Comment']"}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'updates_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'format_message': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'format_strings': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'updates_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'recipients': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'received_updates'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'record_type': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
+            'score': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'sender': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'sent_updates'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'url': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'})
+        },
+        'core.user': {
+            'Meta': {'ordering': "['name']", 'object_name': 'User', '_ormbases': ['core.AccessEntity']},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True', 'primary_key': 'True'}),
+            'default_group': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'default_user_set'", 'null': 'True', 'to': "orm['core.Group']"}),
+            'disabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_access': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'other_groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'core.widget': {
+            'Meta': {'ordering': "['weight']", 'object_name': 'Widget'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'module_name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'perspective': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Perspective']"}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']"}),
+            'weight': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'widget_name': ('django.db.models.fields.CharField', [], {'max_length': '256'})
+        }
+    }
+
+    complete_apps = ['core']
diff --git a/data/treeio/treeio/treeio/core/south_migrations/0007_auto__add_attachment.py b/data/treeio/treeio/treeio/core/south_migrations/0007_auto__add_attachment.py
new file mode 100644
index 0000000..21dbec2
--- /dev/null
+++ b/data/treeio/treeio/treeio/core/south_migrations/0007_auto__add_attachment.py
@@ -0,0 +1,258 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Adding model 'Attachment'
+        db.create_table('core_attachment', (
+            ('id', self.gf('django.db.models.fields.AutoField')
+             (primary_key=True)),
+            ('attached_object', self.gf('django.db.models.fields.related.ForeignKey')(
+                to=orm['core.Object'], null=True, blank=True)),
+            ('attached_record', self.gf('django.db.models.fields.related.ForeignKey')(
+                to=orm['core.UpdateRecord'], null=True, blank=True)),
+            ('attached_file', self.gf(
+                'django.db.models.fields.files.FileField')(max_length=100)),
+            ('mimetype', self.gf(
+                'django.db.models.fields.CharField')(max_length=64)),
+            ('created', self.gf('django.db.models.fields.DateTimeField')
+             (auto_now_add=True, blank=True)),
+            ('uploaded_by', self.gf('django.db.models.fields.related.ForeignKey')(
+                to=orm['core.User'])),
+        ))
+        db.send_create_signal('core', ['Attachment'])
+
+    def backwards(self, orm):
+
+        # Deleting model 'Attachment'
+        db.delete_table('core_attachment')
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'core.accessentity': {
+            'Meta': {'object_name': 'AccessEntity'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        },
+        'core.attachment': {
+            'Meta': {'object_name': 'Attachment'},
+            'attached_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}),
+            'attached_object': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Object']", 'null': 'True', 'blank': 'True'}),
+            'attached_record': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.UpdateRecord']", 'null': 'True', 'blank': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'mimetype': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'uploaded_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']"})
+        },
+        'core.comment': {
+            'Meta': {'object_name': 'Comment'},
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'}),
+            'body': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"})
+        },
+        'core.configsetting': {
+            'Meta': {'object_name': 'ConfigSetting'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
+            'value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'})
+        },
+        'core.group': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Group', '_ormbases': ['core.AccessEntity']},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True', 'primary_key': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['core.Group']"})
+        },
+        'core.invitation': {
+            'Meta': {'object_name': 'Invitation'},
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'default_group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'key': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'sender': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'})
+        },
+        'core.location': {
+            'Meta': {'object_name': 'Location', '_ormbases': ['core.Object']},
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['core.Location']"})
+        },
+        'core.module': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Module', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'display': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'system': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'url': ('django.db.models.fields.CharField', [], {'max_length': '512'})
+        },
+        'core.modulesetting': {
+            'Meta': {'object_name': 'ModuleSetting'},
+            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'module': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Module']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'perspective': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Perspective']", 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'}),
+            'value': ('django.db.models.fields.TextField', [], {})
+        },
+        'core.object': {
+            'Meta': {'object_name': 'Object'},
+            'comments': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.Comment']"}),
+            'creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'objects_created'", 'null': 'True', 'to': "orm['core.User']"}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'full_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_full_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'links': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'links_rel_+'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'nuvius_resource': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'object_name': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'object_type': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'read_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_read_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'subscribers': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'subscriptions'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Tag']", 'null': 'True', 'blank': 'True'}),
+            'trash': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'core.page': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Page', '_ormbases': ['core.Object']},
+            'body': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'folder': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.PageFolder']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'published': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '256'})
+        },
+        'core.pagefolder': {
+            'Meta': {'object_name': 'PageFolder', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'core.perspective': {
+            'Meta': {'object_name': 'Perspective', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'modules': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Module']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'core.revision': {
+            'Meta': {'object_name': 'Revision'},
+            'change_type': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'object': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Object']"}),
+            'previous': ('django.db.models.fields.related.OneToOneField', [], {'blank': 'True', 'related_name': "'next'", 'unique': 'True', 'null': 'True', 'to': "orm['core.Revision']"})
+        },
+        'core.revisionfield': {
+            'Meta': {'object_name': 'RevisionField'},
+            'field': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'field_type': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'revision': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Revision']"}),
+            'value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'value_key': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'revisionfield_key'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'value_key_acc': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'revisionfield_key_acc'", 'null': 'True', 'to': "orm['core.AccessEntity']"}),
+            'value_m2m': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'revisionfield_m2m'", 'symmetrical': 'False', 'to': "orm['core.Object']"}),
+            'value_m2m_acc': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'revisionfield_m2m_acc'", 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"})
+        },
+        'core.tag': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Tag'},
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'})
+        },
+        'core.updaterecord': {
+            'Meta': {'ordering': "['-date_created']", 'object_name': 'UpdateRecord'},
+            'about': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'updates'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.Object']"}),
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'sent_updates'", 'null': 'True', 'to': "orm['core.User']"}),
+            'body': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
+            'comments': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_on_updates'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.Comment']"}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'updates_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'format_message': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'format_strings': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'updates_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'recipients': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'received_updates'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'record_type': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
+            'score': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'sender': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'sent_updates'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'url': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'})
+        },
+        'core.user': {
+            'Meta': {'ordering': "['name']", 'object_name': 'User', '_ormbases': ['core.AccessEntity']},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True', 'primary_key': 'True'}),
+            'default_group': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'default_user_set'", 'null': 'True', 'to': "orm['core.Group']"}),
+            'disabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_access': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'other_groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'core.widget': {
+            'Meta': {'ordering': "['weight']", 'object_name': 'Widget'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'module_name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'perspective': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Perspective']"}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']"}),
+            'weight': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'widget_name': ('django.db.models.fields.CharField', [], {'max_length': '256'})
+        }
+    }
+
+    complete_apps = ['core']
diff --git a/data/treeio/treeio/treeio/core/south_migrations/0008_auto__add_field_attachment_filename.py b/data/treeio/treeio/treeio/core/south_migrations/0008_auto__add_field_attachment_filename.py
new file mode 100644
index 0000000..b9dbf72
--- /dev/null
+++ b/data/treeio/treeio/treeio/core/south_migrations/0008_auto__add_field_attachment_filename.py
@@ -0,0 +1,244 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Adding field 'Attachment.filename'
+        db.add_column('core_attachment', 'filename', self.gf(
+            'django.db.models.fields.CharField')(default='', max_length=64), keep_default=False)
+
+    def backwards(self, orm):
+
+        # Deleting field 'Attachment.filename'
+        db.delete_column('core_attachment', 'filename')
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'core.accessentity': {
+            'Meta': {'object_name': 'AccessEntity'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        },
+        'core.attachment': {
+            'Meta': {'object_name': 'Attachment'},
+            'attached_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}),
+            'attached_object': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Object']", 'null': 'True', 'blank': 'True'}),
+            'attached_record': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.UpdateRecord']", 'null': 'True', 'blank': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'filename': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'mimetype': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'uploaded_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']"})
+        },
+        'core.comment': {
+            'Meta': {'object_name': 'Comment'},
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'}),
+            'body': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"})
+        },
+        'core.configsetting': {
+            'Meta': {'object_name': 'ConfigSetting'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
+            'value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'})
+        },
+        'core.group': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Group', '_ormbases': ['core.AccessEntity']},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True', 'primary_key': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['core.Group']"})
+        },
+        'core.invitation': {
+            'Meta': {'object_name': 'Invitation'},
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'default_group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'key': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'sender': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'})
+        },
+        'core.location': {
+            'Meta': {'object_name': 'Location', '_ormbases': ['core.Object']},
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['core.Location']"})
+        },
+        'core.module': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Module', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'display': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'system': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'url': ('django.db.models.fields.CharField', [], {'max_length': '512'})
+        },
+        'core.modulesetting': {
+            'Meta': {'object_name': 'ModuleSetting'},
+            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'module': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Module']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'perspective': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Perspective']", 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'}),
+            'value': ('django.db.models.fields.TextField', [], {})
+        },
+        'core.object': {
+            'Meta': {'object_name': 'Object'},
+            'comments': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.Comment']"}),
+            'creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'objects_created'", 'null': 'True', 'to': "orm['core.User']"}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'full_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_full_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'links': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'links_rel_+'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'nuvius_resource': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'object_name': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'object_type': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'read_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_read_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'subscribers': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'subscriptions'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Tag']", 'null': 'True', 'blank': 'True'}),
+            'trash': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'core.page': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Page', '_ormbases': ['core.Object']},
+            'body': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'folder': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.PageFolder']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'published': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '256'})
+        },
+        'core.pagefolder': {
+            'Meta': {'object_name': 'PageFolder', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'core.perspective': {
+            'Meta': {'object_name': 'Perspective', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'modules': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Module']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'core.revision': {
+            'Meta': {'object_name': 'Revision'},
+            'change_type': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'object': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Object']"}),
+            'previous': ('django.db.models.fields.related.OneToOneField', [], {'blank': 'True', 'related_name': "'next'", 'unique': 'True', 'null': 'True', 'to': "orm['core.Revision']"})
+        },
+        'core.revisionfield': {
+            'Meta': {'object_name': 'RevisionField'},
+            'field': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'field_type': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'revision': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Revision']"}),
+            'value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'value_key': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'revisionfield_key'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'value_key_acc': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'revisionfield_key_acc'", 'null': 'True', 'to': "orm['core.AccessEntity']"}),
+            'value_m2m': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'revisionfield_m2m'", 'symmetrical': 'False', 'to': "orm['core.Object']"}),
+            'value_m2m_acc': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'revisionfield_m2m_acc'", 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"})
+        },
+        'core.tag': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Tag'},
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'})
+        },
+        'core.updaterecord': {
+            'Meta': {'ordering': "['-date_created']", 'object_name': 'UpdateRecord'},
+            'about': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'updates'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.Object']"}),
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'sent_updates'", 'null': 'True', 'to': "orm['core.User']"}),
+            'body': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
+            'comments': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_on_updates'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.Comment']"}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'updates_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'format_message': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'format_strings': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'updates_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'recipients': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'received_updates'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'record_type': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
+            'score': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'sender': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'sent_updates'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'url': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'})
+        },
+        'core.user': {
+            'Meta': {'ordering': "['name']", 'object_name': 'User', '_ormbases': ['core.AccessEntity']},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True', 'primary_key': 'True'}),
+            'default_group': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'default_user_set'", 'null': 'True', 'to': "orm['core.Group']"}),
+            'disabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_access': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'other_groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'core.widget': {
+            'Meta': {'ordering': "['weight']", 'object_name': 'Widget'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'module_name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'perspective': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Perspective']"}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']"}),
+            'weight': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'widget_name': ('django.db.models.fields.CharField', [], {'max_length': '256'})
+        }
+    }
+
+    complete_apps = ['core']
diff --git a/data/treeio/treeio/treeio/core/templatetags/modules.py b/data/treeio/treeio/treeio/core/templatetags/modules.py
new file mode 100644
index 0000000..6a3e2db
--- /dev/null
+++ b/data/treeio/treeio/treeio/core/templatetags/modules.py
@@ -0,0 +1,894 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+"""
+Core templatetags
+"""
+from coffin import template
+from jinja2 import contextfunction, contextfilter, Markup
+from treeio.core.conf import settings
+from django.utils.translation import ugettext as _
+from django.utils.encoding import smart_unicode
+from django.utils import translation
+from django.template.defaultfilters import date as djangodate, time as djangotime
+from django.db import models
+from treeio.core.rendering import render_to_string
+from treeio.core.models import Module, ModuleSetting
+from treeio.core.rss import get_secret_key
+from treeio.core import sanitizer
+from treeio.finance.models import Currency
+from datetime import datetime, timedelta
+from dajaxice.templatetags.dajaxice_templatetags import dajaxice_js_import as dajaxice_orig_tag
+import re
+import base64
+import urllib
+
+
+register = template.Library()
+
+
+def _get_modules(request):
+    """Returns set of current modules and active module
+    :param WSGIRequest request:
+    """
+
+    perspective = request.user.profile.get_perspective()
+
+    modules = perspective.modules.filter(display=True).order_by('title')
+    if not modules:
+        modules = Module.objects.filter(display=True).order_by('title')
+    active = None
+
+    for module in modules:
+        module.type = 'minor'
+        try:
+            import_name = module.name + "." + \
+                settings.HARDTREE_MODULE_IDENTIFIER
+            hmodule = __import__(import_name, fromlist=[str(module.name)])
+            urls = hmodule.URL_PATTERNS
+            for regexp in urls:
+                if re.match(regexp, request.path):
+                    active = module
+            module.type = hmodule.PROPERTIES['type']
+        except ImportError:
+            pass
+        except AttributeError:
+            pass
+        except KeyError:
+            pass
+
+    return modules, active
+
+
+@contextfunction
+def modules_header_block(context):
+    "Modules header block"
+    request = context['request']
+    modules, active = _get_modules(request)
+
+    for module in modules:
+        module.title = _(module.title)
+
+    response_format = 'html'
+    if 'response_format' in context:
+        response_format = context['response_format']
+
+    return Markup(render_to_string('core/tags/modules_header_block',
+                                   {'modules': modules,
+                                    'active': active,
+                                    'request': request},
+                                   response_format=response_format))
+
+register.object(modules_header_block)
+
+
+@contextfunction
+def dajaxice_js_import(context):
+    "Thin wrapper for dajaxice"
+
+    return Markup(dajaxice_orig_tag(context))
+
+register.object(dajaxice_js_import)
+
+
+@contextfunction
+def modules_active(context):
+    "Active modules"
+    request = context['request']
+    modules, active = _get_modules(request)
+
+    if active:
+        return active.name.replace(".", "-")
+
+    return "treeio-home"
+
+register.object(modules_active)
+
+
+@contextfunction
+def paginate(context, items, plength=None):
+    "Pagination"
+    request = context['request']
+
+    skip = 0
+    if 'page_skip' in request.GET:
+        try:
+            skip = long(request.GET['page_skip'])
+        except Exception:
+            pass
+
+    if not plength:
+        plength = getattr(settings, 'HARDTREE_PAGINATOR_LENGTH', 10)
+    length = skip + plength
+
+    return items[skip:length]
+
+register.object(paginate)
+
+
+@contextfunction
+def pager(context, items, plength=None):
+    "Pager"
+    request = context['request']
+
+    response_format = 'html'
+    if 'response_format' in context:
+        response_format = context['response_format']
+
+    skip = 0
+    if 'page_skip' in request.GET:
+        try:
+            skip = long(request.GET['page_skip'])
+        except Exception:
+            pass
+
+    if not plength:
+        plength = getattr(settings, 'HARDTREE_PAGINATOR_LENGTH', 10)
+    if hasattr(items, 'count'):
+        try:
+            items_length = items.count()
+        except:
+            items_length = len(items)
+    else:
+        items_length = len(items)
+    pagenum = items_length // plength
+
+    if items_length % plength:
+        pagenum += 1
+
+    maxpages = getattr(settings, 'HARDTREE_PAGINATOR_PAGES', 20)
+
+    current = skip // plength
+    start = current - (maxpages // 2)
+    if pagenum - start < maxpages:
+        start = pagenum - maxpages
+    if start <= 0:
+        start = 1
+
+    pages = []
+    if pagenum > 1:
+        if current >= 1:
+            pages.append(
+                {'page': '&larr;', 'skip': (current - 1) * plength, 'mover': True})
+        else:
+            pages.append({'page': '&larr;', 'skip': 0, 'mover': True})
+        if start > 1:
+            pages.append(
+                {'page': '...', 'skip': (start - 1) * plength, 'mover': False})
+            maxpages -= 1
+        for i in range(start, pagenum + 1):
+            if i > (maxpages + start + 1):
+                pages.append(
+                    {'page': '...', 'skip': (i) * plength, 'mover': False})
+                break
+            else:
+                pages.append({'page': i, 'skip': (i - 1) * plength})
+        if current + 1 == pagenum:
+            pages.append(
+                {'page': '&rarr;', 'skip': current * plength, 'mover': True})
+        else:
+            pages.append(
+                {'page': '&rarr;', 'skip': (current + 1) * plength, 'mover': True})
+
+    url = request.path + "?"
+    if request.GET:
+        for arg in request.GET:
+            if arg != 'page_skip':
+                values = request.GET.getlist(arg)
+                for value in values:
+                    url += unicode(arg) + "=" + value + "&"
+
+    return Markup(render_to_string('core/tags/pager',
+                                   {'url': url, 'pages': pages, 'skip': skip},
+                                   response_format=response_format))
+
+register.object(pager)
+
+
+@contextfunction
+def htsort(context, objects):
+    "Sort objects based on request"
+    if not objects or 'request' not in context:
+        # Don't bother trying sorting if we can't do it
+        return objects
+
+    request = context['request']
+
+    if 'sorting' not in request.GET or not hasattr(objects, 'order_by') or not hasattr(objects, 'model'):
+        # Dont bother if there's nothing to sort on
+        return objects
+
+    args = request.GET.getlist('sorting')
+    fields = objects.model._meta.get_all_field_names()
+    for arg in args:
+        field_name = arg.lstrip('-')
+        if field_name in fields:
+            field = objects.model._meta.get_field(field_name)
+            if isinstance(field, models.ManyToManyField):
+                agg_field = agg_arg = str('sorting_%s' % field_name)
+                if arg[0] == '-':
+                    agg_arg = '-' + agg_arg
+                kwargs = {agg_field: models.Count(field_name)}
+                objects = objects.annotate(**kwargs).order_by(agg_arg)
+            else:
+                objects = objects.order_by(arg)
+
+    return objects.distinct()
+
+register.object(htsort)
+
+
+@contextfunction
+def htsortlink(context, field_name):
+    "Return URL of the sorting field"
+
+    if 'request' not in context:
+        return ''
+    request = context['request']
+
+    sort_value = field_name
+    url = u"%s?" % (request.path)
+    if request.GET:
+        for arg in request.GET:
+            values = request.GET.getlist(arg)
+            for value in values:
+                svalue = value.lstrip('-')
+                if arg == 'sorting' and svalue == field_name:
+                    if value[0] != '-':
+                        sort_value = u'-%s' % sort_value
+                else:
+                    url += unicode(arg) + "=" + value + "&"
+    url += "sorting=%s" % sort_value
+
+    return url
+
+register.object(htsortlink)
+
+
+@contextfunction
+def object_tree_path(context, object, skipself=False):
+    "Object tree path"
+    response_format = 'html'
+    if 'response_format' in context:
+        response_format = context['response_format']
+
+    path = object.get_tree_path(skipself)
+
+    return Markup(render_to_string('core/tags/object_tree_path',
+                                   {'path': path, 'skipself': skipself},
+                                   response_format=response_format))
+
+register.object(object_tree_path)
+
+
+def htsafe(text):
+    """
+      Strip all unsafe tags
+
+      1. Replace unsafe tags
+      2. Return text with 'safe' filter applied --- Alex: Thanks, Cap!
+    """
+    text = smart_unicode(text)
+
+    safe_string = smart_unicode(sanitizer.clean_html(text))
+
+    return Markup(safe_string)
+
+register.filter('htsafe', htsafe)
+
+
+def httranslate(text):
+    "Translates given string into chosen language"
+    return Markup(_(text))
+
+register.object(httranslate)
+
+
+@contextfunction
+def htform(context, form):
+    "Set time zone"
+
+    request = context['request']
+
+    user = None
+    if request.user.username:
+        try:
+            user = request.user.profile
+        except Exception:
+            pass
+
+    # timezone
+    default_timezone = settings.HARDTREE_SERVER_DEFAULT_TIMEZONE
+    try:
+        conf = ModuleSetting.get('default_timezone')[0]
+        default_timezone = conf.value
+    except:
+        pass
+
+    try:
+        conf = ModuleSetting.get('default_timezone', user=user)[0]
+        default_timezone = conf.value
+    except Exception:
+        default_timezone = getattr(
+            settings, 'HARDTREE_SERVER_TIMEZONE')[default_timezone][0]
+
+    all_timezones = getattr(settings, 'HARDTREE_SERVER_TIMEZONE', [
+                            (1, '(GMT-11:00) International Date Line West')])
+    title = all_timezones[int(default_timezone)][1]
+    GMT = title[4:10]  # with sign e.g. +06:00
+    sign = GMT[0:1]  # + or -
+    hours = int(GMT[1:3])  # e.g. 06
+    mins = int(GMT[4:6])
+
+    if not form.errors:
+        for field in form:
+            try:
+                date = datetime.strptime(
+                    str(field.form.initial[field.name]), "%Y-%m-%d %H:%M:%S")
+                if date:
+                    if sign == "-":
+                        field.form.initial[
+                            field.name] = date - timedelta(hours=hours, minutes=mins)
+                    else:
+                        field.form.initial[
+                            field.name] = date + timedelta(hours=hours, minutes=mins)
+            except:
+                pass
+
+    return form
+
+register.object(htform)
+
+
+@contextfilter
+def htdate(context, date, dateformat='DATE_FORMAT'):
+    """ Render date in the current locale
+
+    To render date in a custom format use Django format, details:
+    http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
+
+    """
+
+    if not date:
+        return ''
+
+    lang = translation.get_language()
+
+    localeformat = dateformat
+    formatspath = getattr(settings, 'FORMAT_MODULE_PATH', 'treeio.formats')
+    try:
+        modulepath = formatspath + "." + lang + ".formats"
+        module = __import__(modulepath, fromlist=[str(modulepath)])
+        localeformat = getattr(module, dateformat, dateformat)
+    except ImportError:
+        pass
+
+    request = context['request']
+
+    user = None
+    if request.user.username:
+        try:
+            user = request.user.profile
+        except Exception:
+            pass
+
+    # timezone
+    default_timezone = settings.HARDTREE_SERVER_DEFAULT_TIMEZONE
+    try:
+        conf = ModuleSetting.get('default_timezone')[0]
+        default_timezone = conf.value
+    except:
+        pass
+
+    try:
+        conf = ModuleSetting.get('default_timezone', user=user)[0]
+        default_timezone = conf.value
+    except Exception:
+        default_timezone = getattr(
+            settings, 'HARDTREE_SERVER_TIMEZONE')[default_timezone][0]
+
+    all_timezones = getattr(settings, 'HARDTREE_SERVER_TIMEZONE', [
+                            (1, '(GMT-11:00) International Date Line West')])
+    title = all_timezones[int(default_timezone)][1]
+    GMT = title[4:10]  # with sign e.g. +06:00
+    sign = GMT[0:1]  # + or -
+    hours = int(GMT[1:3])  # e.g. 06
+    mins = int(GMT[4:6])
+
+    if sign == "-":
+        date = date - timedelta(hours=hours, minutes=mins)
+    else:
+        date = date + timedelta(hours=hours, minutes=mins)
+
+    result = djangodate(date, localeformat)
+    return Markup(result)
+
+register.filter('htdate', htdate)
+
+
+@contextfilter
+def htdatetime(context, date, dateformat='DATETIME_FORMAT'):
+    """ Shortcut: render datetime in the current locale """
+
+    if not date:
+        return ''
+
+    lang = translation.get_language()
+
+    localeformat = dateformat
+    formatspath = getattr(settings, 'FORMAT_MODULE_PATH', 'treeio.formats')
+    try:
+        modulepath = formatspath + "." + lang + ".formats"
+        module = __import__(modulepath, fromlist=[str(modulepath)])
+        localeformat = getattr(module, dateformat, dateformat)
+    except ImportError:
+        pass
+
+    request = context['request']
+
+    user = None
+    if request.user.username:
+        try:
+            user = request.user.profile
+        except Exception:
+            pass
+
+    # timezone
+    default_timezone = settings.HARDTREE_SERVER_DEFAULT_TIMEZONE
+    try:
+        conf = ModuleSetting.get('default_timezone')[0]
+        default_timezone = conf.value
+    except:
+        pass
+
+    try:
+        conf = ModuleSetting.get('default_timezone', user=user)[0]
+        default_timezone = conf.value
+    except Exception:
+        default_timezone = getattr(
+            settings, 'HARDTREE_SERVER_TIMEZONE')[default_timezone][0]
+
+    all_timezones = getattr(settings, 'HARDTREE_SERVER_TIMEZONE', [
+                            (1, '(GMT-11:00) International Date Line West')])
+    title = all_timezones[int(default_timezone)][1]
+    GMT = title[4:10]  # with sign e.g. +06:00
+    sign = GMT[0:1]  # + or -
+    hours = int(GMT[1:3])  # e.g. 06
+    mins = int(GMT[4:6])
+
+    if sign == "-":
+        date = date - timedelta(hours=hours, minutes=mins)
+    else:
+        date = date + timedelta(hours=hours, minutes=mins)
+
+    result = djangodate(date, localeformat)
+
+    return Markup(result)
+
+register.filter('htdatetime', htdatetime)
+
+
+@contextfilter
+def httime(context, time, timeformat='TIME_FORMAT'):
+    """ Render time in the current locale """
+
+    if not time:
+        return ''
+
+    lang = translation.get_language()
+
+    localeformat = timeformat
+    formatspath = getattr(settings, 'FORMAT_MODULE_PATH', 'treeio.formats')
+    try:
+        modulepath = formatspath + "." + lang + ".formats"
+        module = __import__(modulepath, fromlist=[str(modulepath)])
+        localeformat = getattr(module, timeformat, timeformat)
+    except ImportError:
+        pass
+
+    request = context['request']
+
+    user = None
+    if request.user.username:
+        try:
+            user = request.user.profile
+        except Exception:
+            pass
+
+    # timezone
+    default_timezone = settings.HARDTREE_SERVER_DEFAULT_TIMEZONE
+    try:
+        conf = ModuleSetting.get('default_timezone')[0]
+        default_timezone = conf.value
+    except:
+        pass
+
+    try:
+        conf = ModuleSetting.get('default_timezone', user=user)[0]
+        default_timezone = conf.value
+    except Exception:
+        default_timezone = getattr(
+            settings, 'HARDTREE_SERVER_TIMEZONE')[default_timezone][0]
+
+    all_timezones = getattr(settings, 'HARDTREE_SERVER_TIMEZONE', [
+                            (1, '(GMT-11:00) International Date Line West')])
+    title = all_timezones[int(default_timezone)][1]
+    GMT = title[4:10]  # with sign e.g. +06:00
+    sign = GMT[0:1]  # + or -
+    hours = int(GMT[1:3])  # e.g. 06
+    mins = int(GMT[4:6])
+
+    if sign == "-":
+        time = time - timedelta(hours=hours, minutes=mins)
+    else:
+        time = time + timedelta(hours=hours, minutes=mins)
+
+    result = djangotime(time, localeformat)
+
+    return Markup(result)
+
+register.filter('httime', httime)
+
+
+@contextfunction
+def core_logo_content(context, gif=False):
+    "Return current logo encoded as base64"
+
+    staticpath = getattr(settings, 'STATIC_DOC_ROOT', './static')
+    logopath = staticpath + '/logo'
+    if gif:
+        logopath += '.gif'
+        mimetype = 'image/gif'
+    else:
+        logopath += '.png'
+        mimetype = 'image/png'
+
+    customlogo = ''
+    try:
+        conf = ModuleSetting.get_for_module('treeio.core', 'logopath')[0]
+        customlogo = getattr(
+            settings, 'MEDIA_ROOT', './static/media') + conf.value
+    except:
+        pass
+
+    logofile = ''
+    if customlogo:
+        try:
+            logofile = open(customlogo, 'r')
+        except:
+            pass
+
+    if not logofile:
+        try:
+            logofile = open(logopath, 'r')
+        except:
+            pass
+
+    result = "data:" + mimetype + ";base64," + \
+        base64.b64encode(logofile.read())
+
+    return Markup(result)
+
+register.object(core_logo_content)
+
+
+MOMENT = 120    # duration in seconds within which the time difference
+                # will be rendered as 'a moment ago'
+
+
+@contextfilter
+def humanize_datetime(context, value):
+    """
+    Finds the difference between the datetime value given and now()
+    and returns appropriate humanize form
+    """
+
+    request = context['request']
+
+    user = None
+    if request.user.username:
+        try:
+            user = request.user.profile
+        except:
+            pass
+
+    # timezone
+    default_timezone = settings.HARDTREE_SERVER_DEFAULT_TIMEZONE
+    try:
+        conf = ModuleSetting.get('default_timezone')[0]
+        default_timezone = conf.value
+    except:
+        pass
+
+    try:
+        conf = ModuleSetting.get('default_timezone', user=user)[0]
+        default_timezone = conf.value
+    except Exception:
+        default_timezone = getattr(
+            settings, 'HARDTREE_SERVER_TIMEZONE')[default_timezone][0]
+
+    all_timezones = getattr(settings, 'HARDTREE_SERVER_TIMEZONE', [
+                            (1, '(GMT-11:00) International Date Line West')])
+    title = all_timezones[int(default_timezone)][1]
+    GMT = title[4:10]  # with sign e.g. +06:00
+    sign = GMT[0:1]  # + or -
+    hours = int(GMT[1:3])  # e.g. 06
+    mins = int(GMT[4:6])
+
+    now = datetime.now()
+
+    if value:
+        if sign == "-":
+            value = value - timedelta(hours=hours, minutes=mins)
+            now = now - timedelta(hours=hours, minutes=mins)
+        else:
+            value = value + timedelta(hours=hours, minutes=mins)
+            now = now + timedelta(hours=hours, minutes=mins)
+
+    if isinstance(value, timedelta):
+        delta = value
+    elif isinstance(value, datetime):
+        delta = now - value
+    else:
+        delta = None
+
+    if delta:
+        if delta.days > 6:                                      # May 15, 17:55
+            month = None
+            if value.strftime("%b") == 'Jan':
+                month = _("Jan")
+            elif value.strftime("%b") == 'Feb':
+                month = _("Feb")
+            elif value.strftime("%b") == 'Mar':
+                month = _("Mar")
+            elif value.strftime("%b") == 'Apr':
+                month = _("Apr")
+            elif value.strftime("%b") == 'May':
+                month = _("May")
+            elif value.strftime("%b") == 'Jun':
+                month = _("Jun")
+            elif value.strftime("%b") == 'Jul':
+                month = _("Jul")
+            elif value.strftime("%b") == 'Aug':
+                month = _("Aug")
+            elif value.strftime("%b") == 'Sep':
+                month = _("Sep")
+            elif value.strftime("%b") == 'Oct':
+                month = _("Oct")
+            elif value.strftime("%b") == 'Nov':
+                month = _("Nov")
+            elif value.strftime("%b") == 'Dec':
+                month = _("Dec")
+            return month + value.strftime(" %d, %H:%M")
+
+        if delta.days > 1:                                      # Wednesday
+            if value.strftime("%A") == 'Monday':
+                return _("Monday")
+            elif value.strftime("%A") == 'Tuesday':
+                return _("Tuesday")
+            elif value.strftime("%A") == 'Wednesday':
+                return _("Wednesday")
+            elif value.strftime("%A") == 'Thursday':
+                return _("Thursday")
+            elif value.strftime("%A") == 'Friday':
+                return _("Friday")
+            elif value.strftime("%A") == 'Saturday':
+                return _("Saturday")
+            elif value.strftime("%A") == 'Sunday':
+                return _("Sunday")
+
+        elif delta.days == 1:
+            return _("yesterday")                               # yesterday
+        elif delta.seconds >= 7200:
+            return str(delta.seconds / 3600) + _(" hours ago")  # 3 hours ago
+        elif delta.seconds >= 3600:
+            return _("1 hour ago")                              # 1 hour ago
+        elif delta.seconds > MOMENT:
+            # 29 minutes ago
+            return str(delta.seconds / 60) + _(" minutes ago")
+        else:
+            return _("a moment ago")                            # a moment ago
+        return djangodate(value)
+    else:
+        return str(value)
+
+register.filter('humanize_datetime', humanize_datetime)
+
+
+@contextfilter
+def currency_format(context, value, currency=None):
+    """
+    Adds the currency symbol as set in Sales module settings to a given string
+    If the currency has no symbol it adds a three letter code to the end e.g. USD
+    """
+
+    # get default currency
+    if not currency:
+        currency = Currency.objects.get(is_default=True)
+    if not currency.symbol:
+        return unicode(value) + " " + currency.code
+    else:
+        return currency.symbol + unicode(value)
+
+register.filter('currency_format', currency_format)
+
+
+@contextfunction
+def currency_print(context, currency=None):
+    """
+    Just returns the currency symbol as set in Sales module settings to a given string.
+    """
+    if not currency:
+        currency = Currency.objects.get(is_default=True)
+    # if currency.symbol:
+    #    return unicode(currency.symbol)
+    # else:
+    return unicode(currency.code)
+
+register.object(currency_print)
+
+
+@contextfilter
+def number_format(context, value):
+    """
+    Enforces 2 decimal places after a number if only one is given (adds a zero)
+    also formats comma separators every 3rd digit before decimal place.
+    """
+    value = str(value)
+
+    negative = False
+    addzero = None
+
+    if value[0] == '-':
+        value = value[1:]
+        negative = True
+
+    if '.' in value:
+        point = value.rindex('.')
+        if point == len(value) - 2:
+            addzero = True
+    else:
+        point = len(value)
+
+    # Ensure we don't get lots of zero's after '.'
+    # Cut trailing zeros and only leave two
+    while point < len(value) - 3:
+        if value[len(value) - 1] == '0':
+            value = value[:len(value) - 1]
+        else:
+            break
+
+    while point > 3:
+        value = value[:point - 3] + "," + value[point - 3:]
+        point = value.index(',')
+
+    if addzero:
+        value += "0"
+
+    if negative:
+        value = "-" + value
+
+    return value
+
+register.filter('number_format', number_format)
+
+
+@contextfunction
+def show_hint(context, hint=None, object=None):
+    "Generic hint framework"
+
+    request = context['request']
+    response_format = 'html'
+
+    user = None
+    if request.user.username:
+        try:
+            user = request.user.profile
+        except Exception:
+            pass
+
+    return Markup(render_to_string('core/hints/' + hint, {'user': user, 'object': object},
+                                   response_format=response_format))
+
+register.object(show_hint)
+
+
+@contextfilter
+def group_by_letter(context, object_list):
+    "Group contacts by letter"
+    res = {}
+
+    for x in object_list:
+        # case 1
+        r = re.search('^[a-zA-Z]', x.name)
+        if r:
+            key = r.group().lower()
+            if key not in res:
+                # print "reg", key
+                res[key] = [x]
+            else:
+                res[key].append(x)
+
+        # case 2
+        n = re.search('^[0-9_]', x.name)
+        if n:
+            if '#' not in res:
+                res['#'] = [x]
+            else:
+                res['#'].append(x)
+
+        # case 3
+        if not n and not r:
+            if '#' not in res:
+                res['#'] = [x]
+            else:
+                res['#'].append(x)
+
+    # converting dictionary to list of tuples, since template support only
+    # List.
+    l = []
+    for k, v in res.items():
+        l.append((k, v))
+        l.sort(cmp=lambda x, y: cmp(x, y))
+    return l
+
+register.filter('group_by_letter', group_by_letter)
+
+
+@contextfunction
+def rss_link(context, url=None):
+    "Generic rss link for this URL"
+
+    request = context['request']
+
+    params = request.GET.copy()
+    params.update({'secret': get_secret_key(request)})
+
+    if not url:
+        url = request.path
+    for ext in getattr(settings, 'HARDTREE_RESPONSE_FORMATS', {'html': 'text/html'}):
+        url = url.replace('.' + ext, '')
+    url += '.rss'
+    try:
+        url += '?' + urllib.urlencode(params)
+    except:
+        pass
+
+    return Markup(url)
+
+register.object(rss_link)
+
+
+@contextfunction
+def logo_block_container(context):
+    "Returns logo_block_container"
+
+    # request = context['request']
+    response_format = 'html'
+
+    return Markup(render_to_string('core/tags/logo_block_container',
+                                   response_format=response_format))
+
+register.object(logo_block_container)
diff --git a/data/treeio/treeio/treeio/core/templatetags/user.py b/data/treeio/treeio/treeio/core/templatetags/user.py
new file mode 100644
index 0000000..37840d7
--- /dev/null
+++ b/data/treeio/treeio/treeio/core/templatetags/user.py
@@ -0,0 +1,90 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+"""
+User-related Core templatetags
+"""
+from coffin import template
+from django.core.context_processors import csrf
+from treeio.core.rendering import render_to_string
+from jinja2 import contextfunction, Markup
+from treeio.core.models import Object, Perspective
+from treeio.core.conf import settings
+
+register = template.Library()
+
+
+@contextfunction
+def user_block(context):
+    """User block
+    :param Context context:
+    """
+    request = context['request']
+
+    user = request.user.profile
+    modules = user.get_perspective().get_modules()
+    account = modules.filter(name='treeio.account')
+    admin = modules.filter(name='treeio.core')
+    if admin:
+        admin = admin[0]
+
+    response_format = 'html'
+    if 'response_format' in context:
+        response_format = context['response_format']
+
+    trial = False
+    if getattr(settings, 'HARDTREE_SUBSCRIPTION_USER_LIMIT') == 3:
+        trial = True
+
+    active = context.get('active', None)
+
+    return Markup(render_to_string('core/tags/user_block',
+                  {'user': user,
+                   'account': account,
+                   'admin': admin,
+                   'active': active,
+                   'trial': trial},
+                  response_format=response_format))
+
+register.object(user_block)
+
+
+@contextfunction
+def demo_user(context):
+    "Print demo block if demo"
+
+    response_format = 'html'
+
+    demo = getattr(settings, 'HARDTREE_DEMO_MODE', False)
+
+    return Markup(render_to_string('core/tags/demo_user',
+                  {'demo': demo},
+                  response_format=response_format))
+
+register.object(demo_user)
+
+
+@contextfunction
+def core_perspective_switch(context):
+    "Quick perspective switcher"
+
+    response_format = 'html'
+    request = context['request']
+    try:
+        user = request.user.profile
+
+        current = user.get_perspective()
+        perspectives = Object.filter_by_request(request, Perspective.objects)
+    except:
+        current = None
+        perspectives = []
+
+    context = {'current': current, 'perspectives': perspectives}
+    context.update(csrf(request))
+
+    return Markup(render_to_string('core/tags/perspective_switch', context,
+                  response_format=response_format))
+
+register.object(core_perspective_switch)
diff --git a/data/treeio/treeio/treeio/core/trash/views.py b/data/treeio/treeio/treeio/core/trash/views.py
new file mode 100644
index 0000000..b637bd2
--- /dev/null
+++ b/data/treeio/treeio/treeio/core/trash/views.py
@@ -0,0 +1,109 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+"""
+Core module: Trash views
+"""
+from django.template import RequestContext
+from django.http import HttpResponseRedirect
+from django.shortcuts import get_object_or_404
+from django.core.urlresolvers import reverse
+from treeio.core.models import Object
+from treeio.core.decorators import treeio_login_required, handle_response_format
+from treeio.core.rendering import render_to_response
+from treeio.core.views import user_denied
+from treeio.core.trash.forms import MassActionForm
+
+
+def _process_mass_form(f):
+    "Pre-process request to handle mass action form for Tasks and Milestones"
+
+    def wrap(request, *args, **kwargs):
+        "Wrap"
+        if 'massform' in request.POST:
+            if 'delete_all' in request.POST.values():
+                try:
+                    object = Object.filter_by_request(request, manager=Object.objects.filter(trash=True),
+                                                      mode='r', filter_trash=False)
+                    form = MassActionForm(request.POST, instance=object)
+                    if form.is_valid() and request.user.profile.has_permission(object, mode='w'):
+                        form.save()
+                except:
+                    pass
+            else:
+                for key in request.POST:
+                    if 'mass-object' in key:
+                        try:
+                            object = Object.objects.get(pk=request.POST[key])
+                            form = MassActionForm(
+                                request.POST, instance=object)
+                            if form.is_valid() and request.user.profile.has_permission(object, mode='w'):
+                                form.save()
+                        except:
+                            pass
+
+        return f(request, *args, **kwargs)
+
+    wrap.__doc__ = f.__doc__
+    wrap.__name__ = f.__name__
+
+    return wrap
+
+
+@treeio_login_required
+@handle_response_format
+@_process_mass_form
+def index(request, response_format='html'):
+    "List of items in Trash"
+
+    trash = Object.filter_by_request(request, manager=Object.objects.filter(trash=True),
+                                     mode='r', filter_trash=False)
+    massform = MassActionForm()
+
+    return render_to_response('core/trash/index',
+                              {'trash': trash,
+                               'massform': massform},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+def object_delete(request, object_id, response_format='html'):
+    "Completely delete item"
+
+    object = get_object_or_404(Object, pk=object_id)
+    if not request.user.profile.has_permission(object, mode='w'):
+        return user_denied(request, message="You don't have access to this Object")
+
+    if request.POST:
+        if 'delete' in request.POST:
+            object.delete()
+            return HttpResponseRedirect(reverse('core_trash'))
+        elif 'cancel' in request.POST:
+            return HttpResponseRedirect(reverse('core_trash'))
+
+    return render_to_response('core/trash/object_delete',
+                              {'object': object},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+def object_untrash(request, object_id, response_format='html'):
+    "Untrash item"
+
+    object = get_object_or_404(Object, pk=object_id)
+    if not request.user.profile.has_permission(object, mode='w'):
+        return user_denied(request, message="You don't have access to this Object")
+
+    related = object.get_related_object()
+    if related:
+        related.trash = False
+        related.save()
+    else:
+        object.trash = False
+        object.save()
+
+    return HttpResponseRedirect(reverse('core_trash'))
diff --git a/data/treeio/treeio/treeio/core/views.py b/data/treeio/treeio/treeio/core/views.py
new file mode 100644
index 0000000..cde6d2f
--- /dev/null
+++ b/data/treeio/treeio/treeio/core/views.py
@@ -0,0 +1,604 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+"""
+Core module views
+"""
+
+from django.contrib.auth import authenticate, login, logout
+from django.contrib.sessions.models import Session
+from django.contrib.sites.models import RequestSite
+# from django.contrib.csrf.middleware import CsrfMiddleware as csrf
+from django.utils.encoding import smart_unicode
+from django.views.decorators.csrf import csrf_protect
+from django.views.decorators.cache import cache_control
+from django.template import RequestContext
+from django.http import HttpResponseRedirect, Http404, HttpResponse, HttpResponseBadRequest
+from django.core.urlresolvers import resolve, reverse
+from django.shortcuts import get_object_or_404
+from treeio.core.conf import settings
+from treeio.core.decorators import treeio_login_required, handle_response_format
+from treeio.core.forms import LoginForm, PasswordResetForm, InvitationForm, SqlSettingsForm
+from treeio.core.models import Object, Module, ModuleSetting, Perspective, User, Attachment, Invitation, Tag, \
+    UpdateRecord
+from treeio.core.rendering import render_to_response
+from jinja2 import Markup
+from os.path import join
+import re
+import json
+import urllib2
+import random
+
+
+@handle_response_format
+@treeio_login_required
+def user_logout(request, response_format='html'):
+    """User logout"""
+    logout(request)
+    return HttpResponseRedirect(reverse('user_login'))
+
+
+@handle_response_format
+def user_login(request, response_format='html'):
+    "User login"
+    if request.user.username:
+        return HttpResponseRedirect(reverse('user_denied'))
+    next = request.GET.get('next', '/')
+    form = LoginForm(request.POST)
+    if request.POST:
+        username = request.POST['username']
+        password = request.POST['password']
+
+        user = authenticate(username=username, password=password)
+        if user and getattr(settings, 'HARDTREE_DISABLE_EVERGREEN_USERS', False) and 'evergreen_' in user.username[:10]:
+            user = None
+        if form.is_valid():
+            if user is not None:
+
+                try:
+                    profile = user.profile
+                except:
+                    profile = None
+
+                if not profile:
+                    return render_to_response('core/user_login', {
+                        'error_message': 'Username or password you entered is not valid', 'form': Markup(form)},
+                                              context_instance=RequestContext(request), response_format=response_format)
+
+                if profile.disabled:
+                    return render_to_response('core/user_login', {
+                        'error_message': 'Your account is disabled.',
+                        'form': Markup(form)},
+                                              context_instance=RequestContext(request),
+                                              response_format=response_format)
+
+                if user.is_active and profile:
+
+                    # Disable account with overdue payment
+                    if getattr(settings, "HARDTREE_SUBSCRIPTION_BLOCKED", False):
+                        return render_to_response('core/user_login', {
+                            'error_message': 'We are sorry to inform you but your account has been deactivated. Please login to your <a href="https://www.tree.io/login/">control panel</a> to see details.',
+                            'form': Markup(form)},
+                                                  context_instance=RequestContext(request),
+                                                  response_format=response_format)
+
+                    login(request, user)
+
+                    # Prevent same user from logging in at 2 different machines
+                    if getattr(settings, "HARDTREE_MULTIPLE_LOGINS_DISABLED", False):
+                        for ses in Session.objects.all():
+                            if ses != request.session:
+                                try:
+                                    data = ses.get_decoded()
+                                    if '_auth_user_id' in data and data['_auth_user_id'] == request.user.id:
+                                        ses.delete()
+                                except Exception:
+                                    pass
+
+                    if 'next' in request.POST:
+                        return HttpResponseRedirect(request.POST['next'])
+                    else:
+                        return HttpResponseRedirect(next)
+                else:
+                    return render_to_response('core/user_login_disabled',
+                                              context_instance=RequestContext(
+                                                  request),
+                                              response_format=response_format)
+            else:
+                return render_to_response('core/user_login', {
+                    'error_message': 'Username or password you entered is not valid', 'form': Markup(form)},
+                                          context_instance=RequestContext(request), response_format=response_format)
+        elif not form.is_valid() and user is None:
+            return render_to_response('core/user_login',
+                                      {'error_message': 'Username or password you entered is not valid', 'form': Markup(
+                                          form)},
+                                      context_instance=RequestContext(request), response_format=response_format)
+        else:
+            return render_to_response('core/user_login',
+                                      {'error_message': 'Please re-enter the text from the image',
+                                       'form': Markup(form)},
+                                      context_instance=RequestContext(request), response_format=response_format)
+    else:
+        return render_to_response('core/user_login', {'form': Markup(form)},
+                                  context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+def user_denied(request, message='', response_format='html'):
+    "User denied page"
+    response = render_to_response('core/user_denied',
+                                  {'message': message},
+                                  context_instance=RequestContext(request), response_format=response_format)
+    # response.status_code = 403
+    return response
+
+
+@treeio_login_required
+@handle_response_format
+def user_perspective(request, response_format='html'):
+    "Change user perspective"
+
+    user = request.user.profile
+    if request.POST and 'core_perspective' in request.POST:
+        id = request.POST['core_perspective']
+        perspective = get_object_or_404(Perspective, pk=id)
+        if user.has_permission(perspective):
+            user.set_perspective(perspective)
+
+    return HttpResponseRedirect(reverse('home'))
+
+
+@cache_control(private=True, must_revalidate=True, max_age=60)
+def logo_image(request, gif=False, response_format='html'):
+    "Return current logo image"
+
+    staticpath = getattr(settings, 'STATIC_DOC_ROOT', './static')
+    logopath = staticpath + '/logo'
+    if gif:
+        logopath += '.gif'
+        mimetype = 'image/gif'
+    else:
+        logopath += '.png'
+        mimetype = 'image/png'
+
+    customlogo = ''
+    try:
+        conf = ModuleSetting.get_for_module('treeio.core', 'logopath')[0]
+        customlogo = getattr(
+            settings, 'MEDIA_ROOT', './static/media') + conf.value
+    except:
+        pass
+
+    logofile = ''
+    if customlogo:
+        try:
+            logofile = open(customlogo, 'rb')
+        except:
+            pass
+
+    if not logofile:
+        try:
+            logofile = open(logopath, 'rb')
+        except:
+            pass
+
+    return HttpResponse(logofile.read(), content_type=mimetype)
+
+
+def ajax_popup(request, popup_id='', url='/'):
+    "Handles pop up forms and requests, by extracting only the required content from response content"
+
+    view, args, kwargs = resolve(url)
+
+    if not request.user.username:
+        return HttpResponseRedirect('/accounts/login')
+
+    modules = Module.objects.all()
+    active = None
+    for module in modules:
+        try:
+            import_name = module.name + "." + \
+                          settings.HARDTREE_MODULE_IDENTIFIER
+            hmodule = __import__(import_name, fromlist=[str(module.name)])
+            urls = hmodule.URL_PATTERNS
+            for regexp in urls:
+                if re.match(regexp, url):
+                    active = module
+        except ImportError:
+            pass
+        except AttributeError:
+            pass
+
+    response = None
+    if active:
+        if not request.user.profile.has_permission(active):
+            response = user_denied(request, "You do not have access to the %s module" % unicode(active),
+                                   response_format='ajax')
+
+    if not response:
+        if view == ajax_popup:
+            raise Http404("OMG, I see myself!")
+
+        kwargs['request'] = request
+        kwargs['response_format'] = 'ajax'
+        response = view(*args, **kwargs)
+
+        # response = csrf().process_response(request, response)
+
+    module_inner = ""
+    regexp = r"<!-- module_content_inner -->(?P<module_inner>.*?)<!-- /module_content_inner -->"
+    blocks = re.finditer(regexp, response.content, re.DOTALL)
+    for block in blocks:
+        module_inner += block.group('module_inner').strip()
+
+    title = ""
+    regexp = r"<div class=\\\"title\\\">(?P<title>.*?)</div>"
+    blocks = re.finditer(regexp, response.content, re.DOTALL)
+    for block in blocks:
+        title += block.group('title').replace('\\n', '').strip()
+    if not title:
+        blocks = re.finditer(
+            r"<title>(?P<title>.*?)</title>", response.content, re.DOTALL)
+        for block in blocks:
+            title += block.group('title').replace('\\n', '').strip()
+
+    subtitle = ""
+    regexp = r"<div class=\\\"subtitle-block\\\">(?P<subtitle>.*?)</div>"
+    blocks = re.finditer(regexp, response.content, re.DOTALL)
+    for block in blocks:
+        subtitle += block.group('subtitle').replace('\\n', '').strip()
+
+    context = {'content': module_inner, 'title': title, 'subtitle': subtitle, 'popup_id': popup_id, 'url': request.path}
+
+    if settings.HARDTREE_RESPONSE_FORMATS['json'] in response.get('Content-Type', 'text/html'):
+        new_response = render_to_response('core/ajax_popup', context,
+                                          context_instance=RequestContext(request), response_format='json')
+    else:
+        new_response = HttpResponse(json.dumps({'popup': context}))
+
+    new_response.mimetype = settings.HARDTREE_RESPONSE_FORMATS['json']
+    try:
+        jsonresponse = json.loads(response.content)
+        if 'redirect' in jsonresponse:
+            new_response.status_code = 302
+    except Exception:
+        new_response.status_code = response.status_code
+
+    return new_response
+
+
+def mobile_view(request, url='/'):
+    "Returns the same page in mobile view"
+
+    if not url:
+        url = '/'
+
+    view, args, kwargs = resolve(url)
+
+    if view == mobile_view:
+        raise Http404("OMG, I see myself!")
+
+    kwargs['request'] = request
+    kwargs['response_format'] = 'html'
+    response = view(*args, **kwargs)
+
+    # response = csrf().process_response(request, response)
+
+    if response.status_code == 302 and not response['Location'][:2] == '/m':
+        response['Location'] = '/m' + response['Location']
+
+    return response
+
+
+def iframe_close(request, response_format='html'):
+    "For third-party resources, when returned back to Hardtree, close iframe"
+
+    return render_to_response('core/iframe_close', {},
+                              context_instance=RequestContext(request),
+                              response_format=response_format)
+
+
+@handle_response_format
+def database_setup(request, response_format='html'):
+    if not User.objects.all().count():
+        if request.POST:
+            sql_form = SqlSettingsForm(data=request.POST)
+            if sql_form.is_valid():
+                sql_form.create_database()
+                if sql_form.is_valid():
+                    return HttpResponseRedirect('/')
+        else:
+            sql_form = SqlSettingsForm()
+        return render_to_response('core/database_setup', {'sql_form': sql_form},
+                                  context_instance=RequestContext(request), response_format=response_format)
+    return HttpResponseRedirect('/')
+
+
+@treeio_login_required
+def help_page(request, url='/', response_format='html'):
+    "Returns a Help page from Evergreen"
+
+    source = getattr(
+        settings, 'HARDTREE_HELP_SOURCE', 'http://127.0.0.1:7000/help')
+
+    if not url:
+        url = '/'
+
+    body = ''
+    try:
+        body = urllib2.urlopen(
+            source + url + '?domain=' + RequestSite(request).domain).read()
+    except:
+        pass
+
+    regexp = r"<!-- module_content_inner -->(?P<module_inner>.*?)<!-- /module_content_inner -->"
+    blocks = re.finditer(regexp, body, re.DOTALL)
+    for block in blocks:
+        body = smart_unicode(block.group('module_inner').strip())
+
+    return render_to_response('core/help_page', {'body': body},
+                              context_instance=RequestContext(request),
+                              response_format=response_format)
+
+
+#
+# AJAX lookups
+#
+@treeio_login_required
+def ajax_object_lookup(request, response_format='html'):
+    "Returns a list of matching objects"
+
+    objects = []
+    if request.GET and 'term' in request.GET:
+        objects = Object.filter_permitted(request.user.profile,
+            Object.objects.filter(
+                object_name__icontains=request.GET['term']),
+            mode='x')[:10]
+
+    return render_to_response('core/ajax_object_lookup',
+                              {'objects': objects},
+                              context_instance=RequestContext(request),
+                              response_format=response_format)
+
+
+@treeio_login_required
+def ajax_tag_lookup(request, response_format='html'):
+    "Returns a list of matching tags"
+
+    tags = []
+    if request.GET and 'term' in request.GET:
+        tags = Tag.objects.filter(name__icontains=request.GET['term'])
+
+    return render_to_response('core/ajax_tag_lookup',
+                              {'tags': tags},
+                              context_instance=RequestContext(request),
+                              response_format=response_format)
+
+
+#
+# Widgets
+#
+
+
+@treeio_login_required
+def widget_welcome(request, response_format='html'):
+    "Quick start widget, which users see when they first log in"
+
+    trial = False
+    if getattr(settings, 'HARDTREE_SUBSCRIPTION_USER_LIMIT') == 3:
+        trial = True
+
+    customization = getattr(
+        settings, 'HARDTREE_SUBSCRIPTION_CUSTOMIZATION', True)
+
+    return render_to_response('core/widgets/welcome', {'trial': trial, 'customization': customization},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+#
+# Passwords
+#
+@csrf_protect
+def password_reset(request, response_format='html'):
+    "Password_reset sends the email with the new password"
+
+    if request.POST:
+        form = PasswordResetForm(request.POST)
+        if form.is_valid():
+            form.save()
+            return HttpResponseRedirect(reverse('password_reset_done'))
+    else:
+        form = PasswordResetForm()
+
+    return render_to_response('core/password_reset_form',
+                              {'form': form},
+                              context_instance=RequestContext(request),
+                              response_format=response_format)
+
+
+def password_reset_done(request, response_format='html'):
+    "Shows success message"
+
+    return render_to_response('core/password_reset_done',
+                              context_instance=RequestContext(request),
+                              response_format=response_format)
+
+
+def invitation_retrieve(request, response_format='html'):
+    "Retrieve invitation and create account"
+
+    if request.user.username:
+        return HttpResponseRedirect('/')
+
+    email = request.REQUEST.get('email', None)
+    key = request.REQUEST.get('key', None)
+    if email and key:
+        try:
+            invitation = Invitation.objects.get(email=email, key=key)
+        except:
+            raise Http404
+    else:
+        raise Http404
+
+    if request.POST:
+        form = InvitationForm(invitation, request.POST)
+        if form.is_valid():
+            profile = form.save()
+            username = profile.user.username
+            password = form.cleaned_data['password']
+            user = authenticate(username=username, password=password)
+            if user:
+                invitation.delete()
+                login(request, user)
+                return HttpResponseRedirect('/')
+    else:
+        form = InvitationForm(invitation)
+
+    return render_to_response('core/invitation_retrieve',
+                              {'invitation': invitation,
+                               'form': form},
+                              context_instance=RequestContext(request),
+                              response_format=response_format)
+
+
+def save_upload(uploaded, filename, raw_data):
+    '''
+    raw_data: if True, uploaded is an HttpRequest object with the file being
+              the raw post data
+              if False, uploaded has been submitted via the basic form
+              submission and is a regular Django UploadedFile in request.FILES
+    '''
+    try:
+        from io import FileIO, BufferedWriter
+
+        with BufferedWriter(FileIO(filename, "wb")) as dest:
+            # if the "advanced" upload, read directly from the HTTP request
+            # with the Django 1.3 functionality
+            if raw_data:
+                if isinstance(uploaded, basestring):
+                    dest.write(uploaded)
+                else:
+                    foo = uploaded.read(1024)
+                    while foo:
+                        dest.write(foo)
+                        foo = uploaded.read(1024)
+            # if not raw, it was a form upload so read in the normal Django
+            # chunks fashion
+            else:
+                for c in uploaded.chunks():
+                    dest.write(c)
+                    # got through saving the upload, report success
+            return True
+    except IOError:
+        # could not open the file most likely
+        pass
+    return False
+
+
+@treeio_login_required
+def ajax_upload(request, object_id=None, record=None):
+    try:
+        object = None
+        if request.method == "POST":
+            if request.is_ajax():
+                # the file is stored raw in the request
+                upload = request
+                is_raw = True
+                # AJAX Upload will pass the filename in the querystring if it
+                # is the "advanced" ajax upload
+                try:
+                    filename = request.GET['qqfile']
+                    content_type = "application/octet-stream"
+                except KeyError:
+                    return HttpResponseBadRequest("AJAX request not valid")
+            # not an ajax upload, so it was the "basic" iframe version with
+            # submission via form
+            else:
+                is_raw = False
+                if len(request.FILES) == 1:
+                    # FILES is a dictionary in Django but Ajax Upload gives the uploaded file an
+                    # ID based on a random number, so it cannot be guessed here in the code.
+                    # Rather than editing Ajax Upload to pass the ID in the querystring,
+                    # observer that each upload is a separate request,
+                    # so FILES should only have one entry.
+                    # Thus, we can just grab the first (and only) value in the
+                    # dict.
+                    upload = request.FILES.values()[0]
+                    content_type = upload.content_type
+                else:
+                    raise Http404("Bad Upload")
+                filename = upload.name
+
+            random.seed()
+            filehash = str(random.getrandbits(128))
+
+            savefile = join(
+                getattr(settings, 'MEDIA_ROOT'), 'attachments', filehash)
+
+            # save the file
+            success = save_upload(upload, savefile, is_raw)
+
+            attachment = Attachment(filename=filename,
+                                    content_type=content_type,
+                                    uploaded_by=request.user.profile,
+                                    attached_file=filehash)
+
+            if record:
+                attachment.attached_record = record
+                about = record.about.all()
+                if about.count():
+                    attachment.attached_object = about[0]
+                    object = attachment.attached_object
+            else:
+                object = Object.objects.get(id=object_id)
+                attachment.attached_object = object
+
+            attachment.save()
+
+            if object:
+                object.set_last_updated()
+
+            # TODO: smart markup and return as string, and object id, different
+            # classnames,id or attribute for update records and objects
+
+            if success:
+                ret_json = {'success': success,
+                            'object_id': object.id if object else None,
+                            'update_id': record.id if record else None}
+
+            else:
+                ret_json = {'success': False,
+                            'object_id': None,
+                            'update_id': None}
+
+            return HttpResponse(json.dumps(ret_json))
+    except:
+        pass
+
+
+@treeio_login_required
+def ajax_upload_record(request, record_id=None):
+    record = UpdateRecord.objects.get(id=record_id)
+    return ajax_upload(request, None, record)
+
+
+@treeio_login_required
+def attachment_download(request, attachment_id):
+    try:
+        attachment = Attachment.objects.get(pk=attachment_id)
+    except Attachment.DoesNotExist:
+        raise Http404()
+
+    filepath = join(
+        getattr(settings, 'MEDIA_ROOT'), 'attachments', attachment.attached_file.name)
+    try:
+        data = open(filepath).read()
+    except IOError:
+        raise Http404()
+
+    response = HttpResponse(data, content_type=attachment.mimetype)
+    response[
+        'Content-Disposition'] = 'filename="%s"' % smart_unicode(attachment.filename)
+    return response
diff --git a/data/treeio/treeio/treeio/documents/forms.py b/data/treeio/treeio/treeio/documents/forms.py
new file mode 100644
index 0000000..680e906
--- /dev/null
+++ b/data/treeio/treeio/treeio/documents/forms.py
@@ -0,0 +1,200 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+"""
+Documents module forms
+"""
+from django.forms import ModelForm, CharField, TextInput, ChoiceField, Form
+from treeio.documents.models import Folder, Document, File, WebLink
+from treeio.core.models import Object
+from django.utils.translation import ugettext as _
+from treeio.core.decorators import preprocess_form
+from django.core.urlresolvers import reverse
+
+preprocess_form()
+
+
+class MassActionForm(Form):
+    """ Mass action form for Reports """
+
+    delete = ChoiceField(label=_("With selected"), choices=(('', '-----'), ('delete', 'Delete Completely'),
+                                                            ('trash', 'Move to Trash')), required=False)
+
+    instance = None
+
+    def __init__(self, user, *args, **kwargs):
+        if 'instance' in kwargs:
+            self.instance = kwargs['instance']
+            del kwargs['instance']
+
+        super(MassActionForm, self).__init__(*args, **kwargs)
+        self.fields['delete'] = ChoiceField(label=_("With selected"), choices=(('', '-----'),
+                                                                               ('delete', _(
+                                                                                   'Delete Completely')),
+                                                                               ('trash', _('Move to Trash'))),
+                                            required=False)
+
+    def save(self, *args, **kwargs):
+        "Process form"
+
+        if self.instance:
+            if self.is_valid():
+                if self.cleaned_data['delete']:
+                    if self.cleaned_data['delete'] == 'delete':
+                        self.instance.delete()
+                    if self.cleaned_data['delete'] == 'trash':
+                        self.instance.trash = True
+                        self.instance.save()
+
+
+class FolderForm(ModelForm):
+    """ Folder form """
+
+    def __init__(self, user, folder_id, *args, **kwargs):
+        super(FolderForm, self).__init__(*args, **kwargs)
+
+        self.fields['name'].label = _("Name")
+
+        self.fields['parent'].label = _("Parent")
+        self.fields['parent'].queryset = Object.filter_permitted(
+            user, Folder.objects, mode='x')
+        if folder_id:
+            self.fields['parent'].initial = folder_id
+
+    class Meta:
+        "Folder"
+        model = Folder
+        fields = ('name', 'parent')
+
+
+class DocumentForm(ModelForm):
+    """ Document form """
+    title = CharField(widget=TextInput(attrs={'size': '50'}))
+
+    def __init__(self, user, folder_id, *args, **kwargs):
+        super(DocumentForm, self).__init__(*args, **kwargs)
+
+        self.fields['title'].label = _("Title")
+
+        self.fields['folder'].label = _("Folder")
+        self.fields['folder'].queryset = Object.filter_permitted(
+            user, Folder.objects, mode='x')
+        self.fields['folder'].widget.attrs.update(
+            {'popuplink': reverse('documents_folder_add')})
+        if folder_id:
+            self.fields['folder'].initial = folder_id
+        else:
+            try:
+                self.fields['folder'].initial = self.fields[
+                    'folder'].queryset[0].id
+            except:
+                pass
+
+        self.fields['body'].label = _("Body")
+        self.fields['body'].widget.attrs.update({'class': 'full-editor'})
+
+    class Meta:
+
+        "Document"
+        model = Document
+        fields = ('title', 'folder', 'body')
+
+
+class FileForm(ModelForm):
+    """ File form """
+    name = CharField(widget=TextInput(attrs={'size': '25'}))
+
+    def __init__(self, user, folder_id, *args, **kwargs):
+        super(FileForm, self).__init__(*args, **kwargs)
+
+        self.fields['name'].label = _("Name")
+
+        self.fields['folder'].label = _("Folder")
+        self.fields['folder'].queryset = Object.filter_permitted(
+            user, Folder.objects, mode='x')
+        self.fields['folder'].widget.attrs.update(
+            {'popuplink': reverse('documents_folder_add')})
+        if folder_id:
+            self.fields['folder'].initial = folder_id
+        else:
+            try:
+                self.fields['folder'].initial = self.fields[
+                    'folder'].queryset[0].id
+            except:
+                pass
+
+        self.fields['content'].label = _("Content")
+
+    class Meta:
+
+        "File"
+        model = File
+        fields = ('name', 'folder', 'content')
+
+
+class WebLinkForm(ModelForm):
+    """ WebLink form """
+
+    def __init__(self, user, folder_id, *args, **kwargs):
+        super(WebLinkForm, self).__init__(*args, **kwargs)
+
+        self.fields['title'].label = _("Title")
+        self.fields['title'].widget = TextInput(attrs={'size': '35'})
+
+        self.fields['url'].label = _("URL")
+        self.fields['url'].initial = 'http://'
+        self.fields['url'].widget = TextInput(attrs={'size': '50'})
+
+        self.fields['folder'].label = _("Folder")
+        self.fields['folder'].queryset = Object.filter_permitted(
+            user, Folder.objects, mode='x')
+        self.fields['folder'].widget.attrs.update(
+            {'popuplink': reverse('documents_folder_add')})
+
+        if folder_id:
+            self.fields['folder'].initial = folder_id
+        else:
+            try:
+                self.fields['folder'].initial = self.fields[
+                    'folder'].queryset[0].id
+            except:
+                pass
+
+    class Meta:
+
+        "WebLink"
+        model = WebLink
+        fields = ('title', 'folder', 'url')
+
+
+class FilterForm(ModelForm):
+    """ Filter form definition """
+
+    def __init__(self, user, skip=None, *args, **kwargs):
+        if skip is None:
+            skip = []
+        super(FilterForm, self).__init__(*args, **kwargs)
+
+        self.fields['title'].label = _("Title")
+        self.fields['folder'].label = _("Folder")
+
+        if 'title' in skip:
+            del self.fields['title']
+        else:
+            self.fields['title'].required = False
+
+        if 'folder' in skip:
+            del self.fields['folder']
+        else:
+            self.fields['folder'].queryset = Object.filter_permitted(
+                user, Folder.objects, mode='x')
+            # self.fields['folder'].required = False
+            self.fields['folder'].null = True
+
+    class Meta:
+
+        "Filter"
+        model = Document
+        fields = ('title', 'folder')
diff --git a/data/treeio/treeio/treeio/documents/south_migrations/0001_initial.py b/data/treeio/treeio/treeio/documents/south_migrations/0001_initial.py
new file mode 100644
index 0000000..8942287
--- /dev/null
+++ b/data/treeio/treeio/treeio/documents/south_migrations/0001_initial.py
@@ -0,0 +1,187 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Adding model 'Folder'
+        db.create_table('documents_folder', (
+            ('object_ptr', self.gf('django.db.models.fields.related.OneToOneField')(
+                to=orm['core.Object'], unique=True, primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')
+             (max_length=255)),
+            ('parent', self.gf('django.db.models.fields.related.ForeignKey')(
+                blank=True, related_name='child_set', null=True, to=orm['documents.Folder'])),
+        ))
+        db.send_create_signal('documents', ['Folder'])
+
+        # Adding model 'File'
+        db.create_table('documents_file', (
+            ('object_ptr', self.gf('django.db.models.fields.related.OneToOneField')(
+                to=orm['core.Object'], unique=True, primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')
+             (max_length=255)),
+            ('folder', self.gf('django.db.models.fields.related.ForeignKey')
+             (to=orm['documents.Folder'])),
+            ('content', self.gf('django.db.models.fields.files.FileField')
+             (max_length=100)),
+        ))
+        db.send_create_signal('documents', ['File'])
+
+        # Adding model 'Document'
+        db.create_table('documents_document', (
+            ('object_ptr', self.gf('django.db.models.fields.related.OneToOneField')(
+                to=orm['core.Object'], unique=True, primary_key=True)),
+            ('title', self.gf('django.db.models.fields.CharField')
+             (max_length=255)),
+            ('folder', self.gf('django.db.models.fields.related.ForeignKey')
+             (to=orm['documents.Folder'])),
+            ('body', self.gf('django.db.models.fields.TextField')
+             (null=True, blank=True)),
+        ))
+        db.send_create_signal('documents', ['Document'])
+
+        # Adding model 'WebLink'
+        db.create_table('documents_weblink', (
+            ('object_ptr', self.gf('django.db.models.fields.related.OneToOneField')(
+                to=orm['core.Object'], unique=True, primary_key=True)),
+            ('title', self.gf('django.db.models.fields.CharField')
+             (max_length=255)),
+            ('folder', self.gf('django.db.models.fields.related.ForeignKey')
+             (to=orm['documents.Folder'])),
+            ('url', self.gf('django.db.models.fields.CharField')
+             (max_length=255)),
+        ))
+        db.send_create_signal('documents', ['WebLink'])
+
+    def backwards(self, orm):
+
+        # Deleting model 'Folder'
+        db.delete_table('documents_folder')
+
+        # Deleting model 'File'
+        db.delete_table('documents_file')
+
+        # Deleting model 'Document'
+        db.delete_table('documents_document')
+
+        # Deleting model 'WebLink'
+        db.delete_table('documents_weblink')
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'core.group': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Group'},
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['core.Group']"})
+        },
+        'core.object': {
+            'Meta': {'object_name': 'Object'},
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'everybody_execute': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'everybody_read': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'everybody_write': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Group']"}),
+            'group_execute': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'group_read': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'group_write': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'links': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'links_rel_+'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'nuvius_resource': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'object_name': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'object_type': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'subscribers': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'subscriptions'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'trash': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']"}),
+            'user_execute': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'user_read': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'user_write': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'core.user': {
+            'Meta': {'ordering': "['name']", 'object_name': 'User'},
+            'default_group': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'default_user_set'", 'null': 'True', 'to': "orm['core.Group']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'other_groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'documents.document': {
+            'Meta': {'ordering': "['-last_updated']", 'object_name': 'Document', '_ormbases': ['core.Object']},
+            'body': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'folder': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['documents.Folder']"}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        },
+        'documents.file': {
+            'Meta': {'ordering': "['-last_updated']", 'object_name': 'File', '_ormbases': ['core.Object']},
+            'content': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}),
+            'folder': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['documents.Folder']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'documents.folder': {
+            'Meta': {'object_name': 'Folder', '_ormbases': ['core.Object']},
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['documents.Folder']"})
+        },
+        'documents.weblink': {
+            'Meta': {'ordering': "['-last_updated']", 'object_name': 'WebLink', '_ormbases': ['core.Object']},
+            'folder': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['documents.Folder']"}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'url': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        }
+    }
+
+    complete_apps = ['documents']
diff --git a/data/treeio/treeio/treeio/events/forms.py b/data/treeio/treeio/treeio/events/forms.py
new file mode 100644
index 0000000..73cc4f9
--- /dev/null
+++ b/data/treeio/treeio/treeio/events/forms.py
@@ -0,0 +1,159 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+"""
+Events module forms
+"""
+from django import forms
+from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse
+from treeio.events.models import Event
+from treeio.core.models import Object, Location
+from treeio.core.decorators import preprocess_form
+import datetime
+preprocess_form()
+
+
+class MassActionForm(forms.Form):
+
+    """ Mass action form for Reports """
+
+    delete = forms.ChoiceField(label=_("Delete"), choices=(('', '-----'), ('delete', _('Delete Completely')),
+                                                           ('trash', _('Move to Trash'))), required=False)
+
+    instance = None
+
+    def __init__(self, user, *args, **kwargs):
+        if 'instance' in kwargs:
+            self.instance = kwargs['instance']
+            del kwargs['instance']
+
+        super(MassActionForm, self).__init__(*args, **kwargs)
+
+    def save(self, *args, **kwargs):
+        "Process form"
+
+        if self.instance:
+            if self.is_valid():
+                if self.cleaned_data['delete']:
+                    if self.cleaned_data['delete'] == 'delete':
+                        self.instance.delete()
+                    if self.cleaned_data['delete'] == 'trash':
+                        self.instance.trash = True
+                        self.instance.save()
+
+
+class EventForm(forms.ModelForm):
+
+    """ Event form """
+
+    def _set_initial(self, field, value):
+        "Sets initial value"
+
+    def __init__(self, user=None, date=None, hour=None, *args, **kwargs):
+        super(EventForm, self).__init__(*args, **kwargs)
+
+        self.fields['name'].label = _('Title')
+        self.fields['name'].widget = forms.TextInput(attrs={'size': '30'})
+        self.fields['location'].queryset = Object.filter_permitted(
+            user, Location.objects, mode='x')
+        self.fields['location'].widget.attrs.update(
+            {'popuplink': reverse('identities_location_add')})
+        self.fields['location'].widget.attrs.update({'class': 'autocomplete',
+                                                     'callback': reverse('identities_ajax_location_lookup')})
+
+        self.fields['location'].label = _("Location")
+        self.fields['start'].label = _("Start")
+        self.fields['end'].label = _("End")
+        self.fields['details'].label = _("Details")
+        self.fields['details'].widget.attrs.update({'class': 'full-editor'})
+
+        if date:
+            rdate = None
+            try:
+                rdate = datetime.datetime.strptime(date, "%Y-%m-%d")
+                if hour:
+                    hour = int(hour)
+                else:
+                    hour = 12
+                rdate = datetime.datetime(year=rdate.year,
+                                          month=rdate.month,
+                                          day=rdate.day,
+                                          hour=hour)
+                self.fields['end'].initial = rdate
+            except ValueError:
+                pass
+
+        # Set datepicker
+        self.fields['start'].widget.attrs.update({'class': 'datetimepicker'})
+        self.fields['end'].widget.attrs.update({'class': 'datetimepicker'})
+
+        if self.fields['start'].initial:
+            self.fields['start'].widget.attrs.update(
+                {'initial': (self.fields['start'].initial - datetime.datetime(1970, 1, 1)).total_seconds()})
+
+        if self.fields['end'].initial:
+            self.fields['end'].widget.attrs.update(
+                {'initial': (self.fields['end'].initial - datetime.datetime(1970, 1, 1)).total_seconds()})
+
+        if 'instance' in kwargs:
+            instance = kwargs['instance']
+            if instance.start:
+                self.fields['start'].widget.attrs.update(
+                    {'initial': (instance.start - datetime.datetime(1970, 1, 1)).total_seconds()})
+            if instance.end:
+                self.fields['end'].widget.attrs.update(
+                    {'initial': (instance.end - datetime.datetime(1970, 1, 1)).total_seconds()})
+
+    def clean_end(self):
+        "Make sure end date is greater than start date, when specified"
+        try:
+            start = self.cleaned_data['start']
+            if start:
+                end = self.cleaned_data['end']
+                if end < start:
+                    raise forms.ValidationError(
+                        _("End date can not be before the start date"))
+        except:
+            pass
+        return self.cleaned_data['end']
+
+    class Meta:
+
+        "Event"
+        model = Event
+        fields = ('name', 'location', 'start', 'end', 'details')
+
+
+class GoToDateForm(forms.Form):
+
+    """ Go to date form definition """
+
+    def __init__(self, date, *args, **kwargs):
+        super(GoToDateForm, self).__init__(*args, **kwargs)
+
+        self.fields['goto'] = forms.DateField(
+            label=_("Go to date"), required=False)
+        self.fields['goto'].widget.attrs.update({'class': 'datepicker'})
+
+
+class FilterForm(forms.Form):
+
+    """ Filters for Events """
+
+    def __init__(self, *args, **kwargs):
+        super(FilterForm, self).__init__(*args, **kwargs)
+
+        self.fields['datefrom'] = forms.DateField(label=_("Date From"))
+        self.fields['datefrom'].widget.attrs.update({'class': 'datepicker'})
+
+        self.fields['dateto'] = forms.DateField(label=_("Date To"))
+        self.fields['dateto'].widget.attrs.update({'class': 'datepicker'})
+
+    def clean_dateto(self):
+        "Clean date_to"
+        if not self.cleaned_data['dateto'] >= self.cleaned_data['datefrom']:
+            raise forms.ValidationError(
+                "From date can not be greater than To date.")
diff --git a/data/treeio/treeio/treeio/events/rendering.py b/data/treeio/treeio/treeio/events/rendering.py
new file mode 100644
index 0000000..b5653a1
--- /dev/null
+++ b/data/treeio/treeio/treeio/events/rendering.py
@@ -0,0 +1,253 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+"""
+Events module wrappers to be used for rendering
+"""
+from jinja2 import Markup
+from datetime import datetime
+from django.core.urlresolvers import reverse
+
+# Percentage of calendar cell used by events in week and day views
+CELL_WIDTH = 90
+
+
+def _smart_truncate(content, length=100, suffix='...'):
+    "Smart truncate"
+    if len(content) <= length:
+        return content
+    return content[:length].rsplit(' ', 1)[0] + suffix
+
+
+class EventRenderer:
+
+    "Basic EventRenderer, used for rendering events, independently of the underlying model"
+
+    name = ""
+    start = None
+    end = None
+    url = ""
+    markup = '<p class="%s"><a href="%s" style="%s" class="event popup-link">%s</a></p>'
+    rendered = []
+    margin_step = {}
+
+    def __init__(self, name, start, end, url, markup=None):
+        self.name = name
+        self.start = start
+        self.end = end
+        self.url = url
+
+        if markup:
+            self.markup = markup
+
+        self.rendered = []
+        self.css_class = 'calendar-event'
+        self.style = ''
+
+        self.margin_step = {}
+
+    def __unicode__(self):
+        return self.name
+
+    def is_full_day(self, date):
+        "True if the event takes place throughout the specified date"
+        if self.start and self.end and self.start.date() < date and self.end.date() > date:
+            return True
+        return False
+
+    def covers(self, date, hour):
+        "True if the event covers the given date and/or hour"
+        if self.start:
+            if self.start.date() < date and self.end.date() > date:
+                return True
+            elif self.start.date() == date and self.start.hour <= hour:
+                if self.end.date() > date:
+                    return True
+                elif self.end.date() == date and self.end.hour >= hour:
+                    if self.end.hour > hour:
+                        return True
+                    elif self.end.hour == hour and self.end.minute > 0:
+                        return True
+            elif self.start.date() < date and self.end.date() == date:
+                if self.end.hour > hour:
+                    return True
+                elif self.end.hour == hour and self.end.minute > 0:
+                    return True
+        elif self.end.date() == date and self.end.hour == hour:
+            return True
+        return False
+
+    def is_renderable(self, date, hour=None):
+        "True if the event should be rendered for the given date and hour"
+        if hour:
+            if date in self.rendered:
+                return False
+            if self.start and self.start.date() == date and self.start.hour == hour:
+                return True
+            elif self.start and self.start.date() < date and self.end.date() == date:
+                return True
+            elif self.start and self.start.date() < date and self.end.date() > date:
+                return True
+            elif not self.start and self.end.date() == date and self.end.hour == hour:
+                return True
+        else:
+            if self.start and self.start.date() == date:
+                return True
+            elif self.end and self.end.date() == date:
+                return True
+            elif self.start and self.end and self.start.date() < date < self.end.date():
+                return True
+        return False
+
+    def get_duration(self, date=None, start_hour=8, end_hour=23):
+        "Returns duration as hours (float)"
+        if date:
+            if self.start:
+                if self.start.date() < date and self.end.date() > date:
+                    return start_hour - end_hour + 1
+                else:
+                    if self.start.date() == date and self.end.date() > date:
+                        start = datetime(
+                            date.year, date.month, date.day, start_hour, 0, 0)
+                        delta = start - self.start
+                    elif self.start.date() < date and self.end.date() == date:
+                        start = datetime(
+                            date.year, date.month, date.day, start_hour, 0, 0)
+                        delta = self.end - start
+                    else:
+                        delta = self.end - self.start
+                    return float(delta.seconds // 3600) + (float(delta.seconds % 3600) / 3600)
+            else:
+                return 1
+        else:
+            if self.start and self.end:
+                return self.end - self.start
+            else:
+                return 1
+
+    def render(self, css_class='', style=''):
+        "Render event into HTML"
+        if not css_class:
+            css_class = self.css_class
+        else:
+            css_class = self.css_class + " " + css_class
+        if not style:
+            style = self.style
+        return Markup(self.markup % (css_class, self.url, style, self.name))
+
+    def render_for_date(self, date, css_class='', style=''):
+        "Render event for a certain date"
+        output = ""
+        if self.is_renderable(date):
+            output = self.render(css_class, style)
+        return output
+
+    def render_for_datehour(self, date, hour, css_class='', style=''):
+        "Render event for a certain date and hour"
+        output = ""
+        if self.is_renderable(date, hour):
+            output = self.render(css_class, style)
+            self.rendered.append(date)
+        return output
+
+
+class EventCollection:
+
+    "Set of EventWrappers available for rendering"
+    events = []
+
+    def __init__(self, raw_events=None, start_hour=8, end_hour=22):
+        "Initialize with raw_events as a list or QuerySet of Events"
+        if raw_events is None:
+            raw_events = []
+        self.events = []
+        for event in raw_events:
+            wrapper = EventRenderer(event.name, event.start, event.end,
+                                    reverse("events_event_view", args=[event.id]))
+            self.events.append(wrapper)
+
+        self.start_hour = start_hour
+        self.end_hour = end_hour
+
+    def collect_events(self, request):
+        "Gathers Events from all user modules where .get_events() callable is available"
+        modules = request.user.profile.get_perspective().get_modules()
+
+        for module in modules:
+            if request.user.profile.has_permission(module):
+                try:
+                    import_name = str(module.name) + ".events"
+                    imodule = __import__(
+                        import_name, fromlist=[str(module.name)])
+                    if hasattr(imodule, 'get_events'):
+                        collected = imodule.get_events(request)
+                        self.events.extend(collected)
+                except:
+                    pass
+
+    def renderable_events(self, date, hour):
+        "Returns the number of renderable events"
+        renderable_events = []
+
+        for event in self.events:
+            if event.covers(date, hour):
+                renderable_events.append(event)
+
+        if hour:
+            for current in renderable_events:
+                for event in self.events:
+                    if event not in renderable_events:
+                        for hour in range(self.start_hour, self.end_hour):
+                            if current.covers(date, hour) and event.covers(date, hour):
+                                renderable_events.append(event)
+                                break
+
+        return renderable_events
+
+    def render_for_date(self, date):
+        "Render all events for a certain date"
+        output = ""
+
+        for event in self.events:
+            if event.is_renderable(date):
+                output += event.render_for_date(date)
+
+        return output
+
+    def render_for_datehour(self, date, hour):
+        "Render all events for a certain date and hour"
+        output = ""
+
+        renderable_events = self.renderable_events(date, hour)
+        css_class = "calendar-event-hour"
+
+        if renderable_events:
+            width = (90.0 / len(renderable_events))
+            current_margin = 0
+            for event in renderable_events:
+                if str(date) in event.margin_step and event.margin_step[str(date)] > current_margin:
+                    current_margin = event.margin_step[str(date)]
+            for event in renderable_events:
+                if event.is_renderable(date, hour):
+                    margin = width * current_margin
+                    event.margin_step[
+                        str(date)] = current_margin = current_margin + 1
+                    if event.is_full_day(date):
+                        height = (self.end_hour - self.start_hour + 1) * 40 - 5
+                    else:
+                        duration = event.get_duration(
+                            date, self.start_hour, self.end_hour)
+                        if hour + duration > self.end_hour + 1:
+                            if event.start.date() == date:
+                                duration = self.end_hour - hour + 1
+                            else:
+                                duration = duration - hour
+                        height = duration * float(40) - 5
+                    style = "width: %.2f%%; height: %dpx; margin-left: %.2f%%" % (
+                        width, height, margin)
+                    output += event.render_for_datehour(date,
+                                                        hour, css_class, style)
+
+        return output
diff --git a/data/treeio/treeio/treeio/events/south_migrations/0001_initial.py b/data/treeio/treeio/treeio/events/south_migrations/0001_initial.py
new file mode 100644
index 0000000..564eb9b
--- /dev/null
+++ b/data/treeio/treeio/treeio/events/south_migrations/0001_initial.py
@@ -0,0 +1,182 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Adding model 'Event'
+        db.create_table('events_event', (
+            ('object_ptr', self.gf('django.db.models.fields.related.OneToOneField')(
+                to=orm['core.Object'], unique=True, primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')
+             (max_length=255)),
+            ('location', self.gf('django.db.models.fields.related.ForeignKey')
+             (to=orm['core.Location'], null=True, blank=True)),
+            ('details', self.gf('django.db.models.fields.TextField')
+             (max_length=255, null=True, blank=True)),
+            ('start', self.gf('django.db.models.fields.DateTimeField')
+             (null=True, blank=True)),
+            ('end', self.gf('django.db.models.fields.DateTimeField')()),
+        ))
+        db.send_create_signal('events', ['Event'])
+
+        # Adding model 'Invitation'
+        db.create_table('events_invitation', (
+            ('id', self.gf('django.db.models.fields.AutoField')
+             (primary_key=True)),
+            ('contact', self.gf('django.db.models.fields.related.ForeignKey')
+             (to=orm['identities.Contact'])),
+            ('event', self.gf('django.db.models.fields.related.ForeignKey')
+             (to=orm['events.Event'])),
+            ('status', self.gf('django.db.models.fields.CharField')
+             (max_length=255)),
+        ))
+        db.send_create_signal('events', ['Invitation'])
+
+    def backwards(self, orm):
+
+        # Deleting model 'Event'
+        db.delete_table('events_event')
+
+        # Deleting model 'Invitation'
+        db.delete_table('events_invitation')
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'core.group': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Group'},
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['core.Group']"})
+        },
+        'core.location': {
+            'Meta': {'object_name': 'Location', '_ormbases': ['core.Object']},
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['core.Location']"})
+        },
+        'core.object': {
+            'Meta': {'object_name': 'Object'},
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'everybody_execute': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'everybody_read': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'everybody_write': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Group']"}),
+            'group_execute': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'group_read': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'group_write': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'links': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'links_rel_+'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'nuvius_resource': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'object_name': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'object_type': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'subscribers': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'subscriptions'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'trash': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']"}),
+            'user_execute': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'user_read': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'user_write': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'core.user': {
+            'Meta': {'ordering': "['name']", 'object_name': 'User'},
+            'default_group': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'default_user_set'", 'null': 'True', 'to': "orm['core.Group']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'other_groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'events.event': {
+            'Meta': {'ordering': "['-end']", 'object_name': 'Event', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'end': ('django.db.models.fields.DateTimeField', [], {}),
+            'location': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Location']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'start': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'})
+        },
+        'events.invitation': {
+            'Meta': {'object_name': 'Invitation'},
+            'contact': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.Contact']"}),
+            'event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.Event']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'status': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        },
+        'identities.contact': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Contact', '_ormbases': ['core.Object']},
+            'contact_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.ContactType']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['identities.Contact']"}),
+            'related_group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'related_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'})
+        },
+        'identities.contactfield': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ContactField', '_ormbases': ['core.Object']},
+            'allowed_values': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'field_type': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'required': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'identities.contacttype': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ContactType', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'fields': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['identities.ContactField']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'slug': ('django.db.models.fields.CharField', [], {'max_length': '256'})
+        }
+    }
+
+    complete_apps = ['events']
diff --git a/data/treeio/treeio/treeio/finance/api/handlers.py b/data/treeio/treeio/treeio/finance/api/handlers.py
new file mode 100644
index 0000000..a346f27
--- /dev/null
+++ b/data/treeio/treeio/treeio/finance/api/handlers.py
@@ -0,0 +1,240 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+# -*- coding: utf-8 -*-
+
+from __future__ import absolute_import, with_statement
+
+__all__ = ['CurrencyHandler', 'TaxHandler', 'CategoryHandler', 'AssetHandler',
+           'AccountHandler', 'EquityHandler', 'LiabilityHandler',
+           'TransactionHandler']
+
+from django.core.exceptions import ObjectDoesNotExist
+
+from treeio.core.api.utils import rc
+from treeio.sales.models import SaleOrder
+from treeio.finance.helpers import convert
+from treeio.sales.forms import dict_currencies
+from treeio.core.api.handlers import ObjectHandler
+from treeio.finance.models import Currency, Tax, Category, Asset, Account, Equity, Liability, Transaction
+from treeio.finance.forms import TransactionForm, LiabilityForm, AccountForm, EquityForm, AssetForm, \
+    CategoryForm, CurrencyForm, TaxForm
+
+
+class FinanceCommonHandler(ObjectHandler):
+    def check_create_permission(self, request, mode):
+        return True  # request.user.profile.is_admin('treeio.finance')
+
+    def check_instance_permission(self, request, inst, mode):
+        return request.user.profile.has_permission(inst, mode=mode) \
+               or request.user.profile.is_admin('treeio.finance')
+
+
+class CurrencyHandler(ObjectHandler):
+    """ Process Currency objects"""
+
+    model = Currency
+    form = CurrencyForm
+
+    @classmethod
+    def resource_uri(cls, obj=None):
+        object_id = "id"
+        if obj is not None:
+            object_id = obj.id
+        return ('api_finance_currencies', [object_id])
+
+    def create(self, request, *args, **kwargs):
+        if request.data is None:
+            return rc.BAD_REQUEST
+
+        if not self.check_create_permission(request, "x"):
+            return rc.FORBIDDEN
+
+        currency = Currency()
+        form = CurrencyForm(
+            request.user.profile, request.data, instance=currency)
+        if form.is_valid():
+            currency = form.save(commit=False)
+            cname = dict_currencies[currency.code]
+            currency.name = cname[cname.index(' ') + 2:]
+            # currency.factor = 1.0 #Get currency conversion here
+            currency.save()
+            currency.set_user_from_request(request)
+            return currency
+        else:
+            self.status = 400
+            return form.errors
+
+
+class TaxHandler(FinanceCommonHandler):
+    model = Tax
+    form = TaxForm
+
+    @classmethod
+    def resource_uri(cls, obj=None):
+        object_id = "id"
+        if obj is not None:
+            object_id = obj.id
+        return ('api_finance_taxes', [object_id])
+
+
+class CategoryHandler(FinanceCommonHandler):
+    model = Category
+    form = CategoryForm
+
+    @classmethod
+    def resource_uri(cls, obj=None):
+        object_id = "id"
+        if obj is not None:
+            object_id = obj.id
+        return ('api_finance_categories', [object_id])
+
+
+class AssetHandler(FinanceCommonHandler):
+    model = Asset
+    form = AssetForm
+
+    @classmethod
+    def resource_uri(cls, obj=None):
+        object_id = "id"
+        if obj is not None:
+            object_id = obj.id
+        return ('api_finance_assets', [object_id])
+
+
+class AccountHandler(FinanceCommonHandler):
+    model = Account
+    form = AccountForm
+
+    @classmethod
+    def resource_uri(cls, obj=None):
+        object_id = "id"
+        if obj is not None:
+            object_id = obj.id
+        return ('api_finance_accounts', [object_id])
+
+    def create(self, request, *args, **kwargs):
+        if request.data is None:
+            return rc.BAD_REQUEST
+
+        if not self.check_create_permission(request, "x"):
+            return rc.FORBIDDEN
+
+        account = Account()
+        form = AccountForm(
+            request.user.profile, request.data, instance=account)
+        if form.is_valid():
+            account = form.save(commit=False)
+            convert(account, 'balance')
+            account.set_user_from_request(request)
+            return account
+        else:
+            self.status = 400
+            return form.errors
+
+
+class EquityHandler(FinanceCommonHandler):
+    model = Equity
+    form = EquityForm
+
+    @classmethod
+    def resource_uri(cls, obj=None):
+        object_id = "id"
+        if obj is not None:
+            object_id = obj.id
+        return ('api_finance_equities', [object_id])
+
+
+class LiabilityHandler(FinanceCommonHandler):
+    model = Liability
+    form = LiabilityForm
+
+    @classmethod
+    def resource_uri(cls, obj=None):
+        object_id = "id"
+        if obj is not None:
+            object_id = obj.id
+        return ('api_finance_liabilities', [object_id])
+
+    def create(self, request, *args, **kwargs):
+        if request.data is None:
+            return rc.BAD_REQUEST
+
+        # if not self.check_create_permission(request, "x"):
+        #    return rc.FORBIDDEN
+
+        liability = self.model()
+        form = self.form(
+            request.user.profile, request.data, instance=liability)
+        if form.is_valid():
+            liability = form.save(commit=False)
+            liability.source = liability.account.owner
+            convert(liability, 'value')
+            liability.set_user_from_request(request)
+            return liability
+        else:
+            self.status = 400
+            return form.errors
+
+
+class TransactionHandler(FinanceCommonHandler):
+    model = Transaction
+    form = TransactionForm
+
+    @classmethod
+    def resource_uri(cls, obj=None):
+        object_id = "id"
+        if obj is not None:
+            object_id = obj.id
+        return ('api_finance_transactions', [object_id])
+
+    def create(self, request, *args, **kwargs):
+        if request.data is None:
+            return rc.BAD_REQUEST
+
+        # if not self.check_create_permission(request, "x"):
+        #    return rc.FORBIDDEN
+
+        transaction = self.model()
+        form = self.form(
+            request.user.profile, None, None, request.POST, instance=transaction)
+        if form.is_valid():
+            transaction = form.save(commit=False)
+            convert(transaction, 'value')
+            transaction.set_user_from_request(request)
+            if "order" in request.data:
+                try:
+                    order = SaleOrder.objects.get(pk=request.data['order'])
+                    order.payment.add(transaction)
+                    order.save()
+                except:
+                    pass
+            return transaction
+        else:
+            self.status = 400
+            return form.errors
+
+    def update(self, request, *args, **kwargs):
+
+        pkfield = kwargs.get(self.model._meta.pk.name) or request.data.get(
+            self.model._meta.pk.name)
+
+        if not pkfield:
+            return rc.BAD_REQUEST
+
+        try:
+            obj = self.model.objects.get(pk=pkfield)
+        except ObjectDoesNotExist:
+            return rc.NOT_FOUND
+
+        form = self.form(
+            request.user.profile, None, None, request.data, instance=obj)
+        if form.is_valid():
+            transaction = form.save(commit=False)
+            convert(transaction, 'value')
+            return transaction
+        else:
+            self.status = 400
+            return form.errors
diff --git a/data/treeio/treeio/treeio/finance/forms.py b/data/treeio/treeio/treeio/finance/forms.py
new file mode 100644
index 0000000..f815385
--- /dev/null
+++ b/data/treeio/treeio/treeio/finance/forms.py
@@ -0,0 +1,782 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+"""
+Finance module forms
+"""
+from django.shortcuts import get_object_or_404
+from django import forms
+from treeio.identities.models import Contact
+from treeio.finance.models import Transaction, Liability, Category, Account, Asset, Equity, Currency, Tax
+from treeio.sales.models import SaleOrder
+from treeio.core.models import Object, ModuleSetting
+from django.core.urlresolvers import reverse
+from treeio.core.decorators import preprocess_form
+from django.utils.translation import ugettext as _
+from treeio.sales.forms import standard_currencies
+
+preprocess_form()
+
+
+class MassActionForm(forms.Form):
+    """ Mass action form for Transactions & Liabilities """
+
+    category = forms.ModelChoiceField(queryset=[], required=False)
+    delete = forms.ChoiceField(label=_("Delete"), choices=(('', '-----'), ('delete', _('Delete Completely')),
+                                                           ('trash', _('Move to Trash'))), required=False)
+
+    instance = None
+
+    def __init__(self, user, *args, **kwargs):
+        if 'instance' in kwargs:
+            self.instance = kwargs['instance']
+            del kwargs['instance']
+
+        super(MassActionForm, self).__init__(*args, **kwargs)
+        self.fields['delete'] = forms.ChoiceField(label=_("Delete"), choices=(('', '-----'),
+                                                                              ('delete', _(
+                                                                                  'Delete Completely')),
+                                                                              ('trash', _('Move to Trash'))),
+                                                  required=False)
+
+        self.fields['category'].label = _("Category")
+        self.fields['category'].queryset = Object.filter_permitted(
+            user, Category.objects, mode='x')
+        self.fields['category'].label = _("Add to Category:")
+
+    def save(self, *args, **kwargs):
+        "Process form"
+
+        if self.instance:
+            if self.is_valid():
+                if self.cleaned_data['category']:
+                    self.instance.category = self.cleaned_data['category']
+                self.instance.save()
+                if self.cleaned_data['delete']:
+                    if self.cleaned_data['delete'] == 'delete':
+                        self.instance.delete()
+                    if self.cleaned_data['delete'] == 'trash':
+                        self.instance.trash = True
+                        self.instance.save()
+
+
+class CategoryForm(forms.ModelForm):
+    """ Category form """
+
+    def __init__(self, user, *args, **kwargs):
+        super(CategoryForm, self).__init__(*args, **kwargs)
+
+        self.fields['name'].label = _("Name")
+        self.fields['details'].label = _("Details")
+
+    class Meta:
+        "Category Form"
+        model = Category
+        fields = ('name', 'details')
+
+
+class AccountForm(forms.ModelForm):
+    """ Account form """
+
+    def __init__(self, user, *args, **kwargs):
+        super(AccountForm, self).__init__(*args, **kwargs)
+
+        self.fields['name'].label = _("Name")
+
+        self.fields['owner'].label = _("Owner")
+        self.fields['owner'].queryset = Object.filter_permitted(
+            user, Contact.objects)
+        self.fields['owner'].widget.attrs.update({'class': 'autocomplete',
+                                                  'callback': reverse('identities_ajax_contact_lookup')})
+        self.fields['owner'].widget.attrs.update(
+            {'popuplink': reverse('identities_contact_add')})
+
+        self.fields['balance_currency'].label = _("Currency")
+        self.fields['balance_currency'].widget.attrs.update(
+            {'popuplink': reverse('finance_currency_add')})
+        try:
+            self.fields['balance_currency'].initial = Currency.objects.get(
+                is_default=True)
+        except:
+            pass
+        self.fields['balance_display'].label = _("Initial Balance")
+
+        self.fields['details'].label = _("Details")
+
+    class Meta:
+
+        "Account Form"
+        model = Account
+        fields = (
+            'name', 'owner', 'balance_currency', 'balance_display', 'details')
+
+
+class AccountFilterForm(forms.ModelForm):
+    """ Filters definition """
+
+    def __init__(self, user, skip=None, *args, **kwargs):
+        if skip is None:
+            skip = []
+        super(AccountFilterForm, self).__init__(*args, **kwargs)
+
+        if 'owner' in skip:
+            del self.fields['owner']
+        else:
+            self.fields['owner'].queryset = Object.filter_permitted(
+                user, Contact.objects)
+            self.fields['owner'].required = False
+            self.fields['owner'].label = _("Owner")
+            self.fields['owner'].help_text = ""
+            self.fields['owner'].widget.attrs.update({'class': 'autocomplete',
+                                                      'callback': reverse('identities_ajax_contact_lookup')})
+
+    class Meta:
+
+        "Account Filter Form"
+        model = Account
+        fields = ['owner']
+
+
+class AssetForm(forms.ModelForm):
+    """ Asset form """
+
+    def __init__(self, user, *args, **kwargs):
+        super(AssetForm, self).__init__(*args, **kwargs)
+
+        self.fields['name'].label = _("Name")
+        self.fields['asset_type'].label = _("Asset type")
+        self.fields['initial_value'].label = _("Initial value")
+        self.fields['lifetime'].label = _("Lifetime (years)")
+        self.fields['endlife_value'].label = _("Endlife value")
+        self.fields['depreciation_rate'].label = _("Depreciation rate")
+        self.fields['purchase_date'].label = _("Purchase date")
+        self.fields['purchase_date'].widget.attrs.update(
+            {'class': 'datepicker'})
+        self.fields['current_value'].label = _("Current value")
+        self.fields['owner'].queryset = Object.filter_permitted(
+            user, Contact.objects)
+        self.fields['owner'].widget.attrs.update({'class': 'autocomplete',
+                                                  'callback': reverse('identities_ajax_contact_lookup')})
+        self.fields['owner'].widget.attrs.update(
+            {'popuplink': reverse('identities_contact_add')})
+
+    class Meta:
+        "Asset Form"
+        model = Asset
+        fields = ('name', 'asset_type', 'initial_value', 'lifetime', 'endlife_value',
+                  'depreciation_rate', 'depreciation_type', 'purchase_date', 'current_value', 'owner')
+
+
+class AssetFilterForm(forms.ModelForm):
+    """ Filters definition """
+
+    def __init__(self, user, skip=None, *args, **kwargs):
+        if skip is None:
+            skip = []
+        super(AssetFilterForm, self).__init__(*args, **kwargs)
+
+        if 'purchase_date_from' in skip:
+            del self.fields['purchase_date_from']
+        else:
+            self.fields['purchase_date_from'] = forms.DateField(label="Purchase Date From:",
+                                                                required=False)
+            self.fields['purchase_date_from'].widget.attrs.update(
+                {'class': 'datepicker'})
+            self.fields['purchase_date_from'].label = _("Purchase Date From")
+
+        if 'purchase_date_to' in skip:
+            del self.fields['purchase_date_to']
+        else:
+            self.fields['purchase_date_to'] = forms.DateField(
+                label="Purchase Date To:", required=False)
+            self.fields['purchase_date_to'].widget.attrs.update(
+                {'class': 'datepicker'})
+            self.fields['purchase_date_to'].label = _("Purchase Date To")
+
+        if 'asset_type' in skip:
+            del self.fields['asset_type']
+        else:
+            self.fields['asset_type'].label = _("Asset Type")
+            self.fields['asset_type'].help_text = ""
+            self.fields['asset_type'].required = False
+
+        if 'owner' in skip:
+            del self.fields['owner']
+        else:
+            self.fields['owner'].queryset = Object.filter_permitted(
+                user, Contact.objects)
+            self.fields['owner'].required = False
+            self.fields['owner'].label = _("Owner")
+            self.fields['owner'].help_text = ""
+            self.fields['owner'].widget.attrs.update({'class': 'autocomplete',
+                                                      'callback': reverse('identities_ajax_contact_lookup')})
+
+    class Meta:
+
+        "Asset Filter Form"
+        model = Asset
+        fields = ('owner', 'asset_type')
+
+
+class EquityForm(forms.ModelForm):
+    """ Equity form """
+
+    def __init__(self, user, *args, **kwargs):
+        super(EquityForm, self).__init__(*args, **kwargs)
+
+        self.fields['equity_type'].label = _("Equity type")
+        self.fields['issue_price'].label = _("Issue price")
+        self.fields['sell_price'].label = _("Sell price")
+        self.fields['issuer'].label = _("Issuer")
+        self.fields['owner'].label = _("Owner")
+        self.fields['amount'].label = _("Quantity")
+        self.fields['purchase_date'].label = _("Purchase date")
+        self.fields['details'].label = _("Details")
+
+        self.fields['owner'].queryset = Object.filter_permitted(
+            user, Contact.objects)
+        self.fields['owner'].widget.attrs.update({'class': 'autocomplete',
+                                                  'callback': reverse('identities_ajax_contact_lookup')})
+        self.fields['owner'].widget.attrs.update(
+            {'popuplink': reverse('identities_contact_add')})
+        self.fields['issuer'].queryset = Object.filter_permitted(
+            user, Contact.objects)
+        self.fields['issuer'].widget.attrs.update({'class': 'autocomplete',
+                                                   'callback': reverse('identities_ajax_contact_lookup')})
+        self.fields['issuer'].widget.attrs.update(
+            {'popuplink': reverse('identities_contact_add')})
+        try:
+            conf = ModuleSetting.get_for_module(
+                'treeio.finance', 'my_company')[0]
+            self.fields['issuer'].initial = long(conf.value)
+        except Exception:
+            pass
+
+        self.fields['purchase_date'].widget.attrs.update(
+            {'class': 'datepicker'})
+
+    class Meta:
+
+        "Equity Form"
+        model = Equity
+        fields = ('equity_type', 'issue_price', 'sell_price', 'issuer',
+                  'owner', 'amount', 'purchase_date', 'details')
+
+
+class EquityFilterForm(forms.ModelForm):
+    """ Filters definition """
+
+    def __init__(self, user, skip=None, *args, **kwargs):
+        if skip is None:
+            skip = []
+        super(EquityFilterForm, self).__init__(*args, **kwargs)
+
+        if 'purchase_date_from' in skip:
+            del self.fields['purchase_date_from']
+        else:
+            self.fields['purchase_date_from'] = forms.DateField(label="Purchase Date From:",
+                                                                required=False)
+            self.fields['purchase_date_from'].widget.attrs.update(
+                {'class': 'datepicker'})
+            self.fields['purchase_date_from'].label = _("Purchase Date From")
+
+        if 'purchase_date_to' in skip:
+            del self.fields['purchase_date_to']
+        else:
+            self.fields['purchase_date_to'] = forms.DateField(
+                label="Purchase Date To:", required=False)
+            self.fields['purchase_date_to'].widget.attrs.update(
+                {'class': 'datepicker'})
+            self.fields['purchase_date_to'].label = _("Purchase Date To")
+
+        if 'equity_type' in skip:
+            del self.fields['equity_type']
+        else:
+            self.fields['equity_type'].label = _("Equity Type")
+            self.fields['equity_type'].help_text = ""
+            self.fields['equity_type'].required = False
+
+        if 'issuer' in skip:
+            del self.fields['issuer']
+        else:
+            self.fields['issuer'].queryset = Object.filter_permitted(
+                user, Contact.objects)
+            self.fields['issuer'].label = _("Issuer")
+            self.fields['issuer'].help_text = ""
+            self.fields['issuer'].required = False
+            self.fields['issuer'].widget.attrs.update({'class': 'autocomplete',
+                                                       'callback': reverse('identities_ajax_contact_lookup')})
+
+        if 'owner' in skip:
+            del self.fields['owner']
+        else:
+            self.fields['owner'].queryset = Object.filter_permitted(
+                user, Contact.objects)
+            self.fields['owner'].required = False
+            self.fields['owner'].label = _("Owner")
+            self.fields['owner'].help_text = ""
+            self.fields['owner'].widget.attrs.update({'class': 'autocomplete',
+                                                      'callback': reverse('identities_ajax_contact_lookup')})
+
+    class Meta:
+
+        "Equity Filter Form"
+        model = Equity
+        fields = ('issuer', 'owner', 'equity_type')
+
+
+class ReceivableForm(forms.ModelForm):
+    """ Receivable form """
+
+    def __init__(self, user, *args, **kwargs):
+        super(ReceivableForm, self).__init__(*args, **kwargs)
+
+        self.fields['name'].label = _("Name")
+        self.fields['category'].label = _("Category")
+        self.fields['source'].label = _("Source")
+        self.fields['target'].label = _("Target")
+        self.fields['account'].label = _("Bank Account")
+        self.fields['due_date'].label = _("Due date")
+        self.fields['value_currency'].label = _("Currency")
+        self.fields['value_currency'].widget.attrs.update(
+            {'popuplink': reverse('finance_currency_add')})
+        self.fields['value_currency'].initial = Currency.objects.get(
+            is_default=True)
+        self.fields['value_display'].label = _("Value")
+        self.fields['details'].label = _("Details")
+
+        self.fields['source'].queryset = Object.filter_permitted(
+            user, Contact.objects)
+        self.fields['source'].widget.attrs.update({'class': 'autocomplete',
+                                                   'callback': reverse('identities_ajax_contact_lookup')})
+        self.fields['source'].widget.attrs.update(
+            {'popuplink': reverse('identities_contact_add')})
+
+        self.fields['account'].queryset = Object.filter_permitted(
+            user, Account.objects)
+
+        try:
+            conf = ModuleSetting.get_for_module(
+                'treeio.finance', 'default_account')[0]
+            self.fields['account'].initial = long(conf.value)
+        except Exception:
+            pass
+
+        self.fields['due_date'].widget.attrs.update({'class': 'datepicker'})
+
+        del self.fields['target']
+
+    class Meta:
+
+        "Receivable Form"
+        model = Liability
+        fields = ('name', 'category', 'source', 'target', 'account',
+                  'due_date', 'value_currency', 'value_display', 'details')
+
+
+class TransactionForm(forms.ModelForm):
+    """ Transaction form """
+
+    def __init__(self, user, liability_id=None, order_id=None, *args, **kwargs):
+        super(TransactionForm, self).__init__(*args, **kwargs)
+
+        self.fields['name'].label = _("Description")
+        self.fields['category'].label = _("Category")
+        self.fields['source'].label = _("Source")
+        self.fields['target'].label = _("Target")
+        self.fields['account'].label = _("Bank Account")
+        self.fields['datetime'].label = _("Date & Time")
+        self.fields['value_currency'].label = _("Currency")
+        self.fields['value_currency'].widget.attrs.update(
+            {'popuplink': reverse('finance_currency_add')})
+        self.fields['value_currency'].initial = Currency.objects.get(
+            is_default=True)
+        self.fields['value_display'].label = _("Value")
+        self.fields['details'].label = _("Details")
+
+        self.fields['source'].queryset = Object.filter_permitted(
+            user, Contact.objects)
+        self.fields['target'].queryset = Object.filter_permitted(
+            user, Contact.objects)
+
+        self.fields['source'].widget.attrs.update({'class': 'autocomplete',
+                                                   'callback': reverse('identities_ajax_contact_lookup')})
+        self.fields['target'].widget.attrs.update({'class': 'autocomplete',
+                                                   'callback': reverse('identities_ajax_contact_lookup')})
+
+        self.fields['source'].widget.attrs.update(
+            {'popuplink': reverse('identities_contact_add')})
+        self.fields['target'].widget.attrs.update(
+            {'popuplink': reverse('identities_contact_add')})
+
+        self.fields['datetime'].widget.attrs.update(
+            {'class': 'datetimepicker'})
+
+        self.fields['account'].queryset = Object.filter_permitted(
+            user, Account.objects)
+
+        try:
+            conf = ModuleSetting.get_for_module(
+                'treeio.finance', 'default_account')[0]
+            self.fields['account'].initial = long(conf.value)
+        except Exception:
+            pass
+
+        self.fields['liability'].queryset = Object.filter_permitted(
+            user, Liability.objects)
+        self.fields['liability'].label = _("Liability / Receivable")
+
+        if order_id:
+            order = get_object_or_404(SaleOrder, pk=order_id)
+            self.fields['name'].initial = order.reference
+            if order.client:
+                self.fields['source'].initial = order.client
+
+            # default company
+            try:
+                conf = ModuleSetting.get_for_module(
+                    'treeio.finance', 'my_company')[0]
+                self.fields['target'].initial = Contact.objects.get(
+                    pk=long(conf.value))
+
+            except Exception:
+                pass
+            self.fields['details'].initial = order.details
+            self.fields['value_display'].initial = order.balance_due()
+            self.fields['value_currency'].initial = order.currency
+
+        if liability_id:
+            self.fields['liability'].initial = liability_id
+            liability = get_object_or_404(Liability, pk=liability_id)
+            self.fields['name'].initial = liability.name
+            self.fields['source'].initial = liability.source
+            self.fields['target'].initial = liability.target
+            self.fields['details'].initial = liability.details
+            self.fields['category'].initial = liability.category
+            self.fields['account'].initial = liability.account
+            self.fields['value_display'].initial = liability.value_display
+            self.fields['value_currency'].initial = liability.value_currency
+
+    class Meta:
+
+        "Transaction Form"
+        model = Transaction
+        fields = ('name', 'category', 'source', 'target', 'account',
+                  'datetime', 'liability', 'value_currency', 'value_display', 'details')
+
+
+class TransactionFilterForm(forms.ModelForm):
+    """ Filters definition """
+
+    def __init__(self, user, skip=None, *args, **kwargs):
+        if skip is None:
+            skip = []
+        super(TransactionFilterForm, self).__init__(*args, **kwargs)
+
+        if 'datefrom' in skip:
+            del self.fields['datefrom']
+            del self.fields['dateto']
+        else:
+            self.fields['datefrom'] = forms.DateField(
+                label=_("Date From"), required=False)
+            self.fields['datefrom'].widget.attrs.update(
+                {'class': 'datepicker'})
+
+        if 'dateto' in skip:
+            del self.fields['dateto']
+            del self.fields['datefrom']
+        else:
+            self.fields['dateto'] = forms.DateField(
+                label=_("Date To"), required=False)
+            self.fields['dateto'].widget.attrs.update({'class': 'datepicker'})
+
+        if 'category' in skip:
+            del self.fields['category']
+        else:
+            self.fields['category'].queryset = Object.filter_permitted(
+                user, Category.objects)
+            self.fields['category'].label = _("Category")
+            self.fields['category'].help_text = ""
+            self.fields['category'].required = False
+
+        if 'source' in skip:
+            del self.fields['source']
+        else:
+            self.fields['source'].queryset = Object.filter_permitted(
+                user, Contact.objects)
+            self.fields['source'].label = _("Source")
+            self.fields['source'].help_text = ""
+            self.fields['source'].required = False
+            self.fields['source'].widget.attrs.update({'class': 'autocomplete',
+                                                       'callback': reverse('identities_ajax_contact_lookup')})
+
+        if 'target' in skip:
+            del self.fields['target']
+        else:
+            self.fields['target'].queryset = Object.filter_permitted(
+                user, Contact.objects)
+            self.fields['target'].required = False
+            self.fields['target'].label = _("Target")
+            self.fields['target'].help_text = ""
+            self.fields['target'].widget.attrs.update({'class': 'autocomplete',
+                                                       'callback': reverse('identities_ajax_contact_lookup')})
+
+    class Meta:
+
+        "Transaction Filter Form"
+        model = Transaction
+        fields = ('category', 'source', 'target')
+
+
+class LiabilityForm(forms.ModelForm):
+    """ Folder form """
+
+    def __init__(self, user, *args, **kwargs):
+        super(LiabilityForm, self).__init__(*args, **kwargs)
+
+        self.fields['name'].label = _("Name")
+        self.fields['category'].label = _("Category")
+        self.fields['source'].label = _("Source")
+        self.fields['target'].label = _("Target")
+        self.fields['account'].label = _("Bank Account")
+        self.fields['due_date'].label = _("Due date")
+        self.fields['value_currency'].label = _("Currency")
+        self.fields['value_currency'].widget.attrs.update(
+            {'popuplink': reverse('finance_currency_add')})
+        self.fields['value_currency'].initial = Currency.objects.get(
+            is_default=True)
+        self.fields['value_display'].label = _("Value")
+        self.fields['details'].label = _("Details")
+
+        self.fields['target'].queryset = Object.filter_permitted(
+            user, Contact.objects)
+        self.fields['target'].widget.attrs.update({'class': 'autocomplete',
+                                                   'callback': reverse('identities_ajax_contact_lookup')})
+        self.fields['target'].widget.attrs.update(
+            {'popuplink': reverse('identities_contact_add')})
+
+        self.fields['account'].queryset = Object.filter_permitted(
+            user, Account.objects)
+
+        try:
+            conf = ModuleSetting.get_for_module(
+                'treeio.finance', 'default_account')[0]
+            self.fields['account'].initial = long(conf.value)
+        except Exception:
+            pass
+
+        self.fields['due_date'].widget.attrs.update({'class': 'datepicker'})
+
+        del self.fields['source']
+
+    class Meta:
+
+        "Liability Form"
+        model = Liability
+        fields = ('name', 'category', 'source', 'target', 'account',
+                  'due_date', 'value_currency', 'value_display', 'details')
+
+
+class LiabilityFilterForm(forms.ModelForm):
+    """ Filters definition """
+
+    def __init__(self, user, skip=None, *args, **kwargs):
+        if skip is None:
+            skip = []
+        super(LiabilityFilterForm, self).__init__(*args, **kwargs)
+
+        if 'due_date_from' in skip:
+            del self.fields['due_date_from']
+        else:
+            self.fields['due_date_from'] = forms.DateField(
+                label=_("Due Date From:"), required=False)
+            self.fields['due_date_from'].widget.attrs.update(
+                {'class': 'datepicker'})
+
+        if 'due_date_to' in skip:
+            del self.fields['due_date_to']
+        else:
+            self.fields['due_date_to'] = forms.DateField(
+                label=_("Due Date To:"), required=False)
+            self.fields['due_date_to'].widget.attrs.update(
+                {'class': 'datepicker'})
+
+        if 'category' in skip:
+            del self.fields['category']
+        else:
+            self.fields['category'].queryset = Object.filter_permitted(
+                user, Category.objects)
+            self.fields['category'].label = _("Category")
+            self.fields['category'].help_text = ""
+            self.fields['category'].required = False
+
+        if 'source' in skip:
+            del self.fields['source']
+        else:
+            self.fields['source'].queryset = Object.filter_permitted(
+                user, Contact.objects)
+            self.fields['source'].label = _("Source")
+            self.fields['source'].help_text = ""
+            self.fields['source'].required = False
+            self.fields['source'].widget.attrs.update({'class': 'autocomplete',
+                                                       'callback': reverse('identities_ajax_contact_lookup')})
+
+        if 'target' in skip:
+            del self.fields['target']
+        else:
+            self.fields['target'].queryset = Object.filter_permitted(
+                user, Contact.objects)
+            self.fields['target'].required = False
+            self.fields['target'].label = _("Target")
+            self.fields['target'].help_text = ""
+            self.fields['target'].widget.attrs.update({'class': 'autocomplete',
+                                                       'callback': reverse('identities_ajax_contact_lookup')})
+
+        if 'account' in skip:
+            del self.fields['account']
+        else:
+            self.fields['account'].queryset = Object.filter_permitted(
+                user, Account.objects)
+            self.fields['account'].required = False
+            self.fields['account'].label = _("Account")
+            self.fields['account'].help_text = ""
+
+    class Meta:
+
+        "Liability Filter Form"
+        model = Liability
+        fields = ('category', 'source', 'target', 'account')
+
+
+class SettingsForm(forms.Form):
+    """ Administration settings form """
+
+    default_currency = forms.ModelChoiceField(
+        label='Base Currency', queryset=[])
+    my_company = forms.ModelChoiceField(label='My Company', queryset=[])
+    default_account = forms.ModelChoiceField(
+        label='Default Account', queryset=[])
+
+    def __init__(self, user, *args, **kwargs):
+        "Sets choices and initial value"
+        super(SettingsForm, self).__init__(*args, **kwargs)
+
+        self.fields['my_company'].queryset = Object.filter_permitted(
+            user, Contact.objects)
+        self.fields['my_company'].widget.attrs.update({'class': 'autocomplete',
+                                                       'callback': reverse('identities_ajax_contact_lookup')})
+        self.fields['default_account'].queryset = Object.filter_permitted(
+            user, Account.objects)
+
+        # Translation
+        self.fields['default_currency'].label = _('Base Currency')
+        self.fields['my_company'].label = _('My Company')
+        self.fields['default_account'].label = _('Default Account')
+
+        try:
+            self.fields['default_currency'].widget.attrs.update(
+                {'popuplink': reverse('finance_currency_add')})
+            self.fields['default_currency'].queryset = Currency.objects.all()
+            self.fields['default_currency'].initial = Currency.objects.get(
+                is_default=True)
+        except Exception:
+            pass
+
+        try:
+            conf = ModuleSetting.get_for_module(
+                'treeio.finance', 'my_company')[0]
+            my_company = Contact.objects.get(pk=long(conf.value))
+            self.fields['my_company'].initial = my_company.id
+        except Exception:
+            pass
+
+        try:
+            conf = ModuleSetting.get_for_module(
+                'treeio.finance', 'default_account')[0]
+            default_account = Account.objects.get(pk=long(conf.value))
+            self.fields['default_account'].initial = default_account.id
+        except Exception:
+            pass
+
+    def clean_my_company(self, *args, **kwargs):
+        "Check that my company has an account"
+        my_company = self.cleaned_data['my_company']
+
+        if not my_company.account_set.count():
+            raise forms.ValidationError(
+                _("Your company has to have at least one Financial Account"))
+
+        return my_company
+
+    def clean_default_account(self):
+        "Check that account owner is the same as my company"
+        account = self.cleaned_data['default_account']
+        try:
+            company = self.cleaned_data['my_company']
+
+            if not account.owner_id == company.id:
+                raise forms.ValidationError(
+                    _("Default Account has to belong to your company"))
+
+        except KeyError:
+            pass
+
+        return account
+
+    def save(self):
+        "Form processor"
+        try:
+            ModuleSetting.set_for_module('my_company',
+                                         self.cleaned_data['my_company'].id,
+                                         'treeio.finance')
+            ModuleSetting.set_for_module('default_account',
+                                         self.cleaned_data[
+                                             'default_account'].id,
+                                         'treeio.finance')
+            currency = Currency.objects.get(
+                pk=self.cleaned_data['default_currency'])
+            currency.is_default = True
+            currency.save()
+            return True
+
+        except Exception:
+            return False
+
+
+#
+# Currency
+#
+
+
+class CurrencyForm(forms.ModelForm):
+    "Currency Form"
+
+    code = forms.ChoiceField(
+        label=_("Currency Code"), choices=standard_currencies)
+
+    def __init__(self, user, *args, **kwargs):
+        super(CurrencyForm, self).__init__(*args, **kwargs)
+
+    class Meta:
+        "Currency Form"
+        model = Currency
+        fields = ('name', 'code', 'symbol', 'factor')  # ,'is_active')
+
+
+#
+# Tax
+#
+
+
+class TaxForm(forms.ModelForm):
+    "Tax Form"
+
+    def __init__(self, user, *args, **kwargs):
+        super(TaxForm, self).__init__(*args, **kwargs)
+
+    class Meta:
+        "Tax Form"
+        model = Tax
+        fields = ('name', 'rate', 'compound')
diff --git a/data/treeio/treeio/treeio/finance/models.py b/data/treeio/treeio/treeio/finance/models.py
new file mode 100644
index 0000000..14cef2a
--- /dev/null
+++ b/data/treeio/treeio/treeio/finance/models.py
@@ -0,0 +1,349 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+"""
+Finance module objects
+"""
+
+from django.db import models
+from treeio.core.models import Object
+from treeio.identities.models import Contact
+from datetime import datetime
+from django.core.urlresolvers import reverse
+from django.utils.translation import ugettext as _
+import math
+from decimal import Decimal, ROUND_UP
+
+
+class Currency(Object):
+
+    "Currency Object"
+
+    code = models.CharField(_('code'), max_length=3)
+    name = models.CharField(_('name'), max_length=255)
+    symbol = models.CharField(_('symbol'), max_length=1, blank=True, null=True,
+                              help_text=_('If no symbol is entered, the 3 letter code will be used.'))
+    factor = models.DecimalField(_('factor'), max_digits=10, decimal_places=4,
+                                 help_text=_(
+                                     'Specifies the ratio to the base currency, e.g. 1.324'),
+                                 default=1)
+    is_active = models.BooleanField(_('active'), default=True,
+                                    help_text=_('The currency will be updated with daily exchange rates.'))
+    is_default = models.BooleanField(_('default'), default=False,
+                                     help_text=_('Make this the default currency.'))
+
+    class Meta:
+        verbose_name = _('currency')
+        verbose_name_plural = _('currencies')
+
+    def __unicode__(self):
+        # return self.code
+        if self.symbol:
+            return "%s    %s" % (self.symbol, self.name)
+        else:
+            return "%s  %s" % (self.code, self.name)
+
+    def save(self, **kwargs):
+        try:
+            default_currency = Currency.objects.get(is_default=True)
+            if self.is_default and not self == default_currency:
+                default_currency.is_default = False
+                default_currency.save()
+        except:
+            pass
+        super(Currency, self).save(**kwargs)
+
+
+class Tax(Object):
+
+    """ Tax model """
+    name = models.CharField(max_length=512)
+    rate = models.DecimalField(max_digits=4, decimal_places=2)
+    compound = models.BooleanField(default=False)
+
+    def __unicode__(self):
+        # return self in unicode
+        return unicode(self.name)
+
+
+class Category(Object):
+
+    """ Category model """
+    name = models.CharField(max_length=512)
+    details = models.TextField(blank=True, null=True)
+
+    revenue = 0
+    expense = 0
+
+    def __unicode__(self):
+        return unicode(self.name)
+
+
+class Asset(Object):
+
+    """ Asset model """
+    name = models.CharField(max_length=512)
+    asset_type = models.CharField(max_length=32,
+                                  choices=(
+                                      ('fixed', 'Fixed'), ('intangible', 'Intangible')),
+                                  default='fixed')
+    initial_value = models.DecimalField(
+        max_digits=20, decimal_places=2, default=0)
+    lifetime = models.DecimalField(
+        max_digits=20, decimal_places=0, blank=True, null=True)
+    endlife_value = models.DecimalField(
+        max_digits=20, decimal_places=2, blank=True, null=True)
+    depreciation_rate = models.DecimalField(
+        max_digits=20, decimal_places=5, blank=True, null=True)
+    depreciation_type = models.CharField(max_length=32, blank=True, null=True,
+                                         choices=(('straight', 'Straight Line'),
+                                                  ('reducing', 'Reducing balance')),
+                                         default='straight')
+    purchase_date = models.DateField(
+        blank=True, null=True, default=datetime.now)
+    current_value = models.DecimalField(
+        max_digits=20, decimal_places=2, default=0)
+    owner = models.ForeignKey(Contact)
+    details = models.TextField(blank=True, null=True)
+
+    class Meta:
+
+        "Event"
+        ordering = ['-purchase_date']
+
+    def check_depreciate(self):
+        "Check Depreciate"
+        if (self.purchase_date and self.endlife_value is not None and self.initial_value and self.lifetime):
+            return True
+        else:
+            return False
+
+    def get_depreciation(self):
+        "Get Depreciation"
+        if self.check_depreciate():  # Edited by Renat
+
+            self.set_rate()
+
+            from_purchase = datetime.date(datetime.now()) - self.purchase_date
+            days_from_purchase = from_purchase.days
+
+            if days_from_purchase >= (self.lifetime * 365):
+                return (self.initial_value - self.endlife_value).quantize(Decimal('.01'), rounding=ROUND_UP)
+
+            straight = Decimal(((self.initial_value -
+                                 self.endlife_value) / ((self.lifetime * 365)) *
+                                days_from_purchase)).quantize(Decimal('.01'), rounding=ROUND_UP)
+
+            if self.depreciation_type == 'reducing':
+                i = self.initial_value
+                daily_depreciation_rate = Decimal(str(1 - math.pow((self.endlife_value / self.initial_value),
+                                                                   (1 / (self.lifetime * 365)))))
+                for g in range(1, days_from_purchase):
+                    i -= (i * daily_depreciation_rate)
+                reducing = round(self.initial_value - i, 2)
+                if reducing > straight:
+                    return reducing.quantize(Decimal('.01'), rounding=ROUND_UP)
+                else:
+                    return straight.quantize(Decimal('.01'), rounding=ROUND_UP)
+
+            elif self.depreciation_type == 'straight':
+                return straight.quantize(Decimal('.01'), rounding=ROUND_UP)
+
+            else:
+                return Decimal('0.00')
+        else:
+            return Decimal('0.00')
+
+    def set_rate(self):
+        "Set Rate"
+        if self.depreciation_type == 'straight':
+            if self.lifetime:
+                self.depreciation_rate = (100 /
+                                          self.lifetime).quantize(Decimal('00.01'), rounding=ROUND_UP)
+
+        elif self.depreciation_type == 'reducing':
+            if not self.check_depreciate():
+                return Decimal('0.00')
+            self.depreciation_rate = Decimal(str(100 / (1 -
+                                                        math.pow((self.endlife_value / self.initial_value),
+                                                                 (1 / self.lifetime))))).quantize(Decimal('00.01'), rounding=ROUND_UP)
+        else:
+            return Decimal('0.00')
+        if self.depreciation_rate == Decimal('100.00'):
+            self.depreciation_rate = Decimal('99.99')
+
+        self.save()
+        return self
+
+    def set_current_value(self):
+        "Set current value"
+        if not self.check_depreciate():
+            return self.initial_value
+
+        self.current_value = self.initial_value - self.get_depreciation()
+        self.save()
+
+        return self.current_value
+
+    def __unicode__(self):
+        return unicode(self.name)
+
+    def get_absolute_url(self):
+        "Returns absolute URL"
+        try:
+            return reverse('finance_asset_view', args=[self.id])
+        except Exception:
+            return ""
+
+
+class Account(Object):
+
+    """ Account model """
+    name = models.CharField(max_length=512)
+    owner = models.ForeignKey(Contact)
+    balance = models.DecimalField(max_digits=20, decimal_places=2, default=0)
+    balance_currency = models.ForeignKey(Currency)
+    balance_display = models.DecimalField(
+        max_digits=20, decimal_places=2, default=0)
+    details = models.TextField(blank=True, null=True)
+
+    class Meta:
+
+        "Event"
+        ordering = ['name']
+
+    def get_balance(self):
+        "Returns balance"
+        bal = self.balance
+        transactions = Transaction.objects.filter(account=self.id)
+        for transaction in transactions:
+            bal += transaction.get_relative_value()
+        return bal
+
+    def __unicode__(self):
+        return unicode(self.name)
+
+    def get_absolute_url(self):
+        "Returns absolute URL"
+        try:
+            return reverse('finance_account_view', args=[self.id])
+        except Exception:
+            return ""
+
+
+class Equity(Object):
+
+    """ Equity model """
+    equity_type = models.CharField(max_length=32,
+                                   choices=(('share', 'Ordinary Share'), ('preferred', 'Preferred'),
+                                            ('warrant', 'Warrant')),
+                                   default='share')
+    issue_price = models.DecimalField(max_digits=20, decimal_places=2)
+    sell_price = models.DecimalField(max_digits=20, decimal_places=2)
+    issuer = models.ForeignKey(Contact, related_name='finance_equity_issued')
+    owner = models.ForeignKey(Contact, related_name='finance_equity_owned')
+    amount = models.PositiveIntegerField(default=1)
+    purchase_date = models.DateField(default=datetime.now)
+    details = models.TextField(blank=True, null=True)
+
+    class Meta:
+
+        "Event"
+        ordering = ['-purchase_date']
+
+    def __unicode__(self):
+        return unicode(unicode(self.issuer) + " (" + unicode(self.equity_type) + ")")
+
+    def get_absolute_url(self):
+        "Returns absolute URL"
+        try:
+            return reverse('finance_equity_view', args=[self.id])
+        except Exception:
+            return ""
+
+
+class Liability(Object):
+
+    """ Liability model, used for both Liabilities and Receivables """
+    name = models.CharField(max_length=512)
+    source = models.ForeignKey(
+        Contact, related_name='finance_liability_source')
+    target = models.ForeignKey(
+        Contact, related_name='finance_liability_target')
+    category = models.ForeignKey(
+        Category, blank=True, null=True, on_delete=models.SET_NULL)
+    account = models.ForeignKey(Account)
+    due_date = models.DateField(blank=True, null=True)
+    value = models.DecimalField(default=0, max_digits=20, decimal_places=2)
+    value_currency = models.ForeignKey(Currency)
+    value_display = models.DecimalField(
+        default=0, max_digits=20, decimal_places=2)
+    details = models.TextField(blank=True)
+
+    class Meta:
+
+        "Event"
+        ordering = ['-due_date']
+
+    def __unicode__(self):
+        return unicode(self.name)
+
+    def get_absolute_url(self):
+        "Returns absolute URL"
+        try:
+            return reverse('finance_liability_view', args=[self.id])
+        except Exception:
+            return ""
+
+    def is_receivable(self):
+        "Returns True if self is receivable relative to self.account"
+        return self.account.owner == self.target
+
+
+class Transaction(Object):
+
+    """ Transaction model """
+    name = models.CharField(max_length=512)
+    source = models.ForeignKey(
+        Contact, related_name='finance_transaction_source')
+    target = models.ForeignKey(
+        Contact, related_name='finance_transaction_target')
+    liability = models.ForeignKey(
+        Liability, blank=True, null=True, on_delete=models.SET_NULL)
+    category = models.ForeignKey(
+        Category, blank=True, null=True, on_delete=models.SET_NULL)
+    account = models.ForeignKey(Account)
+    datetime = models.DateTimeField(default=datetime.now)
+    value = models.DecimalField(default=0, max_digits=20, decimal_places=2)
+    value_currency = models.ForeignKey(Currency)
+    value_display = models.DecimalField(
+        default=0, max_digits=20, decimal_places=2)
+    details = models.TextField(blank=True)
+
+    class Meta:
+
+        "Event"
+        ordering = ['-datetime']
+
+    def __unicode__(self):
+        return unicode(self.name)
+
+    def get_relative_value(self):
+        "Get Relative Value"
+        if self.trash:
+            return 0
+        elif self.account.owner_id == self.source_id:
+            return -abs(self.value)
+        elif self.account.owner_id == self.target_id:
+            return abs(self.value)
+        else:
+            return 0
+
+    def get_absolute_url(self):
+        "Returns absolute URL"
+        try:
+            return reverse('finance_transaction_view', args=[self.id])
+        except Exception:
+            return ""
diff --git a/data/treeio/treeio/treeio/finance/south_migrations/0001_initial.py b/data/treeio/treeio/treeio/finance/south_migrations/0001_initial.py
new file mode 100644
index 0000000..a64c958
--- /dev/null
+++ b/data/treeio/treeio/treeio/finance/south_migrations/0001_initial.py
@@ -0,0 +1,331 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Adding model 'Category'
+        db.create_table('finance_category', (
+            ('object_ptr', self.gf('django.db.models.fields.related.OneToOneField')(
+                to=orm['core.Object'], unique=True, primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')
+             (max_length=512)),
+            ('details', self.gf('django.db.models.fields.TextField')
+             (null=True, blank=True)),
+        ))
+        db.send_create_signal('finance', ['Category'])
+
+        # Adding model 'Asset'
+        db.create_table('finance_asset', (
+            ('object_ptr', self.gf('django.db.models.fields.related.OneToOneField')(
+                to=orm['core.Object'], unique=True, primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')
+             (max_length=512)),
+            ('asset_type', self.gf('django.db.models.fields.CharField')
+             (default='fixed', max_length=32)),
+            ('initial_value', self.gf(
+                'django.db.models.fields.FloatField')(default=0)),
+            ('lifetime', self.gf('django.db.models.fields.FloatField')
+             (null=True, blank=True)),
+            ('endlife_value', self.gf('django.db.models.fields.FloatField')
+             (null=True, blank=True)),
+            ('depreciation_rate', self.gf(
+                'django.db.models.fields.FloatField')(null=True, blank=True)),
+            ('depreciation_type', self.gf('django.db.models.fields.CharField')
+             (default='straight', max_length=32, null=True, blank=True)),
+            ('purchase_date', self.gf('django.db.models.fields.DateField')
+             (default=datetime.datetime.now, null=True, blank=True)),
+            ('current_value', self.gf(
+                'django.db.models.fields.FloatField')(default=0)),
+            ('owner', self.gf('django.db.models.fields.related.ForeignKey')
+             (to=orm['identities.Contact'])),
+            ('details', self.gf('django.db.models.fields.TextField')
+             (null=True, blank=True)),
+        ))
+        db.send_create_signal('finance', ['Asset'])
+
+        # Adding model 'Account'
+        db.create_table('finance_account', (
+            ('object_ptr', self.gf('django.db.models.fields.related.OneToOneField')(
+                to=orm['core.Object'], unique=True, primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')
+             (max_length=512)),
+            ('owner', self.gf('django.db.models.fields.related.ForeignKey')
+             (to=orm['identities.Contact'])),
+            ('balance', self.gf(
+                'django.db.models.fields.FloatField')(default=0)),
+            ('details', self.gf('django.db.models.fields.TextField')
+             (null=True, blank=True)),
+        ))
+        db.send_create_signal('finance', ['Account'])
+
+        # Adding model 'Equity'
+        db.create_table('finance_equity', (
+            ('object_ptr', self.gf('django.db.models.fields.related.OneToOneField')(
+                to=orm['core.Object'], unique=True, primary_key=True)),
+            ('equity_type', self.gf('django.db.models.fields.CharField')
+             (default='share', max_length=32)),
+            ('issue_price', self.gf('django.db.models.fields.FloatField')()),
+            ('sell_price', self.gf('django.db.models.fields.FloatField')()),
+            ('issuer', self.gf('django.db.models.fields.related.ForeignKey')(
+                related_name='finance_equity_issued', to=orm['identities.Contact'])),
+            ('owner', self.gf('django.db.models.fields.related.ForeignKey')(
+                related_name='finance_equity_owned', to=orm['identities.Contact'])),
+            ('amount', self.gf(
+                'django.db.models.fields.PositiveIntegerField')(default=1)),
+            ('purchase_date', self.gf('django.db.models.fields.DateField')
+             (default=datetime.datetime.now)),
+            ('details', self.gf('django.db.models.fields.TextField')
+             (null=True, blank=True)),
+        ))
+        db.send_create_signal('finance', ['Equity'])
+
+        # Adding model 'Liability'
+        db.create_table('finance_liability', (
+            ('object_ptr', self.gf('django.db.models.fields.related.OneToOneField')(
+                to=orm['core.Object'], unique=True, primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')
+             (max_length=512)),
+            ('source', self.gf('django.db.models.fields.related.ForeignKey')(
+                related_name='finance_liability_source', to=orm['identities.Contact'])),
+            ('target', self.gf('django.db.models.fields.related.ForeignKey')(
+                related_name='finance_liability_target', to=orm['identities.Contact'])),
+            ('category', self.gf('django.db.models.fields.related.ForeignKey')
+             (to=orm['finance.Category'], null=True, blank=True)),
+            ('account', self.gf('django.db.models.fields.related.ForeignKey')
+             (to=orm['finance.Account'])),
+            ('due_date', self.gf('django.db.models.fields.DateField')
+             (null=True, blank=True)),
+            ('value', self.gf('django.db.models.fields.FloatField')()),
+            ('details', self.gf(
+                'django.db.models.fields.TextField')(blank=True)),
+        ))
+        db.send_create_signal('finance', ['Liability'])
+
+        # Adding model 'Transaction'
+        db.create_table('finance_transaction', (
+            ('object_ptr', self.gf('django.db.models.fields.related.OneToOneField')(
+                to=orm['core.Object'], unique=True, primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')
+             (max_length=512)),
+            ('source', self.gf('django.db.models.fields.related.ForeignKey')(
+                related_name='finance_transaction_source', to=orm['identities.Contact'])),
+            ('target', self.gf('django.db.models.fields.related.ForeignKey')(
+                related_name='finance_transaction_target', to=orm['identities.Contact'])),
+            ('liability', self.gf('django.db.models.fields.related.ForeignKey')(
+                to=orm['finance.Liability'], null=True, blank=True)),
+            ('category', self.gf('django.db.models.fields.related.ForeignKey')
+             (to=orm['finance.Category'], null=True, blank=True)),
+            ('account', self.gf('django.db.models.fields.related.ForeignKey')
+             (to=orm['finance.Account'])),
+            ('datetime', self.gf('django.db.models.fields.DateTimeField')
+             (default=datetime.datetime.now)),
+            ('value', self.gf('django.db.models.fields.FloatField')()),
+            ('details', self.gf(
+                'django.db.models.fields.TextField')(blank=True)),
+        ))
+        db.send_create_signal('finance', ['Transaction'])
+
+    def backwards(self, orm):
+
+        # Deleting model 'Category'
+        db.delete_table('finance_category')
+
+        # Deleting model 'Asset'
+        db.delete_table('finance_asset')
+
+        # Deleting model 'Account'
+        db.delete_table('finance_account')
+
+        # Deleting model 'Equity'
+        db.delete_table('finance_equity')
+
+        # Deleting model 'Liability'
+        db.delete_table('finance_liability')
+
+        # Deleting model 'Transaction'
+        db.delete_table('finance_transaction')
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'core.group': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Group'},
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['core.Group']"})
+        },
+        'core.object': {
+            'Meta': {'object_name': 'Object'},
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'everybody_execute': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'everybody_read': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'everybody_write': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Group']"}),
+            'group_execute': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'group_read': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'group_write': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'links': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'links_rel_+'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'nuvius_resource': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'object_name': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'object_type': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'subscribers': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'subscriptions'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'trash': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']"}),
+            'user_execute': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'user_read': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'user_write': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'core.user': {
+            'Meta': {'ordering': "['name']", 'object_name': 'User'},
+            'default_group': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'default_user_set'", 'null': 'True', 'to': "orm['core.Group']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'other_groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'finance.account': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Account', '_ormbases': ['core.Object']},
+            'balance': ('django.db.models.fields.FloatField', [], {'default': '0'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.Contact']"})
+        },
+        'finance.asset': {
+            'Meta': {'ordering': "['-purchase_date']", 'object_name': 'Asset', '_ormbases': ['core.Object']},
+            'asset_type': ('django.db.models.fields.CharField', [], {'default': "'fixed'", 'max_length': '32'}),
+            'current_value': ('django.db.models.fields.FloatField', [], {'default': '0'}),
+            'depreciation_rate': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+            'depreciation_type': ('django.db.models.fields.CharField', [], {'default': "'straight'", 'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'endlife_value': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+            'initial_value': ('django.db.models.fields.FloatField', [], {'default': '0'}),
+            'lifetime': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.Contact']"}),
+            'purchase_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime.now', 'null': 'True', 'blank': 'True'})
+        },
+        'finance.category': {
+            'Meta': {'object_name': 'Category', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'finance.equity': {
+            'Meta': {'ordering': "['-purchase_date']", 'object_name': 'Equity', '_ormbases': ['core.Object']},
+            'amount': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'equity_type': ('django.db.models.fields.CharField', [], {'default': "'share'", 'max_length': '32'}),
+            'issue_price': ('django.db.models.fields.FloatField', [], {}),
+            'issuer': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'finance_equity_issued'", 'to': "orm['identities.Contact']"}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'finance_equity_owned'", 'to': "orm['identities.Contact']"}),
+            'purchase_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime.now'}),
+            'sell_price': ('django.db.models.fields.FloatField', [], {})
+        },
+        'finance.liability': {
+            'Meta': {'ordering': "['-due_date']", 'object_name': 'Liability', '_ormbases': ['core.Object']},
+            'account': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Account']"}),
+            'category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Category']", 'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'due_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'source': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'finance_liability_source'", 'to': "orm['identities.Contact']"}),
+            'target': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'finance_liability_target'", 'to': "orm['identities.Contact']"}),
+            'value': ('django.db.models.fields.FloatField', [], {})
+        },
+        'finance.transaction': {
+            'Meta': {'ordering': "['-datetime']", 'object_name': 'Transaction', '_ormbases': ['core.Object']},
+            'account': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Account']"}),
+            'category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Category']", 'null': 'True', 'blank': 'True'}),
+            'datetime': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'details': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'liability': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Liability']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'source': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'finance_transaction_source'", 'to': "orm['identities.Contact']"}),
+            'target': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'finance_transaction_target'", 'to': "orm['identities.Contact']"}),
+            'value': ('django.db.models.fields.FloatField', [], {})
+        },
+        'identities.contact': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Contact', '_ormbases': ['core.Object']},
+            'contact_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.ContactType']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['identities.Contact']"}),
+            'related_group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'related_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'})
+        },
+        'identities.contactfield': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ContactField', '_ormbases': ['core.Object']},
+            'allowed_values': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'field_type': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'required': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'identities.contacttype': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ContactType', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'fields': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['identities.ContactField']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'slug': ('django.db.models.fields.CharField', [], {'max_length': '256'})
+        }
+    }
+
+    complete_apps = ['finance']
diff --git a/data/treeio/treeio/treeio/finance/south_migrations/0002_auto__add_currency__add_tax__add_field_liability_value_currency__add_f.py b/data/treeio/treeio/treeio/finance/south_migrations/0002_auto__add_currency__add_tax__add_field_liability_value_currency__add_f.py
new file mode 100644
index 0000000..c4c40e6
--- /dev/null
+++ b/data/treeio/treeio/treeio/finance/south_migrations/0002_auto__add_currency__add_tax__add_field_liability_value_currency__add_f.py
@@ -0,0 +1,393 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Adding model 'Currency'
+        db.create_table('finance_currency', (
+            ('object_ptr', self.gf('django.db.models.fields.related.OneToOneField')(
+                to=orm['core.Object'], unique=True, primary_key=True)),
+            ('code', self.gf('django.db.models.fields.CharField')
+             (max_length=3)),
+            ('name', self.gf('django.db.models.fields.CharField')
+             (max_length=255)),
+            ('symbol', self.gf('django.db.models.fields.CharField')
+             (max_length=1, null=True, blank=True)),
+            ('factor', self.gf('django.db.models.fields.DecimalField')
+             (default=1, max_digits=10, decimal_places=4)),
+            ('is_active', self.gf(
+                'django.db.models.fields.BooleanField')(default=True)),
+            ('is_default', self.gf(
+                'django.db.models.fields.BooleanField')(default=False)),
+        ))
+        db.send_create_signal('finance', ['Currency'])
+
+        # Adding model 'Tax'
+        db.create_table('finance_tax', (
+            ('object_ptr', self.gf('django.db.models.fields.related.OneToOneField')(
+                to=orm['core.Object'], unique=True, primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')
+             (max_length=512)),
+            ('rate', self.gf('django.db.models.fields.DecimalField')
+             (max_digits=4, decimal_places=2)),
+            ('compound', self.gf(
+                'django.db.models.fields.BooleanField')(default=False)),
+        ))
+        db.send_create_signal('finance', ['Tax'])
+
+        # Adding field 'Liability.value_currency'
+        db.add_column('finance_liability', 'value_currency', self.gf(
+            'django.db.models.fields.related.ForeignKey')(default=1, to=orm['finance.Currency']), keep_default=False)
+
+        # Adding field 'Liability.value_display'
+        db.add_column('finance_liability', 'value_display', self.gf('django.db.models.fields.DecimalField')(
+            default=0, max_digits=20, decimal_places=2), keep_default=False)
+
+        # Changing field 'Liability.value'
+        db.alter_column('finance_liability', 'value', self.gf(
+            'django.db.models.fields.DecimalField')(max_digits=20, decimal_places=2))
+
+        # Changing field 'Asset.initial_value'
+        db.alter_column('finance_asset', 'initial_value', self.gf(
+            'django.db.models.fields.DecimalField')(max_digits=20, decimal_places=2))
+
+        # Changing field 'Asset.current_value'
+        db.alter_column('finance_asset', 'current_value', self.gf(
+            'django.db.models.fields.DecimalField')(max_digits=20, decimal_places=2))
+
+        # Changing field 'Asset.endlife_value'
+        db.alter_column('finance_asset', 'endlife_value', self.gf(
+            'django.db.models.fields.DecimalField')(null=True, max_digits=20, decimal_places=2))
+
+        # Changing field 'Asset.lifetime'
+        db.alter_column('finance_asset', 'lifetime', self.gf(
+            'django.db.models.fields.DecimalField')(null=True, max_digits=20, decimal_places=0))
+
+        # Changing field 'Asset.depreciation_rate'
+        db.alter_column('finance_asset', 'depreciation_rate', self.gf(
+            'django.db.models.fields.DecimalField')(null=True, max_digits=4, decimal_places=2))
+
+        # Adding field 'Account.balance_currency'
+        db.add_column('finance_account', 'balance_currency', self.gf(
+            'django.db.models.fields.related.ForeignKey')(default=1, to=orm['finance.Currency']), keep_default=False)
+
+        # Adding field 'Account.balance_display'
+        db.add_column('finance_account', 'balance_display', self.gf('django.db.models.fields.DecimalField')(
+            default=0, max_digits=20, decimal_places=2), keep_default=False)
+
+        # Changing field 'Account.balance'
+        db.alter_column('finance_account', 'balance', self.gf(
+            'django.db.models.fields.DecimalField')(max_digits=20, decimal_places=2))
+
+        # Adding field 'Transaction.value_currency'
+        db.add_column('finance_transaction', 'value_currency', self.gf(
+            'django.db.models.fields.related.ForeignKey')(default=1, to=orm['finance.Currency']), keep_default=False)
+
+        # Adding field 'Transaction.value_display'
+        db.add_column('finance_transaction', 'value_display', self.gf('django.db.models.fields.DecimalField')(
+            default=0, max_digits=20, decimal_places=2), keep_default=False)
+
+        # Changing field 'Transaction.value'
+        db.alter_column('finance_transaction', 'value', self.gf(
+            'django.db.models.fields.DecimalField')(max_digits=20, decimal_places=2))
+
+        # Changing field 'Equity.issue_price'
+        db.alter_column('finance_equity', 'issue_price', self.gf(
+            'django.db.models.fields.DecimalField')(max_digits=20, decimal_places=2))
+
+        # Changing field 'Equity.sell_price'
+        db.alter_column('finance_equity', 'sell_price', self.gf(
+            'django.db.models.fields.DecimalField')(max_digits=20, decimal_places=2))
+
+    def backwards(self, orm):
+
+        # Deleting model 'Currency'
+        db.delete_table('finance_currency')
+
+        # Deleting model 'Tax'
+        db.delete_table('finance_tax')
+
+        # Deleting field 'Liability.value_currency'
+        db.delete_column('finance_liability', 'value_currency_id')
+
+        # Deleting field 'Liability.value_display'
+        db.delete_column('finance_liability', 'value_display')
+
+        # Changing field 'Liability.value'
+        db.alter_column('finance_liability', 'value', self.gf(
+            'django.db.models.fields.FloatField')())
+
+        # Changing field 'Asset.initial_value'
+        db.alter_column('finance_asset', 'initial_value', self.gf(
+            'django.db.models.fields.FloatField')())
+
+        # Changing field 'Asset.current_value'
+        db.alter_column('finance_asset', 'current_value', self.gf(
+            'django.db.models.fields.FloatField')())
+
+        # Changing field 'Asset.endlife_value'
+        db.alter_column('finance_asset', 'endlife_value', self.gf(
+            'django.db.models.fields.FloatField')(null=True))
+
+        # Changing field 'Asset.lifetime'
+        db.alter_column('finance_asset', 'lifetime', self.gf(
+            'django.db.models.fields.FloatField')(null=True))
+
+        # Changing field 'Asset.depreciation_rate'
+        db.alter_column('finance_asset', 'depreciation_rate', self.gf(
+            'django.db.models.fields.FloatField')(null=True))
+
+        # Deleting field 'Account.balance_currency'
+        db.delete_column('finance_account', 'balance_currency_id')
+
+        # Deleting field 'Account.balance_display'
+        db.delete_column('finance_account', 'balance_display')
+
+        # Changing field 'Account.balance'
+        db.alter_column('finance_account', 'balance', self.gf(
+            'django.db.models.fields.FloatField')())
+
+        # Deleting field 'Transaction.value_currency'
+        db.delete_column('finance_transaction', 'value_currency_id')
+
+        # Deleting field 'Transaction.value_display'
+        db.delete_column('finance_transaction', 'value_display')
+
+        # Changing field 'Transaction.value'
+        db.alter_column('finance_transaction', 'value', self.gf(
+            'django.db.models.fields.FloatField')())
+
+        # Changing field 'Equity.issue_price'
+        db.alter_column('finance_equity', 'issue_price', self.gf(
+            'django.db.models.fields.FloatField')())
+
+        # Changing field 'Equity.sell_price'
+        db.alter_column('finance_equity', 'sell_price', self.gf(
+            'django.db.models.fields.FloatField')())
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'core.accessentity': {
+            'Meta': {'object_name': 'AccessEntity'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        },
+        'core.comment': {
+            'Meta': {'object_name': 'Comment'},
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'}),
+            'body': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"})
+        },
+        'core.group': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Group'},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['core.Group']"})
+        },
+        'core.object': {
+            'Meta': {'object_name': 'Object'},
+            'comments': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.Comment']"}),
+            'creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'objects_created'", 'null': 'True', 'to': "orm['core.User']"}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'full_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_full_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'links': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'links_rel_+'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'nuvius_resource': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'object_name': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'object_type': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'read_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_read_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'subscribers': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'subscriptions'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Tag']", 'null': 'True', 'blank': 'True'}),
+            'trash': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'})
+        },
+        'core.tag': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Tag'},
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'})
+        },
+        'core.user': {
+            'Meta': {'ordering': "['name']", 'object_name': 'User'},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'default_group': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'default_user_set'", 'null': 'True', 'to': "orm['core.AccessEntity']"}),
+            'disabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_access': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'other_groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'finance.account': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Account', '_ormbases': ['core.Object']},
+            'balance': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '20', 'decimal_places': '2'}),
+            'balance_currency': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Currency']"}),
+            'balance_display': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '20', 'decimal_places': '2'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.Contact']"})
+        },
+        'finance.asset': {
+            'Meta': {'ordering': "['-purchase_date']", 'object_name': 'Asset', '_ormbases': ['core.Object']},
+            'asset_type': ('django.db.models.fields.CharField', [], {'default': "'fixed'", 'max_length': '32'}),
+            'current_value': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '20', 'decimal_places': '2'}),
+            'depreciation_rate': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '4', 'decimal_places': '2', 'blank': 'True'}),
+            'depreciation_type': ('django.db.models.fields.CharField', [], {'default': "'straight'", 'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'endlife_value': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '20', 'decimal_places': '2', 'blank': 'True'}),
+            'initial_value': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '20', 'decimal_places': '2'}),
+            'lifetime': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '20', 'decimal_places': '0', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.Contact']"}),
+            'purchase_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime.now', 'null': 'True', 'blank': 'True'})
+        },
+        'finance.category': {
+            'Meta': {'object_name': 'Category', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'finance.currency': {
+            'Meta': {'object_name': 'Currency', '_ormbases': ['core.Object']},
+            'code': ('django.db.models.fields.CharField', [], {'max_length': '3'}),
+            'factor': ('django.db.models.fields.DecimalField', [], {'default': '1', 'max_digits': '10', 'decimal_places': '4'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_default': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'symbol': ('django.db.models.fields.CharField', [], {'max_length': '1', 'null': 'True', 'blank': 'True'})
+        },
+        'finance.equity': {
+            'Meta': {'ordering': "['-purchase_date']", 'object_name': 'Equity', '_ormbases': ['core.Object']},
+            'amount': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'equity_type': ('django.db.models.fields.CharField', [], {'default': "'share'", 'max_length': '32'}),
+            'issue_price': ('django.db.models.fields.DecimalField', [], {'max_digits': '20', 'decimal_places': '2'}),
+            'issuer': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'finance_equity_issued'", 'to': "orm['identities.Contact']"}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'finance_equity_owned'", 'to': "orm['identities.Contact']"}),
+            'purchase_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime.now'}),
+            'sell_price': ('django.db.models.fields.DecimalField', [], {'max_digits': '20', 'decimal_places': '2'})
+        },
+        'finance.liability': {
+            'Meta': {'ordering': "['-due_date']", 'object_name': 'Liability', '_ormbases': ['core.Object']},
+            'account': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Account']"}),
+            'category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Category']", 'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'due_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'source': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'finance_liability_source'", 'to': "orm['identities.Contact']"}),
+            'target': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'finance_liability_target'", 'to': "orm['identities.Contact']"}),
+            'value': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '20', 'decimal_places': '2'}),
+            'value_currency': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Currency']"}),
+            'value_display': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '20', 'decimal_places': '2'})
+        },
+        'finance.tax': {
+            'Meta': {'object_name': 'Tax', '_ormbases': ['core.Object']},
+            'compound': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'rate': ('django.db.models.fields.DecimalField', [], {'max_digits': '4', 'decimal_places': '2'})
+        },
+        'finance.transaction': {
+            'Meta': {'ordering': "['-datetime']", 'object_name': 'Transaction', '_ormbases': ['core.Object']},
+            'account': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Account']"}),
+            'category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Category']", 'null': 'True', 'blank': 'True'}),
+            'datetime': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'details': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'liability': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Liability']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'source': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'finance_transaction_source'", 'to': "orm['identities.Contact']"}),
+            'target': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'finance_transaction_target'", 'to': "orm['identities.Contact']"}),
+            'value': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '20', 'decimal_places': '2'}),
+            'value_currency': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Currency']"}),
+            'value_display': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '20', 'decimal_places': '2'})
+        },
+        'identities.contact': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Contact', '_ormbases': ['core.Object']},
+            'contact_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.ContactType']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['identities.Contact']"}),
+            'related_group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'related_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.AccessEntity']", 'null': 'True', 'blank': 'True'})
+        },
+        'identities.contactfield': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ContactField', '_ormbases': ['core.Object']},
+            'allowed_values': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'field_type': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'required': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'identities.contacttype': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ContactType', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'fields': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['identities.ContactField']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'slug': ('django.db.models.fields.CharField', [], {'max_length': '256'})
+        }
+    }
+
+    complete_apps = ['finance']
diff --git a/data/treeio/treeio/treeio/finance/south_migrations/0003_treeiocurrency.py b/data/treeio/treeio/treeio/finance/south_migrations/0003_treeiocurrency.py
new file mode 100644
index 0000000..837325d
--- /dev/null
+++ b/data/treeio/treeio/treeio/finance/south_migrations/0003_treeiocurrency.py
@@ -0,0 +1,255 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import DataMigration
+from django.db import models
+
+
+class Migration(DataMigration):
+
+    def forwards(self, orm):
+        "Add currencies to financial items"
+        try:
+            currency = orm['finance.Currency'].objects.get(is_default=True)
+        except:
+            currency = orm['finance.Currency'].objects.create()
+            currency.code = "USD"
+            currency.name = "USD  United States of America, Dollars"
+            currency.symbol = u"$"
+            currency.is_default = True
+            currency.save()
+        for obj in orm['finance.Liability'].objects.all():
+            obj.value_currency = currency
+            obj.value_display = obj.value
+            obj.save()
+        for obj in orm['finance.Transaction'].objects.all():
+            obj.value_currency = currency
+            obj.value_display = obj.value
+            obj.save()
+        for obj in orm['finance.Account'].objects.all():
+            obj.balance_currency = currency
+            obj.balance_display = obj.balance
+            obj.save()
+
+    def backwards(self, orm):
+        raise RuntimeError("Cannot reverse this migration.")
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'core.accessentity': {
+            'Meta': {'object_name': 'AccessEntity'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        },
+        'core.comment': {
+            'Meta': {'object_name': 'Comment'},
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'}),
+            'body': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"})
+        },
+        'core.group': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Group'},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['core.Group']"})
+        },
+        'core.object': {
+            'Meta': {'object_name': 'Object'},
+            'comments': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.Comment']"}),
+            'creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'objects_created'", 'null': 'True', 'to': "orm['core.User']"}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'full_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_full_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'links': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'links_rel_+'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'nuvius_resource': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'object_name': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'object_type': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'read_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_read_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'subscribers': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'subscriptions'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Tag']", 'null': 'True', 'blank': 'True'}),
+            'trash': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+        },
+        'core.tag': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Tag'},
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'})
+        },
+        'core.user': {
+            'Meta': {'ordering': "['name']", 'object_name': 'User'},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'default_group': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'default_user_set'", 'null': 'True', 'to': "orm['core.AccessEntity']"}),
+            'disabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_access': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'other_groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'finance.account': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Account', '_ormbases': ['core.Object']},
+            'balance': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '20', 'decimal_places': '2'}),
+            'balance_currency': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Currency']"}),
+            'balance_display': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '20', 'decimal_places': '2'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.Contact']"})
+        },
+        'finance.asset': {
+            'Meta': {'ordering': "['-purchase_date']", 'object_name': 'Asset', '_ormbases': ['core.Object']},
+            'asset_type': ('django.db.models.fields.CharField', [], {'default': "'fixed'", 'max_length': '32'}),
+            'current_value': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '20', 'decimal_places': '2'}),
+            'depreciation_rate': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '4', 'decimal_places': '2', 'blank': 'True'}),
+            'depreciation_type': ('django.db.models.fields.CharField', [], {'default': "'straight'", 'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'endlife_value': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '20', 'decimal_places': '2', 'blank': 'True'}),
+            'initial_value': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '20', 'decimal_places': '2'}),
+            'lifetime': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '20', 'decimal_places': '0', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.Contact']"}),
+            'purchase_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime.now', 'null': 'True', 'blank': 'True'})
+        },
+        'finance.category': {
+            'Meta': {'object_name': 'Category', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'finance.currency': {
+            'Meta': {'object_name': 'Currency', '_ormbases': ['core.Object']},
+            'code': ('django.db.models.fields.CharField', [], {'max_length': '3'}),
+            'factor': ('django.db.models.fields.DecimalField', [], {'default': '1', 'max_digits': '10', 'decimal_places': '4'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_default': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'symbol': ('django.db.models.fields.CharField', [], {'max_length': '1', 'null': 'True', 'blank': 'True'})
+        },
+        'finance.equity': {
+            'Meta': {'ordering': "['-purchase_date']", 'object_name': 'Equity', '_ormbases': ['core.Object']},
+            'amount': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'equity_type': ('django.db.models.fields.CharField', [], {'default': "'share'", 'max_length': '32'}),
+            'issue_price': ('django.db.models.fields.DecimalField', [], {'max_digits': '20', 'decimal_places': '2'}),
+            'issuer': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'finance_equity_issued'", 'to': "orm['identities.Contact']"}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'finance_equity_owned'", 'to': "orm['identities.Contact']"}),
+            'purchase_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime.now'}),
+            'sell_price': ('django.db.models.fields.DecimalField', [], {'max_digits': '20', 'decimal_places': '2'})
+        },
+        'finance.liability': {
+            'Meta': {'ordering': "['-due_date']", 'object_name': 'Liability', '_ormbases': ['core.Object']},
+            'account': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Account']"}),
+            'category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Category']", 'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'due_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'source': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'finance_liability_source'", 'to': "orm['identities.Contact']"}),
+            'target': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'finance_liability_target'", 'to': "orm['identities.Contact']"}),
+            'value': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '20', 'decimal_places': '2'}),
+            'value_currency': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Currency']"}),
+            'value_display': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '20', 'decimal_places': '2'})
+        },
+        'finance.tax': {
+            'Meta': {'object_name': 'Tax', '_ormbases': ['core.Object']},
+            'compound': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'rate': ('django.db.models.fields.DecimalField', [], {'max_digits': '4', 'decimal_places': '2'})
+        },
+        'finance.transaction': {
+            'Meta': {'ordering': "['-datetime']", 'object_name': 'Transaction', '_ormbases': ['core.Object']},
+            'account': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Account']"}),
+            'category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Category']", 'null': 'True', 'blank': 'True'}),
+            'datetime': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'details': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'liability': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Liability']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'source': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'finance_transaction_source'", 'to': "orm['identities.Contact']"}),
+            'target': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'finance_transaction_target'", 'to': "orm['identities.Contact']"}),
+            'value': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '20', 'decimal_places': '2'}),
+            'value_currency': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Currency']"}),
+            'value_display': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '20', 'decimal_places': '2'})
+        },
+        'identities.contact': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Contact', '_ormbases': ['core.Object']},
+            'contact_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.ContactType']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['identities.Contact']"}),
+            'related_group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'related_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.AccessEntity']", 'null': 'True', 'blank': 'True'})
+        },
+        'identities.contactfield': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ContactField', '_ormbases': ['core.Object']},
+            'allowed_values': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'field_type': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'required': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'identities.contacttype': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ContactType', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'fields': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['identities.ContactField']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'slug': ('django.db.models.fields.CharField', [], {'max_length': '256'})
+        }
+    }
+
+    complete_apps = ['finance']
diff --git a/data/treeio/treeio/treeio/finance/views.py b/data/treeio/treeio/treeio/finance/views.py
new file mode 100644
index 0000000..e216900
--- /dev/null
+++ b/data/treeio/treeio/treeio/finance/views.py
@@ -0,0 +1,1441 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+"""
+Finance Management module: views
+"""
+from django.shortcuts import get_object_or_404
+from django.template import RequestContext
+from django.http import HttpResponseRedirect
+from django.core.urlresolvers import reverse
+from django.db.models import Q, Sum
+from treeio.core.rendering import render_to_response
+from treeio.core.models import Object, ModuleSetting
+from treeio.core.decorators import treeio_login_required, handle_response_format
+from treeio.core.views import user_denied
+from treeio.identities.models import Contact
+from treeio.finance.forms import TransactionForm, LiabilityForm, AccountForm, EquityForm, AssetForm, \
+    CategoryForm, MassActionForm, TransactionFilterForm, LiabilityFilterForm, \
+    EquityFilterForm, AssetFilterForm, AccountFilterForm, ReceivableForm, \
+    SettingsForm, CurrencyForm, TaxForm
+from treeio.finance.models import Transaction, Liability, Category, Account, Equity, Asset, Currency, Tax
+from treeio.finance.csvapi import ProcessTransactions
+from treeio.sales.models import Product, SaleOrder
+from treeio.sales.forms import dict_currencies
+from treeio.finance.helpers import convert
+from datetime import datetime, timedelta
+from decimal import Decimal
+
+
+def _get_filter_query(model, args):
+    "Creates a query to filter Transactions based on FilterForm arguments"
+    query = Q()
+
+    for arg in args:
+        if args[arg]:
+            if hasattr(model, arg):
+                kwargs = {str(arg + '__id'): long(args[arg])}
+                query = query & Q(**kwargs)
+
+    if 'datefrom' in args and args['datefrom']:
+        datefrom = datetime.date(
+            datetime.strptime(args['datefrom'], '%m/%d/%Y'))
+        query = query & Q(date_created__gte=datefrom)
+
+    if 'dateto' in args and args['dateto']:
+        dateto = datetime.date(datetime.strptime(args['dateto'], '%m/%d/%Y'))
+        query = query & Q(date_created__lte=dateto)
+
+    ## Assets, Equities
+
+    if 'purchase_date_from' in args and args['purchase_date_from']:
+        purchase_date_from = datetime.date(
+            datetime.strptime(args['purchase_date_from'], '%m/%d/%Y'))
+        query = query & Q(purchase_date__gte=purchase_date_from)
+
+    if 'purchase_date_to' in args and args['purchase_date_to']:
+        purchase_date_to = datetime.date(
+            datetime.strptime(args['purchase_date_to'], '%m/%d/%Y'))
+        query = query & Q(purchase_date__lte=purchase_date_to)
+
+    ## Liabilities, Receivables
+
+    # Assets
+
+    if 'due_date_from' in args and args['due_date_from']:
+        due_date_from = datetime.date(
+            datetime.strptime(args['due_date_from'], '%m/%d/%Y'))
+        query = query & Q(due_date__gte=due_date_from)
+
+    if 'due_date_to' in args and args['due_date_to']:
+        due_date_to = datetime.date(
+            datetime.strptime(args['due_date_to'], '%m/%d/%Y'))
+        query = query & Q(due_date__lte=due_date_to)
+
+    if 'equity_type' in args and args['equity_type']:
+        equity_type = args['equity_type']
+        query = query & Q(equity_type=equity_type)
+
+    if 'asset_type' in args and args['asset_type']:
+        asset_type = args['asset_type']
+        query = query & Q(asset_type=asset_type)
+
+    return query
+
+
+#
+# Categories
+#
+
+@handle_response_format
+@treeio_login_required
+def index_categories(request, response_format='html'):
+    "Finance categories page"
+
+    transactions = Object.filter_by_request(request, Transaction.objects)
+    liabilities = Object.filter_by_request(request, Liability.objects)
+
+    categories = Object.filter_by_request(request, Category.objects)
+
+    return render_to_response('finance/index_categories',
+                              {'categories': categories,
+                               'transactions': transactions,
+                               'liabilities': liabilities},
+                              context_instance=RequestContext(request),
+                              response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def category_edit(request, category_id, response_format='html'):
+    "category edit page"
+    category = get_object_or_404(Category, pk=category_id)
+    if request.POST:
+        if not 'cancel' in request.POST:
+            form = CategoryForm(
+                request.user.profile, request.POST, instance=category)
+            if form.is_valid():
+                category = form.save()
+                return HttpResponseRedirect(reverse('finance_category_view', args=[category.id]))
+        else:
+            return HttpResponseRedirect(reverse('finance_category_view', args=[category.id]))
+    else:
+        form = CategoryForm(request.user.profile, instance=category)
+    return render_to_response('finance/category_edit',
+                              {'form': form, 'category': category},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def category_add(request, response_format='html'):
+    "new category form"
+    categories = Object.filter_by_request(request, Category.objects, mode="r")
+    if request.POST:
+        if 'cancel' not in request.POST:
+            category = Category()
+            form = CategoryForm(
+                request.user.profile, request.POST, instance=category)
+            if form.is_valid():
+                category = form.save()
+                category.set_user_from_request(request)
+                return HttpResponseRedirect(reverse('finance_category_view', args=[category.id]))
+        else:
+            return HttpResponseRedirect(reverse('finance_categories'))
+    else:
+        form = CategoryForm(request.user.profile)
+    return render_to_response('finance/category_add', {'form': form, 'categories': categories},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def category_view(request, category_id, response_format='html'):
+    "Single category view page"
+    category = get_object_or_404(Category, pk=category_id)
+
+    if not request.user.profile.has_permission(category):
+        return user_denied(request, message="You don't have access to this Category")
+
+    if 'massform1' in request.POST:
+        for key in request.POST:
+            if 'mass-transaction' in key:
+                try:
+                    transaction = Transaction.objects.get(pk=request.POST[key])
+                    form = MassActionForm(
+                        request.user.profile, request.POST, instance=transaction)
+                    if form.is_valid() and request.user.profile.has_permission(transaction, mode='w'):
+                        form.save()
+                except Exception:
+                    pass
+
+    massform_transaction = MassActionForm(request.user.profile)
+
+    if 'massform2' in request.POST:
+        for key in request.POST:
+            if 'mass-liability' in key:
+                try:
+                    liability = Liability.objects.get(pk=request.POST[key])
+                    form = MassActionForm(
+                        request.user.profile, request.POST, instance=liability)
+                    if form.is_valid() and request.user.profile.has_permission(liability, mode='w'):
+                        form.save()
+                except Exception:
+                    pass
+
+    massform_liability = MassActionForm(request.user.profile)
+
+    transactions = Object.filter_by_request(request, Transaction.objects)
+    liabilities = Object.filter_by_request(request, Liability.objects)
+
+    return render_to_response('finance/category_view',
+                              {'category': category,
+                               'transactions': transactions,
+                               'liabilities': liabilities,
+                               'massform_transaction': massform_transaction,
+                               'massform_liability': massform_liability},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+def category_delete(request, category_id, response_format='html'):
+    "Category delete"
+
+    category = get_object_or_404(Category, pk=category_id)
+    if not request.user.profile.has_permission(category, mode='w'):
+        return user_denied(request, "You don't have access to this Category", response_format)
+
+    if request.POST:
+        if 'delete' in request.POST:
+            if 'trash' in request.POST:
+                category.trash = True
+                category.save()
+            else:
+                category.delete()
+            return HttpResponseRedirect(reverse('finance_settings_view'))
+        elif 'cancel' in request.POST:
+            return HttpResponseRedirect(reverse('finance_category_view', args=[category.id]))
+
+    return render_to_response('finance/category_delete',
+                              {'category': category},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+#
+# Accounts
+#
+
+
+@handle_response_format
+@treeio_login_required
+def account_edit(request, account_id, response_format='html'):
+    "account edit page"
+    account = get_object_or_404(Account, pk=account_id)
+    if request.POST:
+        if 'cancel' not in request.POST:
+            form = AccountForm(
+                request.user.profile, request.POST, instance=account)
+            if form.is_valid():
+                account = form.save(commit=False)
+                convert(account, 'balance')
+                return HttpResponseRedirect(reverse('finance_account_view', args=[account.id]))
+        else:
+            return HttpResponseRedirect(reverse('finance_account_view', args=[account.id]))
+
+    else:
+        form = AccountForm(request.user.profile, instance=account)
+    return render_to_response('finance/account_edit',
+                              {'form': form, 'account': account},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def account_add(request, response_format='html'):
+    "new account form"
+    if request.POST:
+        if 'cancel' not in request.POST:
+            account = Account()
+            form = AccountForm(
+                request.user.profile, request.POST, instance=account)
+            if form.is_valid():
+                account = form.save(commit=False)
+                convert(account, 'balance')
+                account.set_user_from_request(request)
+                return HttpResponseRedirect(reverse('finance_account_view', args=[account.id]))
+        else:
+            return HttpResponseRedirect(reverse('finance_index_accounts'))
+    else:
+        form = AccountForm(request.user.profile)
+    return render_to_response('finance/account_add', {'form': form},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def account_view(request, account_id, response_format='html'):
+    "Single transaction view page"
+    account = get_object_or_404(Account, pk=account_id)
+    return render_to_response('finance/account_view',
+                              {'account': account},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+def account_delete(request, account_id, response_format='html'):
+    "Account delete"
+
+    account = get_object_or_404(Account, pk=account_id)
+    if not request.user.profile.has_permission(account, mode='w'):
+        return user_denied(request, "You don't have access to this Account", response_format)
+
+    if request.POST:
+        if 'delete' in request.POST:
+            if 'trash' in request.POST:
+                account.trash = True
+                account.save()
+            else:
+                account.delete()
+            return HttpResponseRedirect(reverse('finance_index_accounts'))
+        elif 'cancel' in request.POST:
+            return HttpResponseRedirect(reverse('finance_account_view', args=[account.id]))
+
+    return render_to_response('finance/account_delete',
+                              {'account': account},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+#
+# Assets
+#
+
+
+@handle_response_format
+@treeio_login_required
+def index_assets(request, response_format='html'):
+    "Index_assets page: displays all Assets"
+
+    if request.GET:
+        query = _get_filter_query(Asset, request.GET)
+    else:
+        query = Q()
+
+    filters = AssetFilterForm(request.user.profile, 'title', request.GET)
+
+    assets = Object.filter_by_request(
+        request, Asset.objects.filter(query), mode="r")
+
+    return render_to_response('finance/index_assets',
+                              {'assets': assets,
+                               'filters': filters
+                               },
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def asset_edit(request, asset_id, response_format='html'):
+    "asset edit page"
+    asset = get_object_or_404(Asset, pk=asset_id)
+    if request.POST:
+        if 'cancel' not in request.POST:
+            form = AssetForm(
+                request.user.profile, request.POST, instance=asset)
+            if form.is_valid():
+                asset = form.save()
+                return HttpResponseRedirect(reverse('finance_asset_view', args=[asset.id]))
+        else:
+            return HttpResponseRedirect(reverse('finance_asset_view', args=[asset.id]))
+    else:
+        form = AssetForm(request.user.profile, instance=asset)
+    return render_to_response('finance/asset_edit',
+                              {'form': form, 'asset': asset},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def asset_add(request, response_format='html'):
+    "new asset form"
+    assets = Object.filter_by_request(request, Asset.objects, mode="r")
+    if request.POST:
+        if 'cancel' not in request.POST:
+            asset = Asset()
+            form = AssetForm(
+                request.user.profile, request.POST, instance=asset)
+            if form.is_valid():
+                asset = form.save()
+                asset.set_user_from_request(request)
+                return HttpResponseRedirect(reverse('finance_asset_view', args=[asset.id]))
+        else:
+            return HttpResponseRedirect(reverse('finance_index_assets'))
+    else:
+        form = AssetForm(request.user.profile)
+    return render_to_response('finance/asset_add', {'form': form, 'assets': assets},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def asset_view(request, asset_id, response_format='html'):
+    "Single transaction view page"
+    asset = get_object_or_404(Asset, pk=asset_id)
+    return render_to_response('finance/asset_view',
+                              {'asset': asset},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+def asset_delete(request, asset_id, response_format='html'):
+    "Asset delete"
+
+    asset = get_object_or_404(Asset, pk=asset_id)
+    if not request.user.profile.has_permission(asset, mode='w'):
+        return user_denied(request, "You don't have access to this Asset", response_format)
+
+    if request.POST:
+        if 'delete' in request.POST:
+            if 'trash' in request.POST:
+                asset.trash = True
+                asset.save()
+            else:
+                asset.delete()
+            return HttpResponseRedirect(reverse('finance_index_assets'))
+        elif 'cancel' in request.POST:
+            return HttpResponseRedirect(reverse('finance_asset_view', args=[asset.id]))
+
+    return render_to_response('finance/asset_delete',
+                              {'asset': asset},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+#
+# Equities
+#
+
+
+@handle_response_format
+@treeio_login_required
+def index_equities(request, response_format='html'):
+    "Index_equities page: displays all Equities"
+    if request.GET:
+        query = _get_filter_query(Equity, request.GET)
+    else:
+        query = Q()
+
+    filters = EquityFilterForm(
+        request.user.profile, 'title', request.GET)
+
+    equities = Object.filter_by_request(
+        request, Equity.objects.filter(query), mode="r")
+
+    return render_to_response('finance/index_equities',
+                              {'equities': equities,
+                               'filters': filters
+                               },
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def equity_edit(request, equity_id, response_format='html'):
+    "equity edit page"
+    equity = get_object_or_404(Equity, pk=equity_id)
+    if request.POST:
+        if 'cancel' not in request.POST:
+            form = EquityForm(
+                request.user.profile, request.POST, instance=equity)
+            if form.is_valid():
+                equity = form.save()
+                return HttpResponseRedirect(reverse('finance_equity_view', args=[equity.id]))
+        else:
+            return HttpResponseRedirect(reverse('finance_equity_view', args=[equity.id]))
+    else:
+        form = EquityForm(request.user.profile, instance=equity)
+    return render_to_response('finance/equity_edit',
+                              {'form': form, 'equity': equity},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def equity_add(request, response_format='html'):
+    "new equity form"
+    equities = Object.filter_by_request(request, Equity.objects, mode="r")
+    if request.POST:
+        if 'cancel' not in request.POST:
+            equity = Equity()
+            form = EquityForm(
+                request.user.profile, request.POST, instance=equity)
+            if form.is_valid():
+                equity = form.save()
+                equity.set_user_from_request(request)
+                return HttpResponseRedirect(reverse('finance_equity_view', args=[equity.id]))
+        else:
+            return HttpResponseRedirect(reverse('finance_index_equities'))
+    else:
+        form = EquityForm(request.user.profile)
+    return render_to_response('finance/equity_add', {'form': form, 'equities': equities},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def equity_view(request, equity_id, response_format='html'):
+    "Single transaction view page"
+    equity = get_object_or_404(Equity, pk=equity_id)
+    return render_to_response('finance/equity_view',
+                              {'equity': equity},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+def equity_delete(request, equity_id, response_format='html'):
+    "Equity delete"
+
+    equity = get_object_or_404(Equity, pk=equity_id)
+    if not request.user.profile.has_permission(equity, mode='w'):
+        return user_denied(request, "You don't have access to this Equity", response_format)
+
+    if request.POST:
+        if 'delete' in request.POST:
+            if 'trash' in request.POST:
+                equity.trash = True
+                equity.save()
+            else:
+                equity.delete()
+            return HttpResponseRedirect(reverse('finance_index_equities'))
+        elif 'cancel' in request.POST:
+            return HttpResponseRedirect(reverse('finance_equity_view', args=[equity.id]))
+
+    return render_to_response('finance/equity_delete',
+                              {'equity': equity},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+#
+# Transactions
+#
+
+
+@handle_response_format
+@treeio_login_required
+def index_transactions(request, response_format='html'):
+    "Index_transactions page: displays all Transactions"
+    if request.GET:
+        query = _get_filter_query(Transaction, request.GET)
+    else:
+        query = Q()
+
+    if 'massform' in request.POST:
+        for key in request.POST:
+            if 'mass-transaction' in key:
+                try:
+                    transaction = Transaction.objects.get(pk=request.POST[key])
+                    form = MassActionForm(
+                        request.user.profile, request.POST, instance=transaction)
+                    if form.is_valid() and request.user.profile.has_permission(transaction, mode='w'):
+                        form.save()
+                except:
+                    pass
+
+    massform = MassActionForm(request.user.profile)
+
+    transactions = Object.filter_by_request(
+        request, Transaction.objects.filter(query), mode="r")
+
+    filters = TransactionFilterForm(
+        request.user.profile, 'title', request.GET)
+
+    return render_to_response('finance/index_transactions',
+                              {'transactions': transactions,
+                               'massform': massform,
+                               'filters': filters
+                               },
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def transaction_add(request, liability_id=None, order_id=None, response_format='html'):
+    "new transaction form"
+    transactions = Object.filter_by_request(
+        request, Transaction.objects, mode="r")
+    if request.POST:
+        if 'cancel' not in request.POST:
+            transaction = Transaction()
+            form = TransactionForm(
+                request.user.profile, None, None, request.POST, instance=transaction)
+            if form.is_valid():
+                transaction = form.save(commit=False)
+                convert(transaction, 'value')
+                transaction.set_user_from_request(request)
+                if order_id:
+                    try:
+                        order = SaleOrder.objects.get(pk=order_id)
+                        order.payment.add(transaction)
+                        order.save()
+                    except:
+                        pass
+                return HttpResponseRedirect(reverse('finance_transaction_view', args=[transaction.id]))
+        else:
+            return HttpResponseRedirect(reverse('finance_index_transactions'))
+    else:
+        form = TransactionForm(
+            request.user.profile, liability_id=liability_id, order_id=order_id)
+    return render_to_response('finance/transaction_add', {'form': form, 'transactions': transactions},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def transaction_edit(request, transaction_id, response_format='html'):
+    "Transaction edit page"
+    transaction = get_object_or_404(Transaction, pk=transaction_id)
+    if request.POST:
+        if 'cancel' not in request.POST:
+            form = TransactionForm(
+                request.user.profile, None, None, request.POST, instance=transaction)
+            if form.is_valid():
+                transaction = form.save(commit=False)
+                convert(transaction, 'value')
+                return HttpResponseRedirect(reverse('finance_transaction_view', args=[transaction.id]))
+        else:
+            return HttpResponseRedirect(reverse('finance_transaction_view', args=[transaction.id]))
+    else:
+        form = TransactionForm(
+            request.user.profile, None, None, instance=transaction)
+    return render_to_response('finance/transaction_edit',
+                              {'form': form, 'transaction': transaction},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def transaction_view(request, transaction_id, response_format='html'):
+    "Single transaction view page"
+    transaction = get_object_or_404(Transaction, pk=transaction_id)
+    return render_to_response('finance/transaction_view',
+                              {'transaction': transaction},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+def transaction_delete(request, transaction_id, response_format='html'):
+    "Transaction delete"
+
+    transaction = get_object_or_404(Transaction, pk=transaction_id)
+    if not request.user.profile.has_permission(transaction, mode='w'):
+        return user_denied(request, "You don't have access to this Transaction", response_format)
+
+    if request.POST:
+        if 'delete' in request.POST:
+            if 'trash' in request.POST:
+                transaction.trash = True
+                transaction.save()
+            else:
+                transaction.delete()
+            return HttpResponseRedirect(reverse('finance_index_transactions'))
+        elif 'cancel' in request.POST:
+            return HttpResponseRedirect(reverse('finance_transaction_view', args=[transaction.id]))
+
+    return render_to_response('finance/transaction_delete',
+                              {'transaction': transaction},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+#
+# Liabilities
+#
+
+
+@handle_response_format
+@treeio_login_required
+def index_liabilities(request, response_format='html'):
+    "Index_liabilities page: displays all Liabilities"
+    if request.GET:
+        query = _get_filter_query(Liability, request.GET)
+    else:
+        query = Q()
+
+    if 'massform' in request.POST:
+        for key in request.POST:
+            if 'mass-liability' in key:
+                try:
+                    liability = Liability.objects.get(pk=request.POST[key])
+                    form = MassActionForm(
+                        request.user.profile, request.POST, instance=liability)
+                    if form.is_valid() and request.user.profile.has_permission(liability, mode='w'):
+                        form.save()
+                except Exception:
+                    pass
+
+    massform = MassActionForm(request.user.profile)
+
+    filters = LiabilityFilterForm(
+        request.user.profile, 'title', request.GET)
+
+    liabilities = Object.filter_by_request(
+        request, Liability.objects.filter(query), mode="r")
+
+    template_liabilities = []
+    for liability in liabilities:
+        if liability.account.owner_id == liability.source_id:
+            template_liabilities.append(liability)
+
+    return render_to_response('finance/index_liabilities',
+                              {'liabilities': template_liabilities,
+                               'massform': massform,
+                               'filters': filters
+                               },
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def liability_edit(request, liability_id, response_format='html'):
+    "liability edit page"
+    liability = get_object_or_404(Liability, pk=liability_id)
+    if request.POST:
+        if 'cancel' not in request.POST:
+            form = LiabilityForm(
+                request.user.profile, request.POST, instance=liability)
+            if form.is_valid():
+                liability = form.save(commit=False)
+                convert(liability, 'value')
+                return HttpResponseRedirect(reverse('finance_liability_view', args=[liability.id]))
+        else:
+            return HttpResponseRedirect(reverse('finance_liability_view', args=[liability.id]))
+    else:
+        form = LiabilityForm(request.user.profile, instance=liability)
+    return render_to_response('finance/liability_edit',
+                              {'form': form, 'liability': liability},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def liability_add(request, response_format='html'):
+    "new liability form"
+    liabilities = Object.filter_by_request(
+        request, Liability.objects, mode="r")
+    if request.POST:
+        if 'cancel' not in request.POST:
+            liability = Liability()
+            form = LiabilityForm(
+                request.user.profile, request.POST, instance=liability)
+            if form.is_valid():
+                liability = form.save(commit=False)
+                liability.source = liability.account.owner
+                convert(liability, 'value')
+                liability.set_user_from_request(request)
+                return HttpResponseRedirect(reverse('finance_liability_view', args=[liability.id]))
+        else:
+            return HttpResponseRedirect(reverse('finance_index_liabilities'))
+    else:
+        form = LiabilityForm(request.user.profile)
+    return render_to_response('finance/liability_add', {'form': form, 'liabilities': liabilities},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def liability_view(request, liability_id, response_format='html'):
+    "Single transaction view page"
+    liability = get_object_or_404(Liability, pk=liability_id)
+
+    transactions = liability.transaction_set.all()
+
+    return render_to_response('finance/liability_view',
+                              {'liability': liability,
+                               'transactions': transactions},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+def liability_delete(request, liability_id, response_format='html'):
+    "Liability delete"
+
+    liability = get_object_or_404(Liability, pk=liability_id)
+    if not request.user.profile.has_permission(liability, mode='w'):
+        return user_denied(request, "You don't have access to this Liability", response_format)
+
+    if request.POST:
+        if 'delete' in request.POST:
+            if 'trash' in request.POST:
+                liability.trash = True
+                liability.save()
+            else:
+                liability.delete()
+            return HttpResponseRedirect(reverse('finance_index_liabilities'))
+        elif 'cancel' in request.POST:
+            return HttpResponseRedirect(reverse('finance_liability_view', args=[liability.id]))
+
+    return render_to_response('finance/liability_delete',
+                              {'liability': liability},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+#
+# Receivables
+#
+
+@handle_response_format
+@treeio_login_required
+def index_receivables(request, response_format='html'):
+    "Index_receivables page: displays all Liabilities"
+    if request.GET:
+        query = _get_filter_query(Liability, request.GET)
+    else:
+        query = Q()
+
+    if 'massform' in request.POST:
+        for key in request.POST:
+            if 'mass-liability' in key:
+                try:
+                    liability = Liability.objects.get(pk=request.POST[key])
+                    form = MassActionForm(
+                        request.user.profile, request.POST, instance=liability)
+                    if form.is_valid() and request.user.profile.has_permission(liability, mode='w'):
+                        form.save()
+                except Exception:
+                    pass
+
+    massform = MassActionForm(request.user.profile)
+
+    filters = LiabilityFilterForm(
+        request.user.profile, 'title', request.GET)
+
+    receivables = Object.filter_by_request(
+        request, Liability.objects.filter(query), mode="r")
+
+    template_receivables = []
+    for receivable in receivables:
+        if receivable.account.owner_id == receivable.target_id:
+            template_receivables.append(receivable)
+
+    return render_to_response('finance/index_receivables',
+                              {'liabilities': template_receivables,
+                               'filters': filters,
+                               'massform': massform},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def receivable_add(request, response_format='html'):
+    "new receivable form"
+    if request.POST:
+        if 'cancel' not in request.POST:
+            receivable = Liability()
+            form = ReceivableForm(
+                request.user.profile, request.POST, instance=receivable)
+            if form.is_valid():
+                receivable = form.save(commit=False)
+                receivable.target = receivable.account.owner
+                convert(receivable, 'value')
+                receivable.set_user_from_request(request)
+                return HttpResponseRedirect(reverse('finance_receivable_view', args=[receivable.id]))
+        else:
+            return HttpResponseRedirect(reverse('finance_index_receivables'))
+    else:
+        form = ReceivableForm(request.user.profile)
+    return render_to_response('finance/receivable_add', {'form': form},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def receivable_edit(request, receivable_id, response_format='html'):
+    "Liability edit page"
+    receivable = get_object_or_404(Liability, pk=receivable_id)
+    if request.POST:
+        if 'cancel' not in request.POST:
+            form = ReceivableForm(
+                request.user.profile, request.POST, instance=receivable)
+            if form.is_valid():
+                receivable = form.save(commit=False)
+                convert(receivable, 'value')
+                return HttpResponseRedirect(reverse('finance_receivable_view', args=[receivable.id]))
+        else:
+            return HttpResponseRedirect(reverse('finance_receivable_view', args=[receivable.id]))
+    else:
+        form = ReceivableForm(request.user.profile, instance=receivable)
+    return render_to_response('finance/receivable_edit',
+                              {'form': form, 'liability': receivable},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def receivable_view(request, receivable_id, response_format='html'):
+    "Single receivable view page"
+    receivable = get_object_or_404(Liability, pk=receivable_id)
+    transactions = receivable.transaction_set.all()
+
+    return render_to_response('finance/receivable_view',
+                              {'liability': receivable,
+                               'transactions': transactions},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+def receivable_delete(request, receivable_id, response_format='html'):
+    "Receivable delete"
+
+    receivable = get_object_or_404(Liability, pk=receivable_id)
+    if not request.user.profile.has_permission(receivable, mode='w'):
+        return user_denied(request, "You don't have access to this Receivable", response_format)
+
+    if request.POST:
+        if 'delete' in request.POST:
+            if 'trash' in request.POST:
+                receivable.trash = True
+                receivable.save()
+            else:
+                receivable.delete()
+            return HttpResponseRedirect(reverse('finance_index_receivables'))
+        elif 'cancel' in request.POST:
+            return HttpResponseRedirect(reverse('finance_receivable_view', args=[receivable.id]))
+
+    return render_to_response('finance/receivable_delete',
+                              {'liability': receivable},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+#
+# Reports
+#
+
+
+@handle_response_format
+@treeio_login_required
+def income_view(request, response_format='html'):
+    "Income Statement view page"
+
+    try:
+        conf = ModuleSetting.get_for_module('treeio.finance', 'my_company')[0]
+        my_company = Contact.objects.get(pk=long(conf.value), trash=False)
+
+    except Exception:
+        my_company = None
+
+    if my_company:
+        categories = Category.objects.filter(trash=False)
+        transactions = Transaction.objects.filter(
+            account__owner=my_company, trash=False)
+    else:
+        categories = Object.filter_by_request(request, Category.objects)
+        transactions = Object.filter_by_request(request, Transaction.objects)
+
+    total = 0
+    revenues = 0
+    expenses = 0
+
+    if my_company:
+        # Receivables
+        for receivable in Liability.objects.filter(target=my_company, trash=False):
+            value = receivable.value
+            paid = receivable.transaction_set.filter(
+                source=my_company, trash=False).aggregate(Sum('value'))
+            if paid['value__sum']:
+                value = receivable.value - paid['value__sum']
+            if value > 0:
+                revenues += value
+                total += value
+
+                for category in categories:
+                    if receivable.category == category:
+                        category.revenue += value
+
+    # Actual Transactions
+    for transaction in transactions:
+        val = transaction.get_relative_value()
+        total += val
+        if val > 0:
+            revenues += val
+        else:
+            expenses += abs(val)
+
+    for category in categories:
+        for transaction in transactions:
+            if transaction.category == category:
+                val = transaction.get_relative_value()
+                if val > 0:
+                    category.revenue += val
+                else:
+                    category.expense += abs(val)
+
+    return render_to_response('finance/income_view',
+                              {'transactions': transactions,
+                               'categories': categories,
+                               'total': total,
+                               'revenues': revenues,
+                               'expenses': expenses
+                               },
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def balance_sheet(request, response_format='html'):
+    "Balance Sheet view page"
+
+    balance = {'assets_fixed': Decimal('0.0'),
+               'assets_intangible': Decimal('0.0'),
+               'assets_inventories': Decimal('0.0'),
+               'assets_receivables': Decimal('0.0'),
+               'assets_prepayments': Decimal('0.0'),
+               'assets_cash': Decimal('0.0'),
+               'assets_total': Decimal('0.0'),
+               'liabilities_borrowings': Decimal('0.0'),
+               'liabilities_payables': Decimal('0.0'),
+               'liabilities_total': Decimal('0.0'),
+               'equity_share_capital': Decimal('0.0'),
+               'equity_share_premium': Decimal('0.0'),
+               'equity_retained': Decimal('0.0'),
+               'equity_total': Decimal('0.0'),
+               'equity_liabilities_total': Decimal('0.0')}
+
+    try:
+        conf = ModuleSetting.get_for_module('treeio.finance', 'my_company')[0]
+        my_company = Contact.objects.get(pk=long(conf.value), trash=False)
+    except:
+        my_company = None
+
+    if my_company:
+
+        # Assets Fixed and Intangible
+        for asset in Asset.objects.filter(owner=my_company, current_value__gt=0, trash=False):
+            if asset.asset_type == 'fixed':
+                balance['assets_fixed'] += asset.current_value
+            elif asset.asset_type == 'intangible':
+                balance['assets_intangible'] += asset.current_value
+
+        # Inventories
+        for product in Product.objects.filter(active=True, buy_price__isnull=False, stock_quantity__gt=0,
+                                              trash=False):
+            balance['assets_inventories'] += product.buy_price * \
+                                             product.stock_quantity
+
+        # Receivables
+        for receivable in Liability.objects.filter(target=my_company, trash=False):
+            value = receivable.value
+            paid = receivable.transaction_set.filter(
+                source=my_company, trash=False).aggregate(Sum('value'))
+            if paid['value__sum']:
+                value = receivable.value - paid['value__sum']
+            balance['assets_receivables'] += value
+            balance['equity_retained'] += value
+
+        # Assets Cash
+        for account in Account.objects.filter(owner=my_company, trash=False):
+            account_balance = account.get_balance()
+            if account_balance > 0:
+                balance['assets_cash'] += account_balance
+
+        # Prepayments (and Liabilities, since retrieving Liabilities anyway)
+        for liability in Liability.objects.filter(source=my_company, trash=False):
+            value = liability.value
+            paid = liability.transaction_set.filter(
+                source=my_company, trash=False).aggregate(Sum('value'))
+            if paid['value__sum']:
+                value = liability.value - paid['value__sum']
+            if value > 0:
+                # If Due Date is more than a year from now, that's a borrowing
+                if liability.due_date and liability.due_date >= (datetime.today() + timedelta(days=365)).date():
+                    balance['liabilities_borrowings'] += value
+                else:
+                    balance['liabilities_payables'] += value
+            else:
+                balance['assets_prepayments'] += -value
+
+        # Assets Total
+        balance['assets_total'] = balance['assets_fixed']
+        balance['assets_total'] += balance['assets_intangible']
+        balance['assets_total'] += balance['assets_inventories']
+        balance['assets_total'] += balance['assets_receivables']
+        balance['assets_total'] += balance['assets_prepayments']
+        balance['assets_total'] += balance['assets_cash']
+
+        # Liabilities Total
+        balance['liabilities_total'] += balance['liabilities_borrowings']
+        balance['liabilities_total'] += balance['liabilities_payables']
+
+        # Shares
+        for share in Equity.objects.filter(issuer=my_company, trash=False):
+            capital = share.issue_price * share.amount
+            premium = (share.sell_price - share.issue_price) * share.amount
+            balance['equity_share_capital'] += capital
+            balance['equity_share_premium'] += premium
+
+        # Retained Revenues calculated out of Transactions
+        for transaction in Transaction.objects.filter(account__owner=my_company, trash=False):
+            balance['equity_retained'] += transaction.get_relative_value()
+
+        # Total Equities
+        balance['equity_total'] = balance['equity_share_capital']
+        balance['equity_total'] += balance['equity_share_premium']
+        balance['equity_total'] += balance['equity_retained']
+
+        # Total Equities + Liabilities
+        balance['equity_liabilities_total'] = balance[
+                                                  'equity_total'] + balance['liabilities_total']
+
+    context = {'company': my_company, 'today': datetime.today(), 'red': False}
+    if balance['equity_liabilities_total'] != balance['assets_total']:
+        context['red'] = True
+
+    context.update(balance)
+
+    return render_to_response('finance/balance_sheet', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+#
+# Settings
+#
+@handle_response_format
+@treeio_login_required
+def index_accounts(request, response_format='html'):
+    "Settings"
+
+    if not request.user.profile.is_admin('treeio.finance'):
+        return user_denied(request, message="You don't have administrator access to the Finance module")
+
+    if request.GET:
+        query = _get_filter_query(Account, request.GET)
+    else:
+        query = Q()
+
+    filters = AccountFilterForm(
+        request.user.profile, 'title', request.GET)
+
+    all_accounts = Object.filter_by_request(
+        request, Account.objects.filter(query))
+
+    return render_to_response('finance/index_accounts',
+                              {
+                                  'accounts': all_accounts,
+                                  'filters': filters
+                              },
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+#
+# Settings
+#
+
+
+@treeio_login_required
+@handle_response_format
+def settings_view(request, response_format='html'):
+    "Settings"
+
+    # default currency
+    if not request.user.profile.is_admin('treeio.finance'):
+        return user_denied(request, message="You don't have administrator access to the Finance module")
+
+    try:
+        default_currency = Currency.objects.get(is_default=True)
+    except Exception:
+        default_currency = "$"
+
+    # default company
+    try:
+        conf = ModuleSetting.get_for_module('treeio.finance', 'my_company')[0]
+        my_company = Contact.objects.get(pk=long(conf.value))
+
+    except Exception:
+        my_company = None
+
+    # default account
+    try:
+        conf = ModuleSetting.get_for_module(
+            'treeio.finance', 'default_account')[0]
+        default_account = Account.objects.get(pk=long(conf.value))
+    except Exception:
+        default_account = None
+
+    # check not trashed
+    if my_company:
+        if my_company.trash:
+            my_company = None
+    if default_account:
+        if default_account.trash:
+            default_account = None
+
+    categories = Object.filter_by_request(
+        request, Category.objects.filter(trash=False))
+
+    # all currencies
+    currencies = Object.filter_by_request(
+        request, Currency.objects.filter(trash=False))
+
+    if request.GET and 'export' in request.GET:
+        transactions = Transaction.objects.filter(trash=False)
+        # Export all contacts into a CSV file
+        export = ProcessTransactions()
+        return export.export_transactions(transactions)
+
+    if request.POST:
+        if 'file' in request.FILES:
+            csv_file = request.FILES['file']
+
+            # TODO: check file extension
+            content = csv_file.read()
+            Import = ProcessTransactions()
+            Import.import_transactions(content)
+
+    return render_to_response('finance/settings_view',
+                              {
+                                  'default_account': default_account,
+                                  'default_currency': default_currency,
+                                  'my_company': my_company,
+                                  'categories': categories,
+                                  'currencies': currencies,
+                              },
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+def settings_edit(request, response_format='html'):
+    "Settings"
+
+    if not request.user.profile.is_admin('treeio.finance'):
+        return user_denied(request, message="You don't have administrator access to the Finance module")
+
+    if request.POST:
+        if 'cancel' not in request.POST:
+            form = SettingsForm(request.user.profile, request.POST)
+            if form.is_valid():
+                form.save()
+                return HttpResponseRedirect(reverse('finance_settings_view'))
+        else:
+            return HttpResponseRedirect(reverse('finance_settings_view'))
+    else:
+        form = SettingsForm(request.user.profile)
+
+    return render_to_response('finance/settings_edit',
+                              {
+                                  'form': form,
+                              },
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+#
+# Currency
+#
+
+@treeio_login_required
+@handle_response_format
+def currency_add(request, response_format='html'):
+    "Currency add"
+
+    if not request.user.profile.is_admin('treeio.finance'):
+        return user_denied(request, message="You don't have administrator access to the Finance module")
+
+    if request.POST:
+        if 'cancel' not in request.POST:
+            currency = Currency()
+            form = CurrencyForm(
+                request.user.profile, request.POST, instance=currency)
+            if form.is_valid():
+                currency = form.save(commit=False)
+                cname = dict_currencies[currency.code]
+                currency.name = cname[cname.index(' ') + 2:]
+                # currency.factor = 1.0 #Get currency conversion here
+                currency.save()
+                currency.set_user_from_request(request)
+                return HttpResponseRedirect(reverse('finance_currency_view', args=[currency.id]))
+        else:
+            return HttpResponseRedirect(reverse('finance_settings_view'))
+    else:
+        form = CurrencyForm(request.user.profile)
+
+    return render_to_response('finance/currency_add',
+                              {'form': form,
+                               },
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+def currency_edit(request, currency_id, response_format='html'):
+    "Currency edit"
+
+    currency = get_object_or_404(Currency, pk=currency_id)
+    if not request.user.profile.has_permission(currency, mode='w') \
+            and not request.user.profile.is_admin('treeio_finance'):
+        return user_denied(request, "You don't have access to this Currency", response_format)
+
+    if request.POST:
+        if 'cancel' not in request.POST:
+            form = CurrencyForm(
+                request.user.profile, request.POST, instance=currency)
+            if form.is_valid():
+                currency = form.save()
+                return HttpResponseRedirect(reverse('finance_currency_view', args=[currency.id]))
+        else:
+            return HttpResponseRedirect(reverse('finance_currency_view', args=[currency.id]))
+    else:
+        form = CurrencyForm(request.user.profile, instance=currency)
+
+    return render_to_response('finance/currency_edit',
+                              {'form': form,
+                               'currency': currency},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+def currency_view(request, currency_id, response_format='html'):
+    "View a currency"
+
+    currency = get_object_or_404(Currency, pk=currency_id)
+    if not request.user.profile.has_permission(currency, mode='r') \
+            and not request.user.profile.is_admin('treeio_finance'):
+        return user_denied(request, "You don't have access to this Currency", response_format)
+
+    return render_to_response('finance/currency_view',
+                              {'currency': currency},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+def currency_delete(request, currency_id, response_format='html'):
+    "Currency delete"
+
+    currency = get_object_or_404(Currency, pk=currency_id)
+    if not request.user.profile.has_permission(currency, mode='w'):
+        return user_denied(request, "You don't have access to this Currency", response_format)
+
+    if currency.is_default:
+        return user_denied(request, "You cannot delete the Base Currency", response_format)
+
+    if request.POST:
+        if 'delete' in request.POST:
+            if 'trash' in request.POST:
+                currency.trash = True
+                currency.save()
+            else:
+                currency.delete()
+            return HttpResponseRedirect(reverse('finance_settings_view'))
+        elif 'cancel' in request.POST:
+            return HttpResponseRedirect(reverse('finance_currency_view', args=[currency.id]))
+
+    return render_to_response('finance/currency_delete',
+                              {'currency': currency},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+#
+# Tax
+#
+
+
+@treeio_login_required
+@handle_response_format
+def tax_add(request, response_format='html'):
+    "Tax add"
+
+    if not request.user.profile.is_admin('treeio.finance'):
+        return user_denied(request, message="You don't have administrator access to the Finance module")
+
+    if request.POST:
+        if 'cancel' not in request.POST:
+            tax = Tax()
+            form = TaxForm(
+                request.user.profile, request.POST, instance=tax)
+            if form.is_valid():
+                tax = form.save()
+                tax.set_user_from_request(request)
+                return HttpResponseRedirect(reverse('finance_tax_view', args=[tax.id]))
+        else:
+            return HttpResponseRedirect(reverse('finance_settings_view'))
+    else:
+        form = TaxForm(request.user.profile)
+
+    return render_to_response('finance/tax_add',
+                              {'form': form,
+                               },
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+def tax_edit(request, tax_id, response_format='html'):
+    "Tax edit"
+
+    tax = get_object_or_404(Tax, pk=tax_id)
+    if not request.user.profile.has_permission(tax, mode='w') \
+            and not request.user.profile.is_admin('treeio_finance'):
+        return user_denied(request, "You don't have access to this Tax", response_format)
+
+    if request.POST:
+        if 'cancel' not in request.POST:
+            form = TaxForm(
+                request.user.profile, request.POST, instance=tax)
+            if form.is_valid():
+                tax = form.save()
+                return HttpResponseRedirect(reverse('finance_tax_view', args=[tax.id]))
+        else:
+            return HttpResponseRedirect(reverse('finance_tax_view', args=[tax.id]))
+    else:
+        form = TaxForm(request.user.profile, instance=tax)
+
+    return render_to_response('finance/tax_edit',
+                              {'form': form,
+                               'tax': tax},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+def tax_view(request, tax_id, response_format='html'):
+    "View a tax"
+
+    tax = get_object_or_404(Tax, pk=tax_id)
+    if not request.user.profile.has_permission(tax, mode='r') \
+            and not request.user.profile.is_admin('treeio_finance'):
+        return user_denied(request, "You don't have access to this Tax", response_format)
+
+    return render_to_response('finance/tax_view',
+                              {'tax': tax},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+def tax_delete(request, tax_id, response_format='html'):
+    "Tax delete"
+
+    tax = get_object_or_404(Tax, pk=tax_id)
+    if not request.user.profile.has_permission(tax, mode='w'):
+        return user_denied(request, "You don't have access to this Tax", response_format)
+
+    if request.POST:
+        if 'delete' in request.POST:
+            if 'trash' in request.POST:
+                tax.trash = True
+                tax.save()
+            else:
+                tax.delete()
+            return HttpResponseRedirect(reverse('finance_settings_view'))
+        elif 'cancel' in request.POST:
+            return HttpResponseRedirect(reverse('finance_tax_view', args=[tax.id]))
+
+    return render_to_response('finance/tax_delete',
+                              {'tax': tax},
+                              context_instance=RequestContext(request), response_format=response_format)
diff --git a/data/treeio/treeio/treeio/identities/api/handlers.py b/data/treeio/treeio/treeio/identities/api/handlers.py
new file mode 100644
index 0000000..5fd4c2d
--- /dev/null
+++ b/data/treeio/treeio/treeio/identities/api/handlers.py
@@ -0,0 +1,124 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+# -*- coding:utf-8 -*-
+
+from __future__ import absolute_import, with_statement
+
+__all__ = ['ContactFieldHandler', 'ContactTypeHandler', 'ContactHandler']
+
+from treeio.core.api.utils import rc
+from treeio.identities.models import ContactField, ContactType, Contact
+from treeio.identities.forms import ContactForm, ContactTypeForm, ContactFieldForm
+from treeio.core.api.handlers import ObjectHandler, getOrNone
+
+
+class ContactFieldHandler(ObjectHandler):
+    "Entrypoint for ContactField model."
+    model = ContactField
+    form = ContactFieldForm
+
+    @classmethod
+    def resource_uri(cls, obj=None):
+        object_id = "id"
+        if obj is not None:
+            object_id = obj.id
+        return ('api_identities_fields', [object_id])
+
+    def flatten_dict(self, request):
+        return {'data': super(ObjectHandler, self).flatten_dict(request.data)}
+
+    def check_create_permission(self, request, mode):
+        return request.user.profile.is_admin('treeio.identities')
+
+
+class ContactTypeHandler(ObjectHandler):
+    "Entrypoint for ContactType model."
+    model = ContactType
+    form = ContactTypeForm
+    fields = ('id',) + ContactTypeForm._meta.fields
+
+    @classmethod
+    def resource_uri(cls, obj=None):
+        object_id = "id"
+        if obj is not None:
+            object_id = obj.id
+        return ('api_identities_types', [object_id])
+
+    def check_create_permission(self, request, mode):
+        return request.user.profile.is_admin('treeio.identities')
+
+
+class ContactHandler(ObjectHandler):
+    "Entrypoint for Contact model."
+    model = Contact
+    form = ContactForm
+    fields = ['id', ('contactvalue_set', ('name', 'value'))] + \
+             [i.name for i in model._meta.local_fields if i.name != 'object_ptr']
+
+    @classmethod
+    def resource_uri(cls, obj=None):
+        object_id = "id"
+        if obj is not None:
+            object_id = obj.id
+        return ('api_identities_contacts', [object_id])
+
+    def create_instance(self, request, *args, **kwargs):
+        return None
+
+    def check_create_permission(self, request, mode):
+        type_pk = request.REQUEST.get('type')
+        try:
+            request.contact_type = ContactType.objects.get(pk=type_pk)
+            return request.user.profile.has_permission(request.contact_type, mode='x')
+        except ContactType.DoesNotExist:
+            return True
+
+    def create(self, request, *args, **kwargs):
+        if request.data is None:
+            return rc.BAD_REQUEST
+
+        contact_type = getOrNone(ContactType, request.data.get('contact_type'))
+        if not contact_type or not request.user.profile.has_permission(contact_type, mode='x'):
+            return rc.FORBIDDEN
+
+        attrs = self.flatten_dict(request)
+
+        form = ContactForm(contact_type=contact_type, **attrs)
+        if form.is_valid():
+            contact = form.save(request, contact_type)
+            contact.set_user_from_request(request)
+            return contact
+        else:
+            self.status = 400
+            return form.errors
+
+    def update(self, request, *args, **kwargs):
+        if request.data is None:
+            return rc.BAD_REQUEST
+
+        pkfield = kwargs.get(self.model._meta.pk.name) or request.data.get(
+            self.model._meta.pk.name)
+
+        if not pkfield:
+            return rc.BAD_REQUEST
+
+        item = getOrNone(self.model, pkfield)
+        if not item:
+            return rc.NOT_FOUND
+
+        if not request.user.profile.has_permission(item, mode="w"):
+            return rc.FORBIDDEN
+
+        attrs = self.flatten_dict(request)
+
+        form = ContactForm(
+            contact_type=item.contact_type, instance=item, **attrs)
+        if form.is_valid():
+            item = form.save(request)
+            return item
+        else:
+            self.status = 400
+            return form.errors
diff --git a/data/treeio/treeio/treeio/identities/integration.py b/data/treeio/treeio/treeio/identities/integration.py
new file mode 100644
index 0000000..0d047ee
--- /dev/null
+++ b/data/treeio/treeio/treeio/identities/integration.py
@@ -0,0 +1,248 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+"""
+Identities Integration library
+"""
+from treeio.core.models import Object, ModuleSetting
+from treeio.identities.models import Contact, ContactType, ContactValue
+from nuconnector import Connector, DataBlock
+from django.db.models import Q
+from django.db import transaction
+from treeio.core.conf import settings
+
+
+def _clean_missing(resource_id, items, user):
+    "Clean items missing from data of their original resource"
+    key = '#' + unicode(resource_id) + '.'
+    contacts = Object.filter_permitted(
+        user, Contact.objects).filter(nuvius_resource__contains=key)
+    if not len(contacts) == len(items):
+        candidates = []
+        for contact in contacts:
+            found = False
+            for item in items:
+                itemkey = key + unicode(item.id.raw)
+                if itemkey in contact.nuvius_resource:
+                    found = True
+            if not found:
+                candidates.append(contact)
+        for victim in candidates:
+            victim.subscribers.clear()
+            victim.delete()
+
+
+def _find_duplicates(resource_id, item, user):
+    "Finds matching items"
+
+    dups = []
+    item_id = None
+    if 'id' in item.raw:
+        item_id = item.id.raw
+
+    # Finding previously syncd items
+    if item_id:
+        key = '#' + unicode(resource_id) + '.' + unicode(item_id) + '#'
+        dups = Object.filter_permitted(user, Contact.objects).filter(
+            nuvius_resource__contains=key)
+        if dups:
+            return dups
+
+    # Finding equivalent items
+    # If name and (email or phone) are the same - it's same person
+    if item.name:
+        candidates = Object.filter_permitted(
+            user, Contact.objects).filter(name=item.name.raw).distinct()
+        dups = []
+        if candidates and (item.email or item.phone):
+            for candidate in candidates:
+                matching_emails = []
+                emails = candidate.contactvalue_set.filter(
+                    field__field_type='email')
+                if item.email.raw and emails:
+                    matching_emails = emails.filter(value__in=item.email.raw)
+                phones = candidate.contactvalue_set.filter(
+                    field__field_type='phone')
+                matching_phones = []
+                if item.phone.raw and phones:
+                    matching_phones = phones.filter(value__in=item.phone.raw)
+                # If anything matches or if we have no emails or no phones at
+                # all - add to duplicates
+                if matching_emails or matching_phones or (not emails and not phones):
+                    dups.append(candidate)
+        elif not candidates and (item.email or item.phone):
+            query = Q()
+            if item.email:
+                query = query & Q(contactvalue__value__in=item.email.raw)
+            if item.phone:
+                query = query | Q(contactvalue__value__in=item.phone.raw)
+            dups = Object.filter_permitted(
+                user, Contact.objects).filter(query).distinct()
+        else:
+            dups = candidates
+    elif item.email or item.phone:
+        query = Q()
+        if item.email:
+            query = query & Q(contactvalue__value__in=item.email.raw)
+        if item.phone:
+            query = query & Q(contactvalue__value__in=item.phone.raw)
+        dups = Object.filter_permitted(user, Contact.objects).filter(query)
+
+    return dups
+
+
+def _get_contact_type(user):
+    "Returns default contact_type for integration"
+    contact_type_name = getattr(
+        settings, 'HARDTREE_IDENTITIES_DEFAULT_TYPE', 'person')
+    contact_type = Object.filter_permitted(
+        user, ContactType.objects).filter(name__iexact=contact_type_name)
+    try:
+        contact_type = contact_type[0]
+    except IndexError:
+        contact_type = None
+    return contact_type
+
+
+@transaction.commit_manually
+def _do_sync(data, user):
+    "Run updates"
+
+    resource_id = data.info.application.id.raw
+
+    contact_type = _get_contact_type(user)
+
+    for item in data.result:
+        item_id = None
+        if 'id' in item.raw:
+            item_id = item.id.raw
+        dups = _find_duplicates(resource_id, item, user)
+        if dups:
+            for contact in dups:
+                transaction.commit()
+                try:
+                    fields = contact.contact_type.fields
+                    contact.add_nuvius_resource(resource_id, item_id)
+                    if item.name.raw:
+                        contact.name = item.name.raw
+                    if item.email:
+                        fs = fields.filter(field_type='email')
+                        if fs:
+                            for iemail in item.email:
+                                values = contact.contactvalue_set.filter(
+                                    field__in=fs, value=iemail.raw)
+                                if not values:
+                                    value = ContactValue(
+                                        contact=contact, field=fs[0], value=iemail.raw)
+                                    value.save()
+                    if item.phone:
+                        fs = fields.filter(field_type='phone')
+                        if fs:
+                            for iphone in item.phone:
+                                values = contact.contactvalue_set.filter(
+                                    field__in=fs, value=iphone.raw)
+                                if not values:
+                                    value = ContactValue(
+                                        contact=contact, field=fs[0], value=iphone.raw)
+                                    value.save()
+
+                    if item.address:
+                        fs = fields.filter(name='address')
+                        if fs:
+                            for iaddress in item.address:
+                                values = contact.contactvalue_set.filter(
+                                    field__in=fs, value__icontains=iaddress.raw)
+                                if not values:
+                                    value = ContactValue(
+                                        contact=contact, field=fs[0], value=iaddress.raw)
+                                    value.save()
+                    if item.website:
+                        fs = fields.filter(name='website')
+                        if fs:
+                            for iwebsite in item.website:
+                                values = contact.contactvalue_set.filter(
+                                    field__in=fs, value__icontains=iwebsite.raw)
+                                if not values:
+                                    value = ContactValue(
+                                        contact=contact, field=fs[0], value=iwebsite.raw)
+                                    value.save()
+                    contact.auto_notify = False
+                    contact.save()
+                    transaction.commit()
+                except KeyboardInterrupt:
+                    transaction.rollback()
+                    break
+                except:
+                    transaction.rollback()
+        else:
+            if contact_type and item.name.raw:
+                transaction.commit()
+                try:
+                    contact = Contact(contact_type=contact_type)
+                    contact.add_nuvius_resource(resource_id, item_id)
+                    contact.name = item.name.raw
+                    contact.auto_notify = False
+                    contact.set_user(user)
+                    contact.save()
+                    fields = contact_type.fields
+                    if item.email:
+                        fs = fields.filter(field_type='email')
+                        if fs:
+                            for iemail in item.email:
+                                value = ContactValue(
+                                    contact=contact, field=fs[0], value=iemail.raw)
+                                value.save()
+                    if item.phone:
+                        fs = fields.filter(field_type='phone')
+                        if fs:
+                            for iphone in item.phone:
+                                value = ContactValue(
+                                    contact=contact, field=fs[0], value=iphone.raw)
+                                value.save()
+                    if item.address:
+                        fs = fields.filter(name='address')
+                        if fs:
+                            for iaddress in item.address:
+                                value = ContactValue(
+                                    contact=contact, field=fs[0], value=iaddress.raw)
+                                value.save()
+                    if item.website:
+                        fs = fields.filter(name='website')
+                        if fs:
+                            for iwebsite in item.website:
+                                value = ContactValue(
+                                    contact=contact, field=fs[0], value=iwebsite.raw)
+                                value.save()
+                    transaction.commit()
+                except KeyboardInterrupt:
+                    transaction.rollback()
+                    break
+                except:
+                    transaction.rollback()
+
+    _clean_missing(resource_id, data.result, user)
+
+
+def sync(user=None):
+
+    if user:
+        conf = ModuleSetting.get('nuvius_profile', user=user, strict=True)
+    else:
+        conf = ModuleSetting.get('nuvius_profile')
+
+    for item in conf:
+        profile = item.loads()
+        user = item.user
+        if user:
+            connector = Connector(profile_id=profile['id'])
+            active_resources = ModuleSetting.get_for_module(
+                'treeio.identities', 'integration_resource', user=user, strict=True)
+            for resource in active_resources:
+                res = resource.loads()
+                response = connector.get(
+                    '/service/contact-book/contact/data.json/id' + profile['id'] + '/app' + str(res.resource_id))
+                data = DataBlock(response['data'])
+                if data.result_name == 'success':
+                    _do_sync(data, user)
diff --git a/data/treeio/treeio/treeio/identities/models.py b/data/treeio/treeio/treeio/identities/models.py
new file mode 100644
index 0000000..074199d
--- /dev/null
+++ b/data/treeio/treeio/treeio/identities/models.py
@@ -0,0 +1,185 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+"""
+Identities module objects
+"""
+
+from django.db import models
+from treeio.core.models import AccessEntity, User, Object
+from django.core.urlresolvers import reverse
+from django.db.models.signals import post_save
+from treeio.core.conf import settings
+from django.template import defaultfilters
+from unidecode import unidecode
+
+
+class ContactField(Object):
+    "Represents a field within a ContentType"
+    FIELD_TYPES = (
+        ('text', 'Text'),
+        ('textarea', 'Multiline Text'),
+        ('details', 'Details'),
+        ('url', 'URL'),
+        ('email', 'E-mail'),
+        ('phone', 'Phone'),
+        ('picture', 'Picture'),
+        ('date', 'Date')
+    )
+
+    name = models.CharField(max_length=256)
+    label = models.CharField(max_length=256)
+    field_type = models.CharField(max_length=64, choices=FIELD_TYPES)
+    required = models.BooleanField(default=False)
+    allowed_values = models.TextField(blank=True, null=True)
+    details = models.TextField(blank=True, null=True)
+
+    searchable = False
+
+    class Meta:
+        "ContactField"
+        ordering = ['name']
+
+    def __unicode__(self):
+        return self.label
+
+
+class ContactType(Object):
+    "Defines a type of Contact entities"
+    name = models.CharField(max_length=256)
+    slug = models.CharField(max_length=256)
+    details = models.TextField(blank=True, null=True)
+    fields = models.ManyToManyField(ContactField, blank=True, null=True)
+
+    class Meta:
+        "ContactType"
+        ordering = ['name']
+
+    def __unicode__(self):
+        return self.name
+
+    def get_absolute_url(self):
+        "Returns absolute URL of the object"
+        try:
+            return reverse('identities_index_by_type', args=[self.slug])
+        except Exception:
+            return ""
+
+    def save(self, *args, **kwargs):
+        "Override to auto-set slug"
+        self.slug = unicode(self.name).replace(" ", "-")
+        self.slug = defaultfilters.slugify(unidecode(self.slug))
+        super(ContactType, self).save(*args, **kwargs)
+
+
+class Contact(Object):
+    """Information about a company, group or user. By design allows custom fields defined in ContactField"""
+    contact_type = models.ForeignKey(ContactType)
+    name = models.CharField(max_length=256)
+    parent = models.ForeignKey(
+        'self', blank=True, null=True, related_name='child_set')
+    related_user = models.ForeignKey(
+        AccessEntity, blank=True, null=True, on_delete=models.SET_NULL)
+
+    access_inherit = ('parent', '*module', '*user')
+
+    class Meta:
+        "Contact"
+        ordering = ['name']
+
+    def __unicode__(self):
+        return self.name
+
+    def get_absolute_url(self):
+        "Returns absolute URL of the object"
+        try:
+            return reverse('identities_contact_view', args=[self.id])
+        except Exception:
+            return ""
+
+    def get_email(self):
+        "Returns the first available e-mail"
+        values = self.contactvalue_set.filter(
+            field__field_type='email', value__isnull=False)
+        if values:
+            return values[0].value
+        return ''
+
+    def get_picture(self):
+        values = self.contactvalue_set.filter(
+            field__field_type='picture', value__isnull=False)
+        if values and values[0].value:
+            return values[0].value
+
+        return reverse('identities_contact_view_picture', args=[self.id])
+
+    def get_or_create_by_email(email, name=None, contact_type=None):
+        """
+        Using a given email tries to find an existing Contact or create new one if not found.
+        If name is not specified the given email address is used for name instead.
+        """
+        created = False
+        if not contact_type:
+            try:
+                contact_type = ContactType.objects.get(slug='person')
+            except ContactType.DoesNotExist:
+                try:
+                    contact_type = ContactType.objects.all()[0]
+                except KeyError:
+                    return None, created
+
+        if not name:
+            name = email
+
+        contact = Contact.objects.filter(
+            contactvalue__value=email, contactvalue__field__field_type='email')[:1]
+        if contact:
+            return contact[0], created
+        else:
+            contact = Contact(contact_type=contact_type, name=name)
+            contact.save()
+            created = True
+            try:
+                emailfield = contact_type.fields.filter(
+                    field_type='email')[:1][0]
+                ContactValue(
+                    field=emailfield, contact=contact, value=email).save()
+            except IndexError:
+                pass
+
+        return contact, created
+
+    get_or_create_by_email = staticmethod(get_or_create_by_email)
+
+
+class ContactValue(models.Model):
+    "A value selected for a Contact"
+    field = models.ForeignKey(ContactField)
+    contact = models.ForeignKey(Contact)
+    value = models.CharField(max_length=1024, null=True, blank=True)
+
+    def __unicode__(self):
+        return self.value
+
+    def name(self):
+        return self.field.name
+
+
+def contact_autocreate_handler(sender, instance, created, **kwargs):
+    "When a User is created, automatically create a Contact of type Person"
+    if created:
+        try:
+            contact_type = ContactType.objects.filter(
+                models.Q(name='Person') | models.Q(slug='person'))[0]
+            contact = Contact(
+                contact_type=contact_type, name=instance.name, related_user=instance)
+            contact.save()
+        except:
+            pass
+
+
+# Autocreate a Contact when Hardtree user is created
+if getattr(settings, 'HARDTREE_SIGNALS_AUTOCREATE_CONTACT', True):
+    post_save.connect(contact_autocreate_handler, sender=User)
diff --git a/data/treeio/treeio/treeio/identities/objects.py b/data/treeio/treeio/treeio/identities/objects.py
new file mode 100644
index 0000000..c25314c
--- /dev/null
+++ b/data/treeio/treeio/treeio/identities/objects.py
@@ -0,0 +1,142 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+"""
+Contact module helpers
+"""
+from treeio.core.models import Module
+from django.utils.translation import ugettext_lazy as _
+
+
+def _get_module_objects(module, current_user, related, getter_name):
+
+    try:
+        import_name = module.name + ".identities"
+        modident = __import__(import_name, fromlist=[str(module.name)])
+        getter = getattr(modident, getter_name)
+        return getter(current_user, related)
+    except ImportError:
+        pass
+    except AttributeError:
+        pass
+    except KeyError:
+        pass
+
+    return {}
+
+
+def _preformat_objects(modules, objects):
+    """
+    Formats objects returned from get_contact_objects or get_user_objects
+    for a more convenient output and templating, structured by module
+    """
+
+    output = {}
+
+    if objects:
+        for module in modules:
+            output[module.name] = {'module': module,
+                                   'label': _(module.title),
+                                   'count': 0,
+                                   'objects': {}}
+            for key in objects:
+                if objects[key]['module'] == module:
+                    if hasattr(objects[key]['objects'], 'count'):
+                        output[module.name][
+                            'count'] += objects[key]['objects'].count()
+                    objects[key]['label'] = _(objects[key]['label'])
+                    output[module.name]['objects'][key] = objects[key]
+
+    return output
+
+
+def get_contact_objects(current_user, contact, module=None, preformat=False):
+    """
+    Returns a dictionary with keys specified as contact attributes
+    and values as dictionaries with labels and set of relevant objects.
+
+    Only modules enabled for the current_user are considered.
+    """
+
+    objects = dict()
+
+    if module:
+        contact_objects = _get_module_objects(
+            module, current_user, contact, 'get_contact_objects')
+        if contact_objects:
+            for key in contact_objects:
+                contact_objects[key]['module'] = module
+            objects.update(contact_objects)
+        if contact.related_user:
+            try:
+                objects.update(
+                    get_user_objects(current_user, contact.related_user.user, module))
+            except:
+                pass
+        modules = [module]
+    else:
+        perspective = current_user.get_perspective()
+
+        modules = perspective.modules.filter(display=True).order_by('title')
+        if not modules:
+            modules = Module.objects.filter(display=True).order_by('title')
+
+        for module in modules:
+            contact_objects = _get_module_objects(
+                module, current_user, contact, 'get_contact_objects')
+            if contact_objects:
+                for key in contact_objects:
+                    contact_objects[key]['module'] = module
+                objects.update(contact_objects)
+            if contact.related_user:
+                try:
+                    objects.update(
+                        get_user_objects(current_user, contact.related_user.user, module))
+                except:
+                    pass
+
+    if preformat:
+        return _preformat_objects(modules, objects)
+
+    return objects
+
+
+def get_user_objects(current_user, user, module=None, preformat=False):
+    """
+    Returns a dictionary with keys specified as user attributes
+    and values as dictionaries with labels, number of relevant objects,
+    and optionally the actual set of relevant objects.
+
+    Only modules enabled for the current_user are considered.
+    """
+
+    objects = dict()
+
+    if module:
+        user_objects = _get_module_objects(
+            module, current_user, user, 'get_user_objects')
+        if user_objects:
+            for key in user_objects:
+                user_objects[key]['module'] = module
+                objects['related_user.' + key] = user_objects[key]
+        modules = [module]
+    else:
+        perspective = current_user.get_perspective()
+
+        modules = perspective.modules.filter(display=True).order_by('title')
+        if not modules:
+            modules = Module.objects.filter(display=True).order_by('title')
+
+        for module in modules:
+            user_objects = _get_module_objects(
+                module, current_user, user, 'get_user_objects')
+            if user_objects:
+                for key in user_objects:
+                    user_objects[key]['module'] = module
+                    objects['related_user.' + key] = user_objects[key]
+
+    if preformat:
+        return _preformat_objects(modules, objects)
+    return objects
diff --git a/data/treeio/treeio/treeio/identities/south_migrations/0001_initial.py b/data/treeio/treeio/treeio/identities/south_migrations/0001_initial.py
new file mode 100644
index 0000000..107d252
--- /dev/null
+++ b/data/treeio/treeio/treeio/identities/south_migrations/0001_initial.py
@@ -0,0 +1,221 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Adding model 'ContactField'
+        db.create_table('identities_contactfield', (
+            ('object_ptr', self.gf('django.db.models.fields.related.OneToOneField')(
+                to=orm['core.Object'], unique=True, primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')
+             (max_length=256)),
+            ('label', self.gf('django.db.models.fields.CharField')
+             (max_length=256)),
+            ('field_type', self.gf(
+                'django.db.models.fields.CharField')(max_length=64)),
+            ('required', self.gf(
+                'django.db.models.fields.BooleanField')(default=False)),
+            ('allowed_values', self.gf('django.db.models.fields.TextField')
+             (null=True, blank=True)),
+            ('details', self.gf('django.db.models.fields.TextField')
+             (null=True, blank=True)),
+        ))
+        db.send_create_signal('identities', ['ContactField'])
+
+        # Adding model 'ContactType'
+        db.create_table('identities_contacttype', (
+            ('object_ptr', self.gf('django.db.models.fields.related.OneToOneField')(
+                to=orm['core.Object'], unique=True, primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')
+             (max_length=256)),
+            ('slug', self.gf('django.db.models.fields.CharField')
+             (max_length=256)),
+            ('details', self.gf('django.db.models.fields.TextField')
+             (null=True, blank=True)),
+        ))
+        db.send_create_signal('identities', ['ContactType'])
+
+        # Adding M2M table for field fields on 'ContactType'
+        db.create_table('identities_contacttype_fields', (
+            ('id', models.AutoField(
+                verbose_name='ID', primary_key=True, auto_created=True)),
+            ('contacttype', models.ForeignKey(
+                orm['identities.contacttype'], null=False)),
+            ('contactfield', models.ForeignKey(
+                orm['identities.contactfield'], null=False))
+        ))
+        db.create_unique(
+            'identities_contacttype_fields', ['contacttype_id', 'contactfield_id'])
+
+        # Adding model 'Contact'
+        db.create_table('identities_contact', (
+            ('object_ptr', self.gf('django.db.models.fields.related.OneToOneField')(
+                to=orm['core.Object'], unique=True, primary_key=True)),
+            ('contact_type', self.gf('django.db.models.fields.related.ForeignKey')(
+                to=orm['identities.ContactType'])),
+            ('name', self.gf('django.db.models.fields.CharField')
+             (max_length=256)),
+            ('parent', self.gf('django.db.models.fields.related.ForeignKey')(
+                blank=True, related_name='child_set', null=True, to=orm['identities.Contact'])),
+            ('related_user', self.gf('django.db.models.fields.related.ForeignKey')(
+                to=orm['core.User'], null=True, blank=True)),
+            ('related_group', self.gf('django.db.models.fields.related.ForeignKey')(
+                to=orm['core.Group'], null=True, blank=True)),
+        ))
+        db.send_create_signal('identities', ['Contact'])
+
+        # Adding model 'ContactValue'
+        db.create_table('identities_contactvalue', (
+            ('id', self.gf('django.db.models.fields.AutoField')
+             (primary_key=True)),
+            ('field', self.gf('django.db.models.fields.related.ForeignKey')
+             (to=orm['identities.ContactField'])),
+            ('contact', self.gf('django.db.models.fields.related.ForeignKey')
+             (to=orm['identities.Contact'])),
+            ('value', self.gf('django.db.models.fields.CharField')
+             (max_length=1024, null=True, blank=True)),
+        ))
+        db.send_create_signal('identities', ['ContactValue'])
+
+    def backwards(self, orm):
+
+        # Deleting model 'ContactField'
+        db.delete_table('identities_contactfield')
+
+        # Deleting model 'ContactType'
+        db.delete_table('identities_contacttype')
+
+        # Removing M2M table for field fields on 'ContactType'
+        db.delete_table('identities_contacttype_fields')
+
+        # Deleting model 'Contact'
+        db.delete_table('identities_contact')
+
+        # Deleting model 'ContactValue'
+        db.delete_table('identities_contactvalue')
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'core.group': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Group'},
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['core.Group']"})
+        },
+        'core.object': {
+            'Meta': {'object_name': 'Object'},
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'everybody_execute': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'everybody_read': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'everybody_write': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Group']"}),
+            'group_execute': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'group_read': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'group_write': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'links': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'links_rel_+'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'nuvius_resource': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'object_name': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'object_type': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'subscribers': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'subscriptions'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'trash': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']"}),
+            'user_execute': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'user_read': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'user_write': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'core.user': {
+            'Meta': {'ordering': "['name']", 'object_name': 'User'},
+            'default_group': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'default_user_set'", 'null': 'True', 'to': "orm['core.Group']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'other_groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'identities.contact': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Contact', '_ormbases': ['core.Object']},
+            'contact_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.ContactType']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['identities.Contact']"}),
+            'related_group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'related_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'})
+        },
+        'identities.contactfield': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ContactField', '_ormbases': ['core.Object']},
+            'allowed_values': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'field_type': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'required': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'identities.contacttype': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ContactType', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'fields': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['identities.ContactField']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'slug': ('django.db.models.fields.CharField', [], {'max_length': '256'})
+        },
+        'identities.contactvalue': {
+            'Meta': {'object_name': 'ContactValue'},
+            'contact': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.Contact']"}),
+            'field': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.ContactField']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'value': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['identities']
diff --git a/data/treeio/treeio/treeio/identities/south_migrations/0002_auto__chg_field_contact_related_user.py b/data/treeio/treeio/treeio/identities/south_migrations/0002_auto__chg_field_contact_related_user.py
new file mode 100644
index 0000000..a659c05
--- /dev/null
+++ b/data/treeio/treeio/treeio/identities/south_migrations/0002_auto__chg_field_contact_related_user.py
@@ -0,0 +1,158 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Changing field 'Contact.related_user'
+        db.alter_column('identities_contact', 'related_user_id', self.gf(
+            'django.db.models.fields.related.ForeignKey')(to=orm['core.AccessEntity'], null=True))
+
+    def backwards(self, orm):
+
+        # Changing field 'Contact.related_user'
+        db.alter_column('identities_contact', 'related_user_id', self.gf(
+            'django.db.models.fields.related.ForeignKey')(to=orm['core.User'], null=True))
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'core.accessentity': {
+            'Meta': {'object_name': 'AccessEntity'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        },
+        'core.comment': {
+            'Meta': {'object_name': 'Comment'},
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'}),
+            'body': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"})
+        },
+        'core.group': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Group'},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['core.Group']"})
+        },
+        'core.object': {
+            'Meta': {'object_name': 'Object'},
+            'comments': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.Comment']"}),
+            'creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'objects_created'", 'null': 'True', 'to': "orm['core.User']"}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'full_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_full_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'links': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'links_rel_+'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'nuvius_resource': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'object_name': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'object_type': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'read_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_read_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'subscribers': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'subscriptions'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Tag']", 'null': 'True', 'blank': 'True'}),
+            'trash': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'core.tag': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Tag'},
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'})
+        },
+        'core.user': {
+            'Meta': {'ordering': "['name']", 'object_name': 'User'},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True'}),
+            'default_group': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'default_user_set'", 'null': 'True', 'to': "orm['core.Group']"}),
+            'disabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_access': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'other_groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'identities.contact': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Contact', '_ormbases': ['core.Object']},
+            'contact_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.ContactType']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['identities.Contact']"}),
+            'related_group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'related_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.AccessEntity']", 'null': 'True', 'blank': 'True'})
+        },
+        'identities.contactfield': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ContactField', '_ormbases': ['core.Object']},
+            'allowed_values': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'field_type': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'required': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'identities.contacttype': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ContactType', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'fields': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['identities.ContactField']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'slug': ('django.db.models.fields.CharField', [], {'max_length': '256'})
+        },
+        'identities.contactvalue': {
+            'Meta': {'object_name': 'ContactValue'},
+            'contact': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.Contact']"}),
+            'field': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.ContactField']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'value': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['identities']
diff --git a/data/treeio/treeio/treeio/identities/south_migrations/0003_related_accessentity.py b/data/treeio/treeio/treeio/identities/south_migrations/0003_related_accessentity.py
new file mode 100644
index 0000000..6889f6d
--- /dev/null
+++ b/data/treeio/treeio/treeio/identities/south_migrations/0003_related_accessentity.py
@@ -0,0 +1,156 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import DataMigration
+from django.db import models
+
+
+class Migration(DataMigration):
+
+    def forwards(self, orm):
+        "Migrate Contacts to have relate to an AccessEntity instead of User/Group"
+        for contact in orm['identities.Contact'].objects.all():
+            if not contact.related_user and contact.related_group:
+                contact.related_user = contact.related_group.accessentity_ptr
+                contact.save()
+
+    def backwards(self, orm):
+        raise RuntimeError("Cannot reverse this migration.")
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'core.accessentity': {
+            'Meta': {'object_name': 'AccessEntity'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        },
+        'core.comment': {
+            'Meta': {'object_name': 'Comment'},
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'}),
+            'body': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"})
+        },
+        'core.group': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Group'},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['core.Group']"})
+        },
+        'core.object': {
+            'Meta': {'object_name': 'Object'},
+            'comments': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.Comment']"}),
+            'creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'objects_created'", 'null': 'True', 'to': "orm['core.User']"}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'full_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_full_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'links': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'links_rel_+'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'nuvius_resource': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'object_name': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'object_type': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'read_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_read_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'subscribers': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'subscriptions'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Tag']", 'null': 'True', 'blank': 'True'}),
+            'trash': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'core.tag': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Tag'},
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'})
+        },
+        'core.user': {
+            'Meta': {'ordering': "['name']", 'object_name': 'User'},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True'}),
+            'default_group': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'default_user_set'", 'null': 'True', 'to': "orm['core.Group']"}),
+            'disabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_access': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'other_groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'identities.contact': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Contact', '_ormbases': ['core.Object']},
+            'contact_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.ContactType']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['identities.Contact']"}),
+            'related_group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'related_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.AccessEntity']", 'null': 'True', 'blank': 'True'})
+        },
+        'identities.contactfield': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ContactField', '_ormbases': ['core.Object']},
+            'allowed_values': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'field_type': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'required': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'identities.contacttype': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ContactType', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'fields': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['identities.ContactField']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'slug': ('django.db.models.fields.CharField', [], {'max_length': '256'})
+        },
+        'identities.contactvalue': {
+            'Meta': {'object_name': 'ContactValue'},
+            'contact': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.Contact']"}),
+            'field': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.ContactField']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'value': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['identities']
diff --git a/data/treeio/treeio/treeio/identities/south_migrations/0004_auto__del_field_contact_related_group.py b/data/treeio/treeio/treeio/identities/south_migrations/0004_auto__del_field_contact_related_group.py
new file mode 100644
index 0000000..cb2de44
--- /dev/null
+++ b/data/treeio/treeio/treeio/identities/south_migrations/0004_auto__del_field_contact_related_group.py
@@ -0,0 +1,154 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Deleting field 'Contact.related_group'
+        db.delete_column('identities_contact', 'related_group_id')
+
+    def backwards(self, orm):
+
+        # Adding field 'Contact.related_group'
+        db.add_column('identities_contact', 'related_group', self.gf('django.db.models.fields.related.ForeignKey')(
+            to=orm['core.Group'], null=True, blank=True), keep_default=False)
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'core.accessentity': {
+            'Meta': {'object_name': 'AccessEntity'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        },
+        'core.comment': {
+            'Meta': {'object_name': 'Comment'},
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'}),
+            'body': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"})
+        },
+        'core.group': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Group', '_ormbases': ['core.AccessEntity']},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True', 'primary_key': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['core.Group']"})
+        },
+        'core.object': {
+            'Meta': {'object_name': 'Object'},
+            'comments': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.Comment']"}),
+            'creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'objects_created'", 'null': 'True', 'to': "orm['core.User']"}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'full_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_full_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'links': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'links_rel_+'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'nuvius_resource': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'object_name': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'object_type': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'read_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_read_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'subscribers': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'subscriptions'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Tag']", 'null': 'True', 'blank': 'True'}),
+            'trash': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'core.tag': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Tag'},
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'})
+        },
+        'core.user': {
+            'Meta': {'ordering': "['name']", 'object_name': 'User', '_ormbases': ['core.AccessEntity']},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True', 'primary_key': 'True'}),
+            'default_group': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'default_user_set'", 'null': 'True', 'to': "orm['core.Group']"}),
+            'disabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_access': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'other_groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'identities.contact': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Contact', '_ormbases': ['core.Object']},
+            'contact_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.ContactType']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['identities.Contact']"}),
+            'related_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.AccessEntity']", 'null': 'True', 'blank': 'True'})
+        },
+        'identities.contactfield': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ContactField', '_ormbases': ['core.Object']},
+            'allowed_values': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'field_type': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'required': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'identities.contacttype': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ContactType', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'fields': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['identities.ContactField']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'slug': ('django.db.models.fields.CharField', [], {'max_length': '256'})
+        },
+        'identities.contactvalue': {
+            'Meta': {'object_name': 'ContactValue'},
+            'contact': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.Contact']"}),
+            'field': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.ContactField']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'value': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['identities']
diff --git a/data/treeio/treeio/treeio/infrastructure/api/handlers.py b/data/treeio/treeio/treeio/infrastructure/api/handlers.py
new file mode 100644
index 0000000..4295ea6
--- /dev/null
+++ b/data/treeio/treeio/treeio/infrastructure/api/handlers.py
@@ -0,0 +1,164 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+# -*- coding: utf-8 -*-
+
+from __future__ import absolute_import, with_statement
+
+__all__ = ['ItemFieldHandler', 'ItemTypeHandler', 'ItemTypeHandler',
+           'ItemStatusHandler', 'ItemServicingHandler', 'ItemHandler',
+           'LocationHandler']
+
+from treeio.core.api.utils import rc
+from treeio.core.api.handlers import ObjectHandler, getOrNone
+from treeio.core.models import Location
+from treeio.infrastructure.models import Item, ItemField, ItemType, ItemStatus, ItemServicing
+from treeio.core.forms import LocationForm
+from treeio.infrastructure.forms import ItemForm, ItemTypeForm, ItemStatusForm, ItemFieldForm, ServiceRecordForm
+
+
+class InfrastructureCommonHandler(ObjectHandler):
+    def check_create_permission(self, request, mode):
+        return request.user.profile.is_admin('treeio.infrastructure')
+
+
+class ItemFieldHandler(InfrastructureCommonHandler):
+    "Entrypoint for ItemField model."
+    model = ItemField
+    form = ItemFieldForm
+
+    @classmethod
+    def resource_uri(cls, obj=None):
+        object_id = "id"
+        if obj is not None:
+            object_id = obj.id
+        return ('api_infrastructure_fields', [object_id])
+
+    def flatten_dict(self, request):
+        return {'data': super(ObjectHandler, self).flatten_dict(request.data)}
+
+
+class ItemTypeHandler(InfrastructureCommonHandler):
+    "Entrypoint for ItemType model."
+    model = ItemType
+    form = ItemTypeForm
+
+    fields = ('id',) + ItemTypeForm._meta.fields
+
+    @classmethod
+    def resource_uri(cls, obj=None):
+        object_id = "id"
+        if obj is not None:
+            object_id = obj.id
+        return ('api_infrastructure_types', [object_id])
+
+
+class ItemStatusHandler(InfrastructureCommonHandler):
+    "Entrypoint for ItemStatus model."
+    model = ItemStatus
+    form = ItemStatusForm
+
+    @classmethod
+    def resource_uri(cls, obj=None):
+        object_id = "id"
+        if obj is not None:
+            object_id = obj.id
+        return ('api_infrastructure_statuses', [object_id])
+
+    def flatten_dict(self, request):
+        return {'data': super(ObjectHandler, self).flatten_dict(request.data)}
+
+
+class ItemServicingHandler(InfrastructureCommonHandler):
+    "Entrypoint for ItemServicing model."
+    model = ItemServicing
+    form = ServiceRecordForm
+    fields = ('id',) + form._meta.fields
+
+    @classmethod
+    def resource_uri(cls, obj=None):
+        object_id = "id"
+        if obj is not None:
+            object_id = obj.id
+        return ('api_infrastructure_service_records', [object_id])
+
+
+class ItemHandler(ObjectHandler):
+    "Entrypoint for Item model."
+    model = Item
+    form = ItemForm
+
+    fields = ['id', ('itemvalue_set', ('name', 'value'))] + \
+             [i.name for i in Item._meta.local_fields if i.name != 'object_ptr']
+
+    @classmethod
+    def resource_uri(cls, obj=None):
+        object_id = "id"
+        if obj is not None:
+            object_id = obj.id
+        return ('api_infrastructure_items', [object_id])
+
+    def create(self, request, *args, **kwargs):
+        if request.data is None:
+            return rc.BAD_REQUEST
+
+        item_type = getOrNone(ItemType, request.data.get('type'))
+        if not item_type or not request.user.profile.has_permission(item_type, mode='x'):
+            return rc.FORBIDDEN
+
+        attrs = self.flatten_dict(request)
+
+        form = ItemForm(item_type=item_type, **attrs)
+        if form.is_valid():
+            item = form.save(request)
+            return item
+        else:
+            self.status = 400
+            return form.errors
+
+    def update(self, request, *args, **kwargs):
+        if request.data is None:
+            return rc.BAD_REQUEST
+
+        pkfield = kwargs.get(self.model._meta.pk.name) or request.data.get(
+            self.model._meta.pk.name)
+
+        if not pkfield:
+            return rc.BAD_REQUEST
+
+        item = getOrNone(self.model, pkfield)
+        if not item:
+            return rc.NOT_FOUND
+
+        if not request.user.profile.has_permission(item, mode="w"):
+            return rc.FORBIDDEN
+
+        attrs = self.flatten_dict(request)
+
+        form = ItemForm(item_type=item.item_type, instance=item, **attrs)
+        if form.is_valid():
+            item = form.save(request)
+            return item
+        else:
+            self.status = 400
+            return form.errors
+
+
+class LocationHandler(ObjectHandler):
+    "Entrypoint for Location model."
+    model = Location
+    form = LocationForm
+
+    @classmethod
+    def resource_uri(cls, obj=None):
+        object_id = "id"
+        if obj is not None:
+            object_id = obj.id
+        return ('api_infrastructure_locations', [object_id])
+
+    def flatten_dict(self, request):
+        dct = super(LocationHandler, self).flatten_dict(request)
+        dct['location_id'] = None
+        return dct
diff --git a/data/treeio/treeio/treeio/infrastructure/south_migrations/0001_initial.py b/data/treeio/treeio/treeio/infrastructure/south_migrations/0001_initial.py
new file mode 100644
index 0000000..9433dd7
--- /dev/null
+++ b/data/treeio/treeio/treeio/infrastructure/south_migrations/0001_initial.py
@@ -0,0 +1,406 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Adding model 'ItemField'
+        db.create_table('infrastructure_itemfield', (
+            ('object_ptr', self.gf('django.db.models.fields.related.OneToOneField')(
+                to=orm['core.Object'], unique=True, primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')
+             (max_length=256)),
+            ('label', self.gf('django.db.models.fields.CharField')
+             (max_length=256)),
+            ('field_type', self.gf(
+                'django.db.models.fields.CharField')(max_length=64)),
+            ('required', self.gf(
+                'django.db.models.fields.BooleanField')(default=False)),
+            ('allowed_values', self.gf('django.db.models.fields.TextField')
+             (null=True, blank=True)),
+            ('details', self.gf('django.db.models.fields.TextField')
+             (null=True, blank=True)),
+        ))
+        db.send_create_signal('infrastructure', ['ItemField'])
+
+        # Adding model 'ItemType'
+        db.create_table('infrastructure_itemtype', (
+            ('object_ptr', self.gf('django.db.models.fields.related.OneToOneField')(
+                to=orm['core.Object'], unique=True, primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')
+             (max_length=512)),
+            ('parent', self.gf('django.db.models.fields.related.ForeignKey')(
+                blank=True, related_name='child_set', null=True, to=orm['infrastructure.ItemType'])),
+            ('details', self.gf('django.db.models.fields.TextField')
+             (null=True, blank=True)),
+        ))
+        db.send_create_signal('infrastructure', ['ItemType'])
+
+        # Adding M2M table for field fields on 'ItemType'
+        db.create_table('infrastructure_itemtype_fields', (
+            ('id', models.AutoField(
+                verbose_name='ID', primary_key=True, auto_created=True)),
+            ('itemtype', models.ForeignKey(
+                orm['infrastructure.itemtype'], null=False)),
+            ('itemfield', models.ForeignKey(
+                orm['infrastructure.itemfield'], null=False))
+        ))
+        db.create_unique(
+            'infrastructure_itemtype_fields', ['itemtype_id', 'itemfield_id'])
+
+        # Adding model 'ItemStatus'
+        db.create_table('infrastructure_itemstatus', (
+            ('object_ptr', self.gf('django.db.models.fields.related.OneToOneField')(
+                to=orm['core.Object'], unique=True, primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')
+             (max_length=256)),
+            ('details', self.gf('django.db.models.fields.TextField')
+             (null=True, blank=True)),
+            ('active', self.gf('django.db.models.fields.BooleanField')
+             (default=True)),
+            ('hidden', self.gf('django.db.models.fields.BooleanField')
+             (default=False)),
+        ))
+        db.send_create_signal('infrastructure', ['ItemStatus'])
+
+        # Adding model 'Item'
+        db.create_table('infrastructure_item', (
+            ('object_ptr', self.gf('django.db.models.fields.related.OneToOneField')(
+                to=orm['core.Object'], unique=True, primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')
+             (max_length=512)),
+            ('item_type', self.gf('django.db.models.fields.related.ForeignKey')(
+                to=orm['infrastructure.ItemType'])),
+            ('status', self.gf('django.db.models.fields.related.ForeignKey')
+             (to=orm['infrastructure.ItemStatus'])),
+            ('parent', self.gf('django.db.models.fields.related.ForeignKey')(
+                blank=True, related_name='child_set', null=True, to=orm['infrastructure.Item'])),
+            ('manufacturer', self.gf('django.db.models.fields.related.ForeignKey')(
+                blank=True, related_name='items_manufactured', null=True, to=orm['identities.Contact'])),
+            ('supplier', self.gf('django.db.models.fields.related.ForeignKey')(
+                blank=True, related_name='items_supplied', null=True, to=orm['identities.Contact'])),
+            ('location', self.gf('django.db.models.fields.related.ForeignKey')
+             (to=orm['core.Location'], null=True, blank=True)),
+            ('owner', self.gf('django.db.models.fields.related.ForeignKey')(
+                blank=True, related_name='items_owned', null=True, to=orm['identities.Contact'])),
+            ('asset', self.gf('django.db.models.fields.related.ForeignKey')
+             (to=orm['finance.Asset'], null=True, blank=True)),
+        ))
+        db.send_create_signal('infrastructure', ['Item'])
+
+        # Adding model 'ItemValue'
+        db.create_table('infrastructure_itemvalue', (
+            ('id', self.gf('django.db.models.fields.AutoField')
+             (primary_key=True)),
+            ('field', self.gf('django.db.models.fields.related.ForeignKey')
+             (to=orm['infrastructure.ItemField'])),
+            ('item', self.gf('django.db.models.fields.related.ForeignKey')
+             (to=orm['infrastructure.Item'])),
+            ('value', self.gf(
+                'django.db.models.fields.TextField')(blank=True)),
+        ))
+        db.send_create_signal('infrastructure', ['ItemValue'])
+
+        # Adding model 'ItemServicing'
+        db.create_table('infrastructure_itemservicing', (
+            ('object_ptr', self.gf('django.db.models.fields.related.OneToOneField')(
+                to=orm['core.Object'], unique=True, primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')
+             (max_length=256)),
+            ('supplier', self.gf('django.db.models.fields.related.ForeignKey')(
+                blank=True, related_name='itemservice_supplied', null=True, to=orm['identities.Contact'])),
+            ('start_date', self.gf('django.db.models.fields.DateField')
+             (null=True, blank=True)),
+            ('expiry_date', self.gf('django.db.models.fields.DateField')
+             (null=True, blank=True)),
+            ('details', self.gf(
+                'django.db.models.fields.TextField')(blank=True)),
+        ))
+        db.send_create_signal('infrastructure', ['ItemServicing'])
+
+        # Adding M2M table for field items on 'ItemServicing'
+        db.create_table('infrastructure_itemservicing_items', (
+            ('id', models.AutoField(
+                verbose_name='ID', primary_key=True, auto_created=True)),
+            ('itemservicing', models.ForeignKey(
+                orm['infrastructure.itemservicing'], null=False)),
+            ('item', models.ForeignKey(orm['infrastructure.item'], null=False))
+        ))
+        db.create_unique(
+            'infrastructure_itemservicing_items', ['itemservicing_id', 'item_id'])
+
+        # Adding M2M table for field billing on 'ItemServicing'
+        db.create_table('infrastructure_itemservicing_payments', (
+            ('id', models.AutoField(
+                verbose_name='ID', primary_key=True, auto_created=True)),
+            ('itemservicing', models.ForeignKey(
+                orm['infrastructure.itemservicing'], null=False)),
+            ('transaction', models.ForeignKey(
+                orm['finance.transaction'], null=False))
+        ))
+        db.create_unique(
+            'infrastructure_itemservicing_payments', ['itemservicing_id', 'transaction_id'])
+
+    def backwards(self, orm):
+
+        # Deleting model 'ItemField'
+        db.delete_table('infrastructure_itemfield')
+
+        # Deleting model 'ItemType'
+        db.delete_table('infrastructure_itemtype')
+
+        # Removing M2M table for field fields on 'ItemType'
+        db.delete_table('infrastructure_itemtype_fields')
+
+        # Deleting model 'ItemStatus'
+        db.delete_table('infrastructure_itemstatus')
+
+        # Deleting model 'Item'
+        db.delete_table('infrastructure_item')
+
+        # Deleting model 'ItemValue'
+        db.delete_table('infrastructure_itemvalue')
+
+        # Deleting model 'ItemServicing'
+        db.delete_table('infrastructure_itemservicing')
+
+        # Removing M2M table for field items on 'ItemServicing'
+        db.delete_table('infrastructure_itemservicing_items')
+
+        # Removing M2M table for field billing on 'ItemServicing'
+        db.delete_table('infrastructure_itemservicing_payments')
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'core.group': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Group'},
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['core.Group']"})
+        },
+        'core.location': {
+            'Meta': {'object_name': 'Location', '_ormbases': ['core.Object']},
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['core.Location']"})
+        },
+        'core.object': {
+            'Meta': {'object_name': 'Object'},
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'everybody_execute': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'everybody_read': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'everybody_write': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Group']"}),
+            'group_execute': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'group_read': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'group_write': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'links': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'links_rel_+'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'nuvius_resource': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'object_name': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'object_type': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'subscribers': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'subscriptions'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'trash': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']"}),
+            'user_execute': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'user_read': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'user_write': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'core.user': {
+            'Meta': {'ordering': "['name']", 'object_name': 'User'},
+            'default_group': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'default_user_set'", 'null': 'True', 'to': "orm['core.Group']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'other_groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'finance.account': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Account', '_ormbases': ['core.Object']},
+            'balance': ('django.db.models.fields.FloatField', [], {'default': '0'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.Contact']"})
+        },
+        'finance.asset': {
+            'Meta': {'ordering': "['-purchase_date']", 'object_name': 'Asset', '_ormbases': ['core.Object']},
+            'asset_type': ('django.db.models.fields.CharField', [], {'default': "'fixed'", 'max_length': '32'}),
+            'current_value': ('django.db.models.fields.FloatField', [], {'default': '0'}),
+            'depreciation_rate': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+            'depreciation_type': ('django.db.models.fields.CharField', [], {'default': "'straight'", 'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'endlife_value': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+            'initial_value': ('django.db.models.fields.FloatField', [], {'default': '0'}),
+            'lifetime': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.Contact']"}),
+            'purchase_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime.now', 'null': 'True', 'blank': 'True'})
+        },
+        'finance.category': {
+            'Meta': {'object_name': 'Category', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'finance.liability': {
+            'Meta': {'ordering': "['-due_date']", 'object_name': 'Liability', '_ormbases': ['core.Object']},
+            'account': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Account']"}),
+            'category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Category']", 'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'due_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'source': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'finance_liability_source'", 'to': "orm['identities.Contact']"}),
+            'target': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'finance_liability_target'", 'to': "orm['identities.Contact']"}),
+            'value': ('django.db.models.fields.FloatField', [], {})
+        },
+        'finance.transaction': {
+            'Meta': {'ordering': "['-datetime']", 'object_name': 'Transaction', '_ormbases': ['core.Object']},
+            'account': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Account']"}),
+            'category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Category']", 'null': 'True', 'blank': 'True'}),
+            'datetime': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'details': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'liability': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Liability']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'source': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'finance_transaction_source'", 'to': "orm['identities.Contact']"}),
+            'target': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'finance_transaction_target'", 'to': "orm['identities.Contact']"}),
+            'value': ('django.db.models.fields.FloatField', [], {})
+        },
+        'identities.contact': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Contact', '_ormbases': ['core.Object']},
+            'contact_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.ContactType']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['identities.Contact']"}),
+            'related_group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'related_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'})
+        },
+        'identities.contactfield': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ContactField', '_ormbases': ['core.Object']},
+            'allowed_values': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'field_type': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'required': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'identities.contacttype': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ContactType', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'fields': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['identities.ContactField']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'slug': ('django.db.models.fields.CharField', [], {'max_length': '256'})
+        },
+        'infrastructure.item': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Item', '_ormbases': ['core.Object']},
+            'asset': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Asset']", 'null': 'True', 'blank': 'True'}),
+            'item_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['infrastructure.ItemType']"}),
+            'location': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Location']", 'null': 'True', 'blank': 'True'}),
+            'manufacturer': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'items_manufactured'", 'null': 'True', 'to': "orm['identities.Contact']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'items_owned'", 'null': 'True', 'to': "orm['identities.Contact']"}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['infrastructure.Item']"}),
+            'status': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['infrastructure.ItemStatus']"}),
+            'supplier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'items_supplied'", 'null': 'True', 'to': "orm['identities.Contact']"})
+        },
+        'infrastructure.itemfield': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ItemField', '_ormbases': ['core.Object']},
+            'allowed_values': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'field_type': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'required': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'infrastructure.itemservicing': {
+            'Meta': {'ordering': "['-expiry_date']", 'object_name': 'ItemServicing', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'expiry_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'items': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['infrastructure.Item']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'payments': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['finance.Transaction']", 'null': 'True', 'blank': 'True'}),
+            'start_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'supplier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'itemservice_supplied'", 'null': 'True', 'to': "orm['identities.Contact']"})
+        },
+        'infrastructure.itemstatus': {
+            'Meta': {'ordering': "('hidden', '-active', 'name')", 'object_name': 'ItemStatus', '_ormbases': ['core.Object']},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'hidden': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'infrastructure.itemtype': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ItemType', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'fields': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['infrastructure.ItemField']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['infrastructure.ItemType']"})
+        },
+        'infrastructure.itemvalue': {
+            'Meta': {'object_name': 'ItemValue'},
+            'field': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['infrastructure.ItemField']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'item': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['infrastructure.Item']"}),
+            'value': ('django.db.models.fields.TextField', [], {'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['infrastructure']
diff --git a/data/treeio/treeio/treeio/knowledge/south_migrations/0001_initial.py b/data/treeio/treeio/treeio/knowledge/south_migrations/0001_initial.py
new file mode 100644
index 0000000..b787689
--- /dev/null
+++ b/data/treeio/treeio/treeio/knowledge/south_migrations/0001_initial.py
@@ -0,0 +1,176 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Adding model 'KnowledgeFolder'
+        db.create_table('knowledge_knowledgefolder', (
+            ('object_ptr', self.gf('django.db.models.fields.related.OneToOneField')(
+                to=orm['core.Object'], unique=True, primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')
+             (max_length=255)),
+            ('details', self.gf('django.db.models.fields.TextField')
+             (max_length=255, null=True, blank=True)),
+            ('parent', self.gf('django.db.models.fields.related.ForeignKey')(
+                blank=True, related_name='child_set', null=True, to=orm['knowledge.KnowledgeFolder'])),
+            ('treepath', self.gf('django.db.models.fields.CharField')
+             (max_length=800)),
+        ))
+        db.send_create_signal('knowledge', ['KnowledgeFolder'])
+
+        # Adding model 'KnowledgeCategory'
+        db.create_table('knowledge_knowledgecategory', (
+            ('object_ptr', self.gf('django.db.models.fields.related.OneToOneField')(
+                to=orm['core.Object'], unique=True, primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')
+             (max_length=255)),
+            ('details', self.gf('django.db.models.fields.TextField')
+             (max_length=255, null=True, blank=True)),
+            ('treepath', self.gf('django.db.models.fields.CharField')
+             (max_length=800)),
+        ))
+        db.send_create_signal('knowledge', ['KnowledgeCategory'])
+
+        # Adding model 'KnowledgeItem'
+        db.create_table('knowledge_knowledgeitem', (
+            ('object_ptr', self.gf('django.db.models.fields.related.OneToOneField')(
+                to=orm['core.Object'], unique=True, primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')
+             (max_length=255)),
+            ('folder', self.gf('django.db.models.fields.related.ForeignKey')
+             (to=orm['knowledge.KnowledgeFolder'])),
+            ('category', self.gf('django.db.models.fields.related.ForeignKey')
+             (to=orm['knowledge.KnowledgeCategory'], null=True, blank=True)),
+            ('body', self.gf('django.db.models.fields.TextField')
+             (null=True, blank=True)),
+            ('treepath', self.gf('django.db.models.fields.CharField')
+             (max_length=800)),
+        ))
+        db.send_create_signal('knowledge', ['KnowledgeItem'])
+
+    def backwards(self, orm):
+
+        # Deleting model 'KnowledgeFolder'
+        db.delete_table('knowledge_knowledgefolder')
+
+        # Deleting model 'KnowledgeCategory'
+        db.delete_table('knowledge_knowledgecategory')
+
+        # Deleting model 'KnowledgeItem'
+        db.delete_table('knowledge_knowledgeitem')
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'core.group': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Group'},
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['core.Group']"})
+        },
+        'core.object': {
+            'Meta': {'object_name': 'Object'},
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'everybody_execute': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'everybody_read': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'everybody_write': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Group']"}),
+            'group_execute': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'group_read': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'group_write': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'links': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'links_rel_+'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'nuvius_resource': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'object_name': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'object_type': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'subscribers': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'subscriptions'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'trash': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']"}),
+            'user_execute': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'user_read': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'user_write': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'core.user': {
+            'Meta': {'ordering': "['name']", 'object_name': 'User'},
+            'default_group': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'default_user_set'", 'null': 'True', 'to': "orm['core.Group']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'other_groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'knowledge.knowledgecategory': {
+            'Meta': {'ordering': "['name']", 'object_name': 'KnowledgeCategory', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'treepath': ('django.db.models.fields.CharField', [], {'max_length': '800'})
+        },
+        'knowledge.knowledgefolder': {
+            'Meta': {'ordering': "['name']", 'object_name': 'KnowledgeFolder', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['knowledge.KnowledgeFolder']"}),
+            'treepath': ('django.db.models.fields.CharField', [], {'max_length': '800'})
+        },
+        'knowledge.knowledgeitem': {
+            'Meta': {'ordering': "['-last_updated']", 'object_name': 'KnowledgeItem', '_ormbases': ['core.Object']},
+            'body': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['knowledge.KnowledgeCategory']", 'null': 'True', 'blank': 'True'}),
+            'folder': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['knowledge.KnowledgeFolder']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'treepath': ('django.db.models.fields.CharField', [], {'max_length': '800'})
+        }
+    }
+
+    complete_apps = ['knowledge']
diff --git a/data/treeio/treeio/treeio/messaging/api/handlers.py b/data/treeio/treeio/treeio/messaging/api/handlers.py
new file mode 100644
index 0000000..3c31bdc
--- /dev/null
+++ b/data/treeio/treeio/treeio/messaging/api/handlers.py
@@ -0,0 +1,190 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+# -*- coding: utf-8 -*-
+
+from __future__ import absolute_import, with_statement
+
+__all__ = ['MailingListHandler', 'MessageStreamHandler', 'MessageHandler']
+
+import re
+from treeio.core.api.utils import rc
+from treeio.core.models import ModuleSetting
+from django.core.exceptions import ObjectDoesNotExist
+from treeio.identities.models import ContactType, Contact
+from treeio.core.api.handlers import ObjectHandler, getOrNone
+from treeio.messaging.models import Message, MessageStream, MailingList
+from treeio.messaging.forms import MessageForm, MessageStreamForm, MessageReplyForm, MailingListForm
+
+
+class MailingListHandler(ObjectHandler):
+    "Entrypoint for MailingList model."
+    model = MailingList
+    form = MailingListForm
+
+    fields = ('id',) + MailingListForm._meta.fields
+
+    @classmethod
+    def resource_uri(cls, obj=None):
+        object_id = "id"
+        if obj is not None:
+            object_id = obj.id
+        return ('api_messaging_mlist', [object_id])
+
+    def check_create_permission(self, request, mode):
+        return True
+
+
+class MessageStreamHandler(ObjectHandler):
+    "Entrypoint for MessageStream model."
+    model = MessageStream
+    form = MessageStreamForm
+
+    @classmethod
+    def resource_uri(cls, obj=None):
+        object_id = "id"
+        if obj is not None:
+            object_id = obj.id
+        return ('api_messaging_streams', [object_id])
+
+    def check_create_permission(self, request, mode):
+        return True
+
+
+class MessageHandler(ObjectHandler):
+    "Entrypoint for Message model."
+    model = Message
+
+    @classmethod
+    def resource_uri(cls, obj=None):
+        object_id = "id"
+        if obj is not None:
+            object_id = obj.id
+        return ('api_messaging_messages', [object_id])
+
+    def create(self, request, *args, **kwargs):
+        "Send email to some recipients"
+
+        user = request.user.profile
+
+        if request.data is None:
+            return rc.BAD_REQUEST
+
+        if 'stream' in request.data:
+            stream = getOrNone(MessageStream, request.data['stream'])
+            if stream and not user.has_permission(stream, mode='x'):
+                return rc.FORBIDDEN
+
+        message = Message()
+        message.author = user.get_contact()
+        if not message.author:
+            return rc.FORBIDDEN
+
+        form = MessageForm(user, None, None, request.data, instance=message)
+        if form.is_valid():
+            message = form.save()
+            message.recipients.add(user.get_contact())
+            message.set_user_from_request(request)
+            message.read_by.add(user)
+            try:
+                # if email entered create contact and add to recipients
+                if 'multicomplete_recipients' in request.POST and request.POST['multicomplete_recipients']:
+                    try:
+                        conf = ModuleSetting.get_for_module(
+                            'treeio.messaging', 'default_contact_type')[0]
+                        default_contact_type = ContactType.objects.get(
+                            pk=long(conf.value))
+                    except Exception:
+                        default_contact_type = None
+                    emails = request.POST[
+                        'multicomplete_recipients'].split(',')
+                    for email in emails:
+                        emailstr = unicode(email).strip()
+                        if re.match('[a-zA-Z0-9+_\-\.]+@[0-9a-zA-Z][.-0-9a-zA-Z]*.[a-zA-Z]+', emailstr):
+                            contact, created = Contact.get_or_create_by_email(
+                                emailstr, contact_type=default_contact_type)
+                            message.recipients.add(contact)
+                            if created:
+                                contact.set_user_from_request(request)
+            except:
+                pass
+            # send email to all recipients
+            message.send_email()
+            return message
+        else:
+            self.status = 400
+            return form.errors
+
+    def update(self, request, *args, **kwargs):
+        "Reply to message"
+
+        if request.data is None:
+            return rc.BAD_REQUEST
+
+        pkfield = kwargs.get(self.model._meta.pk.name) or request.data.get(
+            self.model._meta.pk.name)
+
+        if not pkfield:
+            return rc.BAD_REQUEST
+
+        user = request.user.profile
+
+        try:
+            message = self.model.objects.get(pk=pkfield)
+        except ObjectDoesNotExist:
+            return rc.NOT_FOUND
+
+        if not user.has_permission(message):
+            return rc.FORBIDDEN
+
+        reply = Message()
+        reply.author = user.get_contact()
+        if not reply.author:
+            return rc.FORBIDDEN
+
+        reply.reply_to = message
+        form = MessageReplyForm(
+            user, message.stream_id, message, request.data, instance=reply)
+        if form.is_valid():
+            reply = form.save()
+            reply.set_user_from_request(request)
+            # Add author to recipients
+            reply.recipients.add(reply.author)
+            message.read_by.clear()
+
+            try:
+                # if email entered create contact and add to recipients
+                if 'multicomplete_recipients' in request.POST and request.POST['multicomplete_recipients']:
+                    try:
+                        conf = ModuleSetting.get_for_module(
+                            'treeio.messaging', 'default_contact_type')[0]
+                        default_contact_type = ContactType.objects.get(
+                            pk=long(conf.value))
+                    except Exception:
+                        default_contact_type = None
+                    emails = request.POST[
+                        'multicomplete_recipients'].split(',')
+                    for email in emails:
+                        emailstr = unicode(email).strip()
+                        if re.match('[a-zA-Z0-9+_\-\.]+@[0-9a-zA-Z][.-0-9a-zA-Z]*.[a-zA-Z]+', emailstr):
+                            contact, created = Contact.get_or_create_by_email(
+                                emailstr, contact_type=default_contact_type)
+                            reply.recipients.add(contact)
+                            if created:
+                                contact.set_user_from_request(request)
+            except:
+                pass
+
+            # Add each recipient of the reply to the original message
+            for recipient in reply.recipients.all():
+                message.recipients.add(recipient)
+
+            # send email to all recipients
+            reply.send_email()
+            return reply
+
+        else:
+            self.status = 400
+            return form.errors
diff --git a/data/treeio/treeio/treeio/messaging/emails.py b/data/treeio/treeio/treeio/messaging/emails.py
new file mode 100644
index 0000000..6708b82
--- /dev/null
+++ b/data/treeio/treeio/treeio/messaging/emails.py
@@ -0,0 +1,148 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+"""
+Messaging Emails
+"""
+
+from threading import Thread
+from django.db.models import Q
+from django.utils.html import strip_tags
+from treeio.core.models import ModuleSetting
+from treeio.core.mail import BaseEmail, SystemEmail
+from treeio.identities.models import Contact, ContactType
+
+from treeio.core.mail import EmailReceiver
+
+
+class EmailStream(EmailReceiver):
+
+    "EmailStream"
+    active = False
+
+    def __init__(self, stream):
+        self.stream = stream
+        self.active = True
+        try:
+            conf = ModuleSetting.get_for_module(
+                'treeio.messaging', 'default_imap_folder')[0]
+            folder_name = conf.value
+        except:
+            folder_name = None
+        super(EmailStream, self).__init__(stream.incoming_server_type, stream.incoming_server_name,
+                                          stream.incoming_server_username, stream.incoming_password, folder_name)
+
+    def process_msg(self, msg, attrs, attachments):
+        "Save message, Cap!"
+        from treeio.messaging.models import Message
+
+        try:
+            conf = ModuleSetting.get_for_module(
+                'treeio.messaging', 'default_contact_type')[0]
+            default_contact_type = ContactType.objects.get(pk=long(conf.value))
+        except:
+            default_contact_type = None
+
+        email_author, created = Contact.get_or_create_by_email(
+            attrs.author_email, attrs.author_name, default_contact_type)
+        if created:
+            email_author.copy_permissions(self.stream)
+
+        # check if the message is already retrieved
+        existing = Message.objects.filter(
+            stream=self.stream, title=attrs.subject, author=email_author, body=attrs.body).exists()
+        if not existing:
+            message = None
+            if attrs.subject[:3] == 'Re:':
+                # process replies
+                if attrs.subject[:4] == 'Re: ':
+                    original_subject = attrs.subject[4:]
+                else:
+                    original_subject = attrs.subject[3:]
+
+                try:
+                    query = Q(reply_to__isnull=True) & Q(recipients=email_author) & (
+                        Q(title=original_subject) | Q(title=attrs.subject))
+                    original = Message.objects.filter(
+                        query).order_by('-date_created')[:1][0]
+                    message = Message(title=attrs.subject, body=attrs.body, author=email_author,
+                                      stream=self.stream, reply_to=original)
+                    if attrs.email_date:
+                        message.date_created = attrs.email_date
+
+                    message.save()
+                    message.copy_permissions(original)
+                    original.read_by.clear()
+                except IndexError:
+                    pass
+            if not message:
+                message = Message(
+                    title=attrs.subject, body=attrs.body, author=email_author, stream=self.stream)
+                if attrs.email_date:
+                    message.date_created = attrs.email_date
+                message.save()
+                message.copy_permissions(self.stream)
+                message.recipients.add(email_author)
+
+
+class EmailMessage(Thread):
+
+    "Email Message"
+
+    def __init__(self, message):
+        Thread.__init__(self)
+        self.message = message
+
+    def run(self):
+        "Run"
+        self.process_email()
+
+    def send_email(self):
+        "Send email"
+        self.process_email()
+
+    def get_smtp_port(self):
+        "Returns tuple (port, ssl) for current message's stream"
+
+        port = 25
+        ssl = False
+
+        if self.message.stream.outgoing_server_type == "SMTP-SSL":
+            ssl = True
+
+        return port, ssl
+
+    def process_email(self):
+        "Process email"
+        message = self.message
+        if message.reply_to:
+            subject = "Re: %s" % message.reply_to.title
+        else:
+            subject = message.title
+        body = strip_tags(message.body)
+        html = message.body
+
+        for recipient in message.recipients.all():
+            if recipient.id == message.author_id:
+                # don't send email to message author
+                continue
+
+            toaddr = recipient.get_email()
+
+            if message.stream and message.stream.outgoing_server_name:
+                fromaddr = unicode(message.author) + ' <' + \
+                    unicode(message.stream.outgoing_email) + '>'
+                login = message.stream.outgoing_server_username
+                password = message.stream.outgoing_password
+
+                port, ssl = self.get_smtp_port()
+
+                BaseEmail(message.stream.outgoing_server_name,
+                          login, password, fromaddr, toaddr, subject,
+                          body, signature=None, html=html, port=port, ssl=ssl).send_email()
+
+            else:
+                SystemEmail(
+                    toaddr, subject, body, signature=None, html=html).send_email()
diff --git a/data/treeio/treeio/treeio/messaging/forms.py b/data/treeio/treeio/treeio/messaging/forms.py
new file mode 100644
index 0000000..81681aa
--- /dev/null
+++ b/data/treeio/treeio/treeio/messaging/forms.py
@@ -0,0 +1,342 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+"""
+Messaging model forms
+"""
+from django import forms
+from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse
+from treeio.core.models import Object, ModuleSetting
+from treeio.core.conf import settings
+from treeio.core.decorators import preprocess_form
+from treeio.messaging.models import Message, MessageStream, MailingList
+from django.db.models import Q
+from treeio.identities.models import ContactType, Contact
+
+preprocess_form()
+
+
+class SettingsForm(forms.Form):
+    """ Administration settings form """
+
+    default_contact_type = forms.ModelChoiceField(
+        label='Default Contact Type', queryset=[])
+    default_imap_folder = forms.ChoiceField(label='Default IMAP Folder', choices=(('ALL', 'ALL'),
+                                                                                  ('UNSEEN', _('UNSEEN'))),
+                                            required=False)
+    signature = forms.CharField(widget=forms.Textarea, required=False)
+
+    def __init__(self, user, *args, **kwargs):
+        "Sets choices and initial value"
+        super(SettingsForm, self).__init__(*args, **kwargs)
+        self.user = user
+
+        self.fields['default_contact_type'].label = _('Default Contact Type')
+        self.fields['default_contact_type'].queryset = Object.filter_permitted(user,
+                                                                               ContactType.objects, mode='x')
+        try:
+            conf = ModuleSetting.get_for_module('treeio.messaging', 'default_contact_type',
+                                                user=user)[0]
+            default_contact_type = ContactType.objects.get(pk=long(conf.value))
+            self.fields[
+                'default_contact_type'].initial = default_contact_type.id
+        except:
+            pass
+
+        self.fields['default_imap_folder'].label = _('Default IMAP Folder')
+        try:
+            conf = ModuleSetting.get_for_module('treeio.messaging', 'default_imap_folder',
+                                                user=user)[0]
+            self.fields['default_imap_folder'].initial = conf.value
+        except:
+            self.fields[
+                'default_imap_folder'].initial = settings.HARDTREE_MESSAGING_IMAP_DEFAULT_FOLDER_NAME
+
+        self.fields['signature'].label = _('Signature')
+        try:
+            conf = ModuleSetting.get_for_module('treeio.messaging', 'signature',
+                                                user=user, strict=True)[0]
+            signature = conf.value
+            self.fields['signature'].initial = signature
+        except:
+            pass
+
+    def save(self):
+        "Form processor"
+        try:
+            ModuleSetting.set_for_module('default_contact_type',
+                                         self.cleaned_data[
+                                             'default_contact_type'].id,
+                                         'treeio.messaging')
+        except:
+            pass
+
+        try:
+            ModuleSetting.set_for_module('default_imap_folder',
+                                         self.cleaned_data[
+                                             'default_imap_folder'],
+                                         'treeio.messaging')
+        except:
+            pass
+
+        try:
+            ModuleSetting.set_for_module('signature',
+                                         self.cleaned_data['signature'],
+                                         'treeio.messaging', user=self.user)
+        except:
+            pass
+
+
+class MassActionForm(forms.Form):
+    """ Mass action form for Messages """
+
+    mark = forms.ChoiceField(label=_("With selected"), choices=(('', '-----'), ('read', _('Mark Read')),
+                                                                ('unread', _('Mark Unread')), (
+        'delete', _('Delete Completely')),
+                                                                ('trash', _('Move to Trash'))), required=False)
+    stream = forms.ModelChoiceField(queryset=[], required=False)
+    user = None
+    markall = forms.ChoiceField(label=_("Mark all"), choices=(('', '-----'), ('markall', _('Mark all as Read'))),
+                                required=False)
+
+    instance = None
+
+    def __init__(self, user, *args, **kwargs):
+        if 'instance' in kwargs:
+            self.instance = kwargs['instance']
+            del kwargs['instance']
+
+        self.user = user
+
+        super(MassActionForm, self).__init__(*args, **kwargs)
+
+        self.fields['stream'].queryset = Object.filter_permitted(
+            user, MessageStream.objects, mode='x')
+        self.fields['stream'].label = _("Move to")
+        self.fields['mark'] = forms.ChoiceField(label=_("With selected"),
+                                                choices=(('', '-----'),
+                                                         ('read', _('Mark Read')),
+                                                         ('unread', _('Mark Unread')),
+                                                         ('delete', _('Delete Completely')),
+                                                         ('trash', _('Move to Trash'))),
+                                                required=False)
+        self.fields['markall'] = forms.ChoiceField(label=_("Mark all"),
+                                                   choices=(('', '-----'), ('markall', _('Mark all as Read'))),
+                                                   required=False)
+
+    def save(self, *args, **kwargs):
+        "Save override to omit empty fields"
+        if self.instance:
+            if self.is_valid():
+                if self.cleaned_data['stream']:
+                    self.instance.stream = self.cleaned_data['stream']
+                if self.user and self.cleaned_data['mark']:
+                    if self.cleaned_data['mark'] == 'read':
+                        try:
+                            self.instance.read_by.add(self.user)
+                        except Exception:
+                            pass
+                    if self.cleaned_data['mark'] == 'unread':
+                        try:
+                            self.instance.read_by.remove(self.user)
+                        except Exception:
+                            pass
+                self.instance.save()
+                if self.user and self.cleaned_data['mark']:
+                    if self.cleaned_data['mark'] == 'delete':
+                        self.instance.delete()
+                    if self.cleaned_data['mark'] == 'trash':
+                        self.instance.trash = True
+                        self.instance.save()
+        else:
+            if self.user and self.cleaned_data['markall']:
+                query = Q(reply_to__isnull=True) & ~Q(read_by=self.user)
+                for message in Object.filter_permitted(self.user, Message.objects.filter(query), mode='x'):
+                    try:
+                        message.read_by.add(self.user)
+                    except Exception:
+                        pass
+
+
+class MessageForm(forms.ModelForm):
+    """ Message form """
+
+    def __init__(self, user, stream_id, message=None, *args, **kwargs):
+        super(MessageForm, self).__init__(*args, **kwargs)
+
+        self.fields['title'].label = _("Subject")
+        self.fields['title'].widget = forms.TextInput(attrs={'size': '40'})
+        self.fields['stream'].queryset = Object.filter_permitted(
+            user, MessageStream.objects, mode='x')
+        self.fields['stream'].label = _("Stream")
+
+        self.fields['recipients'].label = _("To")
+        self.fields['recipients'].help_text = ""
+        self.fields['recipients'].widget.attrs.update({'class': 'multicomplete',
+                                                       'callback': reverse('identities_ajax_contact_lookup')})
+
+        if stream_id:
+            self.fields['stream'].initial = stream_id
+            self.fields['stream'].widget = forms.HiddenInput()
+        elif self.fields['stream'].queryset:
+            self.fields['stream'].initial = self.fields[
+                'stream'].queryset[0].id
+
+        self.fields['body'].label = _("Body")
+        # signature
+        try:
+            conf = ModuleSetting.get_for_module('treeio.messaging', 'signature',
+                                                user=user, strict=True)[0]
+            signature = conf.value
+            self.fields['body'].initial = signature
+        except:
+            pass
+
+    class Meta:
+
+        "Message"
+        model = Message
+        fields = ('recipients', 'title', 'stream', 'body')
+
+
+class MessageReplyForm(forms.ModelForm):
+    """ Message reply form """
+
+    def __init__(self, user, stream_id, message=None, *args, **kwargs):
+        super(MessageReplyForm, self).__init__(*args, **kwargs)
+
+        self.fields['recipients'].label = _("To")
+        self.fields['recipients'].help_text = ""
+        self.fields['recipients'].initial = [
+            contact.id for contact in message.recipients.all()]
+        try:
+            user_contact = user.get_contact()
+            self.fields['recipients'].initial.pop(
+                self.fields['recipients'].initial.index(user_contact.id))
+        except:
+            pass
+        self.fields['recipients'].widget.attrs.update({'class': 'multicomplete',
+                                                       'callback': reverse('identities_ajax_contact_lookup')})
+
+        self.fields['stream'].widget = forms.HiddenInput()
+        if stream_id:
+            self.fields['stream'].initial = stream_id
+        elif self.fields['stream'].queryset:
+            self.fields['stream'].initial = self.fields[
+                'stream'].queryset[0].id
+
+        self.fields['body'].label = _("Body")
+
+    class Meta:
+
+        "Message Reply"
+        model = Message
+        fields = ('recipients', 'stream', 'body')
+
+
+class MessageStreamForm(forms.ModelForm):
+    """ Message Stream form """
+
+    def __init__(self, user, *args, **kwargs):
+        super(MessageStreamForm, self).__init__(*args, **kwargs)
+
+        self.fields['name'].label = _("Name")
+        self.fields['name'].widget = forms.TextInput(attrs={'size': '30'})
+
+        self.fields['incoming_server_name'].label = _("Incoming Mail Server")
+        self.fields['incoming_server_type'].label = _("Server Type")
+        self.fields['incoming_server_username'].label = _("User Name")
+        self.fields['incoming_password'].label = _("Password")
+        self.fields['incoming_password'].widget = forms.PasswordInput()
+
+        self.fields['outgoing_email'].label = _("From Address")
+        self.fields['outgoing_server_name'].label = _("Outgoing Mail Server")
+        self.fields['outgoing_server_type'].label = _("Server Type")
+        self.fields['outgoing_server_username'].label = _("User Name")
+        self.fields['outgoing_password'].label = _("Password")
+        self.fields['outgoing_password'].widget = forms.PasswordInput()
+
+    def clean_incoming_password(self):
+        password = self.cleaned_data['incoming_password']
+        if not password and hasattr(self, 'instance') and self.instance.id:
+            return self.instance.incoming_password
+        return password
+
+    def clean_outgoing_password(self):
+        password = self.cleaned_data['outgoing_password']
+        if not password and hasattr(self, 'instance') and self.instance.id:
+            return self.instance.outgoing_password
+        return password
+
+    class Meta:
+
+        "Message Stream"
+        model = MessageStream
+        fields = ('name', 'incoming_server_name', 'incoming_server_type',
+                  'incoming_server_username', 'incoming_password', 'outgoing_email',
+                  'outgoing_server_name', 'outgoing_server_username', 'outgoing_password',
+                  'outgoing_server_type')
+
+
+class MailingListForm(forms.ModelForm):
+    """ Message Stream form """
+
+    def __init__(self, user, *args, **kwargs):
+        super(MailingListForm, self).__init__(*args, **kwargs)
+
+        self.fields['name'].label = _("Name")
+        self.fields['name'].widget = forms.TextInput(attrs={'size': '30'})
+        self.fields['description'].label = _("Description")
+        self.fields['from_contact'].label = _("Sender Contact Details")
+        self.fields['members'].widget.attrs.update({'class': 'multicomplete',
+                                                    'callback': reverse('identities_ajax_contact_lookup')})
+        self.fields['members'].label = _("Members")
+        self.fields['members'].help_text = None
+        self.fields['opt_in'].label = _("Opt-In Template")
+
+    class Meta:
+        "Message Stream"
+        model = MailingList
+        fields = ('name', 'description', 'from_contact', 'opt_in', 'members')
+
+
+class FilterForm(forms.ModelForm):
+    """ Filter form definition """
+
+    def __init__(self, user, skip=None, *args, **kwargs):
+        if skip is None:
+            skip = []
+        super(FilterForm, self).__init__(*args, **kwargs)
+
+        if 'title' in skip:
+            del self.fields['title']
+        else:
+            self.fields['title'].required = False
+            self.fields['title'].label = _("Title")
+
+        if 'stream' in skip:
+            del self.fields['stream']
+        else:
+            self.fields['stream'].queryset = Object.filter_permitted(
+                user, MessageStream.objects, mode='x')
+            self.fields['stream'].required = False
+            self.fields['stream'].label = _("Stream")
+
+        if 'author' in skip:
+            del self.fields['author']
+        else:
+            self.fields['author'].required = False
+            self.fields['author'].label = _("Author")
+            self.fields['author'].queryset = Object.filter_permitted(
+                user, Contact.objects, mode='x')
+            self.fields['author'].widget.attrs.update({'class': 'autocomplete',
+                                                       'callback': reverse('identities_ajax_contact_lookup')})
+
+    class Meta:
+
+        "Filter"
+        model = Message
+        fields = ('title', 'author', 'stream')
diff --git a/data/treeio/treeio/treeio/messaging/south_migrations/0001_initial.py b/data/treeio/treeio/treeio/messaging/south_migrations/0001_initial.py
new file mode 100644
index 0000000..65cfa69
--- /dev/null
+++ b/data/treeio/treeio/treeio/messaging/south_migrations/0001_initial.py
@@ -0,0 +1,226 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Adding model 'EmailBox'
+        db.create_table('messaging_emailbox', (
+            ('object_ptr', self.gf('django.db.models.fields.related.OneToOneField')(
+                to=orm['core.Object'], unique=True, primary_key=True)),
+            ('email_name', self.gf(
+                'django.db.models.fields.CharField')(max_length=255)),
+            ('email_type', self.gf(
+                'django.db.models.fields.CharField')(max_length=255)),
+            ('server_name', self.gf(
+                'django.db.models.fields.CharField')(max_length=255)),
+            ('server_type', self.gf(
+                'django.db.models.fields.CharField')(max_length=255)),
+            ('server_username', self.gf(
+                'django.db.models.fields.CharField')(max_length=255)),
+            ('server_password', self.gf(
+                'django.db.models.fields.CharField')(max_length=255)),
+            ('last_checked', self.gf('django.db.models.fields.DateTimeField')
+             (null=True, blank=True)),
+        ))
+        db.send_create_signal('messaging', ['EmailBox'])
+
+        # Adding model 'MessageStream'
+        db.create_table('messaging_messagestream', (
+            ('object_ptr', self.gf('django.db.models.fields.related.OneToOneField')(
+                to=orm['core.Object'], unique=True, primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')
+             (max_length=255)),
+            ('email_incoming', self.gf('django.db.models.fields.related.ForeignKey')(
+                blank=True, related_name='incoming', null=True, to=orm['messaging.EmailBox'])),
+            ('email_outgoing', self.gf('django.db.models.fields.related.ForeignKey')(
+                blank=True, related_name='outgoing', null=True, to=orm['messaging.EmailBox'])),
+        ))
+        db.send_create_signal('messaging', ['MessageStream'])
+
+        # Adding model 'Message'
+        db.create_table('messaging_message', (
+            ('object_ptr', self.gf('django.db.models.fields.related.OneToOneField')(
+                to=orm['core.Object'], unique=True, primary_key=True)),
+            ('title', self.gf('django.db.models.fields.CharField')
+             (max_length=255, null=True, blank=True)),
+            ('body', self.gf('django.db.models.fields.TextField')()),
+            ('author', self.gf('django.db.models.fields.related.ForeignKey')
+             (to=orm['identities.Contact'])),
+            ('stream', self.gf('django.db.models.fields.related.ForeignKey')
+             (related_name='stream', to=orm['messaging.MessageStream'])),
+            ('reply_to', self.gf('django.db.models.fields.related.ForeignKey')(
+                blank=True, related_name='child_set', null=True, to=orm['messaging.Message'])),
+        ))
+        db.send_create_signal('messaging', ['Message'])
+
+        # Adding M2M table for field read_by on 'Message'
+        db.create_table('messaging_message_read_by', (
+            ('id', models.AutoField(
+                verbose_name='ID', primary_key=True, auto_created=True)),
+            ('message', models.ForeignKey(
+                orm['messaging.message'], null=False)),
+            ('user', models.ForeignKey(orm['core.user'], null=False))
+        ))
+        db.create_unique(
+            'messaging_message_read_by', ['message_id', 'user_id'])
+
+    def backwards(self, orm):
+
+        # Deleting model 'EmailBox'
+        db.delete_table('messaging_emailbox')
+
+        # Deleting model 'MessageStream'
+        db.delete_table('messaging_messagestream')
+
+        # Deleting model 'Message'
+        db.delete_table('messaging_message')
+
+        # Removing M2M table for field read_by on 'Message'
+        db.delete_table('messaging_message_read_by')
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'core.group': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Group'},
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['core.Group']"})
+        },
+        'core.object': {
+            'Meta': {'object_name': 'Object'},
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'everybody_execute': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'everybody_read': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'everybody_write': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Group']"}),
+            'group_execute': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'group_read': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'group_write': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'links': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'links_rel_+'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'nuvius_resource': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'object_name': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'object_type': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'subscribers': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'subscriptions'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'trash': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']"}),
+            'user_execute': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'user_read': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'user_write': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'core.user': {
+            'Meta': {'ordering': "['name']", 'object_name': 'User'},
+            'default_group': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'default_user_set'", 'null': 'True', 'to': "orm['core.Group']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'other_groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'identities.contact': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Contact', '_ormbases': ['core.Object']},
+            'contact_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.ContactType']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['identities.Contact']"}),
+            'related_group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'related_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'})
+        },
+        'identities.contactfield': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ContactField', '_ormbases': ['core.Object']},
+            'allowed_values': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'field_type': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'required': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'identities.contacttype': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ContactType', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'fields': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['identities.ContactField']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'slug': ('django.db.models.fields.CharField', [], {'max_length': '256'})
+        },
+        'messaging.emailbox': {
+            'Meta': {'ordering': "['last_updated']", 'object_name': 'EmailBox', '_ormbases': ['core.Object']},
+            'email_name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'email_type': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'last_checked': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'server_name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'server_password': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'server_type': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'server_username': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        },
+        'messaging.message': {
+            'Meta': {'ordering': "['-date_created']", 'object_name': 'Message', '_ormbases': ['core.Object']},
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.Contact']"}),
+            'body': ('django.db.models.fields.TextField', [], {}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'read_by': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'read_by_user'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'reply_to': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['messaging.Message']"}),
+            'stream': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'stream'", 'to': "orm['messaging.MessageStream']"}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'})
+        },
+        'messaging.messagestream': {
+            'Meta': {'ordering': "['name']", 'object_name': 'MessageStream', '_ormbases': ['core.Object']},
+            'email_incoming': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'incoming'", 'null': 'True', 'to': "orm['messaging.EmailBox']"}),
+            'email_outgoing': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'outgoing'", 'null': 'True', 'to': "orm['messaging.EmailBox']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'})
+        }
+    }
+
+    complete_apps = ['messaging']
diff --git a/data/treeio/treeio/treeio/messaging/south_migrations/0002_auto__add_mailinglist__add_template__add_field_message_mlist__chg_fiel.py b/data/treeio/treeio/treeio/messaging/south_migrations/0002_auto__add_mailinglist__add_template__add_field_message_mlist__chg_fiel.py
new file mode 100644
index 0000000..7498106
--- /dev/null
+++ b/data/treeio/treeio/treeio/messaging/south_migrations/0002_auto__add_mailinglist__add_template__add_field_message_mlist__chg_fiel.py
@@ -0,0 +1,353 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Adding model 'MailingList'
+        db.create_table('messaging_mailinglist', (
+            ('object_ptr', self.gf('django.db.models.fields.related.OneToOneField')(
+                to=orm['core.Object'], unique=True, primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')
+             (max_length=255)),
+            ('description', self.gf('django.db.models.fields.TextField')
+             (null=True, blank=True)),
+            ('from_contact', self.gf('django.db.models.fields.related.ForeignKey')(
+                related_name='from_contact_set', to=orm['identities.Contact'])),
+            ('opt_in', self.gf('django.db.models.fields.related.ForeignKey')
+             (to=orm['messaging.Template'], null=True, blank=True)),
+        ))
+        db.send_create_signal('messaging', ['MailingList'])
+
+        # Adding M2M table for field members on 'MailingList'
+        db.create_table('messaging_mailinglist_members', (
+            ('id', models.AutoField(
+                verbose_name='ID', primary_key=True, auto_created=True)),
+            ('mailinglist', models.ForeignKey(
+                orm['messaging.mailinglist'], null=False)),
+            ('contact', models.ForeignKey(
+                orm['identities.contact'], null=False))
+        ))
+        db.create_unique(
+            'messaging_mailinglist_members', ['mailinglist_id', 'contact_id'])
+
+        # Adding model 'Template'
+        db.create_table('messaging_template', (
+            ('object_ptr', self.gf('django.db.models.fields.related.OneToOneField')(
+                to=orm['core.Object'], unique=True, primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')
+             (max_length=255)),
+            ('body', self.gf('django.db.models.fields.TextField')()),
+            ('subject', self.gf('django.db.models.fields.CharField')
+             (max_length=255)),
+        ))
+        db.send_create_signal('messaging', ['Template'])
+
+        # Adding field 'Message.mlist'
+        db.add_column('messaging_message', 'mlist', self.gf('django.db.models.fields.related.ForeignKey')(
+            blank=True, related_name='mlist', null=True, to=orm['messaging.MailingList']), keep_default=False)
+
+        # Adding M2M table for field recipients on 'Message'
+        db.create_table('messaging_message_recipients', (
+            ('id', models.AutoField(
+                verbose_name='ID', primary_key=True, auto_created=True)),
+            ('message', models.ForeignKey(
+                orm['messaging.message'], null=False)),
+            ('contact', models.ForeignKey(
+                orm['identities.contact'], null=False))
+        ))
+        db.create_unique(
+            'messaging_message_recipients', ['message_id', 'contact_id'])
+
+        # Changing field 'Message.stream'
+        db.alter_column('messaging_message', 'stream_id', self.gf(
+            'django.db.models.fields.related.ForeignKey')(null=True, to=orm['messaging.MessageStream']))
+
+        # Adding field 'MessageStream.incoming_server_name'
+        db.add_column('messaging_messagestream', 'incoming_server_name', self.gf(
+            'django.db.models.fields.CharField')(max_length=255, null=True, blank=True), keep_default=False)
+
+        # Adding field 'MessageStream.incoming_server_type'
+        db.add_column('messaging_messagestream', 'incoming_server_type', self.gf(
+            'django.db.models.fields.CharField')(max_length=255, null=True, blank=True), keep_default=False)
+
+        # Adding field 'MessageStream.incoming_server_username'
+        db.add_column('messaging_messagestream', 'incoming_server_username', self.gf(
+            'django.db.models.fields.CharField')(max_length=255, null=True, blank=True), keep_default=False)
+
+        # Adding field 'MessageStream.incoming_password'
+        db.add_column('messaging_messagestream', 'incoming_password', self.gf(
+            'django.db.models.fields.CharField')(max_length=255, null=True, blank=True), keep_default=False)
+
+        # Adding field 'MessageStream.outgoing_email'
+        db.add_column('messaging_messagestream', 'outgoing_email', self.gf(
+            'django.db.models.fields.EmailField')(max_length=255, null=True, blank=True), keep_default=False)
+
+        # Adding field 'MessageStream.outgoing_server_name'
+        db.add_column('messaging_messagestream', 'outgoing_server_name', self.gf(
+            'django.db.models.fields.CharField')(max_length=255, null=True, blank=True), keep_default=False)
+
+        # Adding field 'MessageStream.outgoing_server_type'
+        db.add_column('messaging_messagestream', 'outgoing_server_type', self.gf(
+            'django.db.models.fields.CharField')(max_length=255, null=True, blank=True), keep_default=False)
+
+        # Adding field 'MessageStream.outgoing_server_username'
+        db.add_column('messaging_messagestream', 'outgoing_server_username', self.gf(
+            'django.db.models.fields.CharField')(max_length=255, null=True, blank=True), keep_default=False)
+
+        # Adding field 'MessageStream.outgoing_password'
+        db.add_column('messaging_messagestream', 'outgoing_password', self.gf(
+            'django.db.models.fields.CharField')(max_length=255, null=True, blank=True), keep_default=False)
+
+        # Adding field 'MessageStream.faulty'
+        db.add_column('messaging_messagestream', 'faulty', self.gf(
+            'django.db.models.fields.BooleanField')(default=False), keep_default=False)
+
+        # Adding field 'MessageStream.last_checked'
+        db.add_column('messaging_messagestream', 'last_checked', self.gf(
+            'django.db.models.fields.DateTimeField')(null=True, blank=True), keep_default=False)
+
+    def backwards(self, orm):
+
+        # Deleting model 'MailingList'
+        db.delete_table('messaging_mailinglist')
+
+        # Removing M2M table for field members on 'MailingList'
+        db.delete_table('messaging_mailinglist_members')
+
+        # Deleting model 'Template'
+        db.delete_table('messaging_template')
+
+        # Deleting field 'Message.mlist'
+        db.delete_column('messaging_message', 'mlist_id')
+
+        # Removing M2M table for field recipients on 'Message'
+        db.delete_table('messaging_message_recipients')
+
+        # User chose to not deal with backwards NULL issues for
+        # 'Message.stream'
+        raise RuntimeError(
+            "Cannot reverse this migration. 'Message.stream' and its values cannot be restored.")
+
+        # Deleting field 'MessageStream.incoming_server_name'
+        db.delete_column('messaging_messagestream', 'incoming_server_name')
+
+        # Deleting field 'MessageStream.incoming_server_type'
+        db.delete_column('messaging_messagestream', 'incoming_server_type')
+
+        # Deleting field 'MessageStream.incoming_server_username'
+        db.delete_column('messaging_messagestream', 'incoming_server_username')
+
+        # Deleting field 'MessageStream.incoming_password'
+        db.delete_column('messaging_messagestream', 'incoming_password')
+
+        # Deleting field 'MessageStream.outgoing_email'
+        db.delete_column('messaging_messagestream', 'outgoing_email')
+
+        # Deleting field 'MessageStream.outgoing_server_name'
+        db.delete_column('messaging_messagestream', 'outgoing_server_name')
+
+        # Deleting field 'MessageStream.outgoing_server_type'
+        db.delete_column('messaging_messagestream', 'outgoing_server_type')
+
+        # Deleting field 'MessageStream.outgoing_server_username'
+        db.delete_column('messaging_messagestream', 'outgoing_server_username')
+
+        # Deleting field 'MessageStream.outgoing_password'
+        db.delete_column('messaging_messagestream', 'outgoing_password')
+
+        # Deleting field 'MessageStream.faulty'
+        db.delete_column('messaging_messagestream', 'faulty')
+
+        # Deleting field 'MessageStream.last_checked'
+        db.delete_column('messaging_messagestream', 'last_checked')
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'core.accessentity': {
+            'Meta': {'object_name': 'AccessEntity'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        },
+        'core.comment': {
+            'Meta': {'object_name': 'Comment'},
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'}),
+            'body': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"})
+        },
+        'core.group': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Group', '_ormbases': ['core.AccessEntity']},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True', 'primary_key': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['core.Group']"})
+        },
+        'core.object': {
+            'Meta': {'object_name': 'Object'},
+            'comments': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.Comment']"}),
+            'creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'objects_created'", 'null': 'True', 'to': "orm['core.User']"}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'full_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_full_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'links': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'links_rel_+'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'nuvius_resource': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'object_name': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'object_type': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'read_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_read_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'subscribers': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'subscriptions'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Tag']", 'null': 'True', 'blank': 'True'}),
+            'trash': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'core.tag': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Tag'},
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'})
+        },
+        'core.user': {
+            'Meta': {'ordering': "['name']", 'object_name': 'User', '_ormbases': ['core.AccessEntity']},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True', 'primary_key': 'True'}),
+            'default_group': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'default_user_set'", 'null': 'True', 'to': "orm['core.Group']"}),
+            'disabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_access': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'other_groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'identities.contact': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Contact', '_ormbases': ['core.Object']},
+            'contact_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.ContactType']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['identities.Contact']"}),
+            'related_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.AccessEntity']", 'null': 'True', 'blank': 'True'})
+        },
+        'identities.contactfield': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ContactField', '_ormbases': ['core.Object']},
+            'allowed_values': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'field_type': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'required': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'identities.contacttype': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ContactType', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'fields': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['identities.ContactField']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'slug': ('django.db.models.fields.CharField', [], {'max_length': '256'})
+        },
+        'messaging.emailbox': {
+            'Meta': {'ordering': "['last_updated']", 'object_name': 'EmailBox', '_ormbases': ['core.Object']},
+            'email_name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'email_type': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'last_checked': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'server_name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'server_password': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'server_type': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'server_username': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        },
+        'messaging.mailinglist': {
+            'Meta': {'ordering': "['-date_created']", 'object_name': 'MailingList', '_ormbases': ['core.Object']},
+            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'from_contact': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'from_contact_set'", 'to': "orm['identities.Contact']"}),
+            'members': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'members_set'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['identities.Contact']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'opt_in': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['messaging.Template']", 'null': 'True', 'blank': 'True'})
+        },
+        'messaging.message': {
+            'Meta': {'ordering': "['-date_created']", 'object_name': 'Message', '_ormbases': ['core.Object']},
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.Contact']"}),
+            'body': ('django.db.models.fields.TextField', [], {}),
+            'mlist': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'mlist'", 'null': 'True', 'to': "orm['messaging.MailingList']"}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'read_by': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'read_by_user'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'recipients': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'message_recipients'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['identities.Contact']"}),
+            'reply_to': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['messaging.Message']"}),
+            'stream': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'stream'", 'null': 'True', 'to': "orm['messaging.MessageStream']"}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'})
+        },
+        'messaging.messagestream': {
+            'Meta': {'ordering': "['name', 'last_updated']", 'object_name': 'MessageStream', '_ormbases': ['core.Object']},
+            'email_incoming': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'incoming'", 'null': 'True', 'to': "orm['messaging.EmailBox']"}),
+            'email_outgoing': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'outgoing'", 'null': 'True', 'to': "orm['messaging.EmailBox']"}),
+            'faulty': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'incoming_password': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'incoming_server_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'incoming_server_type': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'incoming_server_username': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'last_checked': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'outgoing_email': ('django.db.models.fields.EmailField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'outgoing_password': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'outgoing_server_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'outgoing_server_type': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'outgoing_server_username': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'})
+        },
+        'messaging.template': {
+            'Meta': {'object_name': 'Template', '_ormbases': ['core.Object']},
+            'body': ('django.db.models.fields.TextField', [], {}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'subject': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        }
+    }
+
+    complete_apps = ['messaging']
diff --git a/data/treeio/treeio/treeio/messaging/south_migrations/0003_merge_emailbox_stream.py b/data/treeio/treeio/treeio/messaging/south_migrations/0003_merge_emailbox_stream.py
new file mode 100644
index 0000000..dd036d8
--- /dev/null
+++ b/data/treeio/treeio/treeio/messaging/south_migrations/0003_merge_emailbox_stream.py
@@ -0,0 +1,213 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import DataMigration
+from django.db import models
+
+
+class Migration(DataMigration):
+
+    def forwards(self, orm):
+        "Migrate EmailBox: merge with Stream"
+        for stream in orm['messaging.MessageStream'].objects.all():
+            if stream.email_incoming:
+                stream.incoming_server_name = stream.email_incoming.server_name
+                stream.incoming_server_type = stream.email_incoming.server_type
+                stream.incoming_server_username = stream.email_incoming.server_username
+                stream.incoming_password = stream.email_incoming.server_password
+                stream.save()
+            if stream.email_outgoing:
+                stream.outgoing_email = stream.email_outgoing.server_username
+                stream.outgoing_server_name = stream.email_outgoing.server_name
+                stream.outgoing_server_type = stream.email_outgoing.server_type
+                stream.outgoing_server_username = stream.email_outgoing.server_username
+                stream.outgoing_password = stream.email_outgoing.server_password
+                stream.save()
+
+    def backwards(self, orm):
+        raise RuntimeError("Cannot reverse this migration.")
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'core.accessentity': {
+            'Meta': {'object_name': 'AccessEntity'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        },
+        'core.comment': {
+            'Meta': {'object_name': 'Comment'},
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'}),
+            'body': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"})
+        },
+        'core.group': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Group', '_ormbases': ['core.AccessEntity']},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True', 'primary_key': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['core.Group']"})
+        },
+        'core.object': {
+            'Meta': {'object_name': 'Object'},
+            'comments': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.Comment']"}),
+            'creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'objects_created'", 'null': 'True', 'to': "orm['core.User']"}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'full_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_full_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'links': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'links_rel_+'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'nuvius_resource': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'object_name': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'object_type': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'read_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_read_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'subscribers': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'subscriptions'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Tag']", 'null': 'True', 'blank': 'True'}),
+            'trash': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'core.tag': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Tag'},
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'})
+        },
+        'core.user': {
+            'Meta': {'ordering': "['name']", 'object_name': 'User', '_ormbases': ['core.AccessEntity']},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True', 'primary_key': 'True'}),
+            'default_group': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'default_user_set'", 'null': 'True', 'to': "orm['core.Group']"}),
+            'disabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_access': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'other_groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'identities.contact': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Contact', '_ormbases': ['core.Object']},
+            'contact_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.ContactType']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['identities.Contact']"}),
+            'related_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.AccessEntity']", 'null': 'True', 'blank': 'True'})
+        },
+        'identities.contactfield': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ContactField', '_ormbases': ['core.Object']},
+            'allowed_values': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'field_type': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'required': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'identities.contacttype': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ContactType', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'fields': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['identities.ContactField']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'slug': ('django.db.models.fields.CharField', [], {'max_length': '256'})
+        },
+        'messaging.emailbox': {
+            'Meta': {'ordering': "['last_updated']", 'object_name': 'EmailBox', '_ormbases': ['core.Object']},
+            'email_name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'email_type': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'last_checked': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'server_name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'server_password': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'server_type': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'server_username': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        },
+        'messaging.mailinglist': {
+            'Meta': {'ordering': "['-date_created']", 'object_name': 'MailingList', '_ormbases': ['core.Object']},
+            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'from_contact': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'from_contact_set'", 'to': "orm['identities.Contact']"}),
+            'members': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'members_set'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['identities.Contact']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'opt_in': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['messaging.Template']", 'null': 'True', 'blank': 'True'})
+        },
+        'messaging.message': {
+            'Meta': {'ordering': "['-date_created']", 'object_name': 'Message', '_ormbases': ['core.Object']},
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.Contact']"}),
+            'body': ('django.db.models.fields.TextField', [], {}),
+            'mlist': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'mlist'", 'null': 'True', 'to': "orm['messaging.MailingList']"}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'read_by': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'read_by_user'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'recipients': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'message_recipients'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['identities.Contact']"}),
+            'reply_to': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['messaging.Message']"}),
+            'stream': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'stream'", 'null': 'True', 'to': "orm['messaging.MessageStream']"}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'})
+        },
+        'messaging.messagestream': {
+            'Meta': {'ordering': "['name', 'last_updated']", 'object_name': 'MessageStream', '_ormbases': ['core.Object']},
+            'email_incoming': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'incoming'", 'null': 'True', 'to': "orm['messaging.EmailBox']"}),
+            'email_outgoing': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'outgoing'", 'null': 'True', 'to': "orm['messaging.EmailBox']"}),
+            'faulty': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'incoming_password': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'incoming_server_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'incoming_server_type': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'incoming_server_username': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'last_checked': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'outgoing_email': ('django.db.models.fields.EmailField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'outgoing_password': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'outgoing_server_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'outgoing_server_type': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'outgoing_server_username': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'})
+        },
+        'messaging.template': {
+            'Meta': {'object_name': 'Template', '_ormbases': ['core.Object']},
+            'body': ('django.db.models.fields.TextField', [], {}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'subject': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        }
+    }
+
+    complete_apps = ['messaging']
diff --git a/data/treeio/treeio/treeio/messaging/south_migrations/0004_auto__del_emailbox__del_field_messagestream_email_outgoing__del_field_.py b/data/treeio/treeio/treeio/messaging/south_migrations/0004_auto__del_emailbox__del_field_messagestream_email_outgoing__del_field_.py
new file mode 100644
index 0000000..29aa0ba
--- /dev/null
+++ b/data/treeio/treeio/treeio/messaging/south_migrations/0004_auto__del_emailbox__del_field_messagestream_email_outgoing__del_field_.py
@@ -0,0 +1,222 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Deleting model 'EmailBox'
+        db.delete_table('messaging_emailbox')
+
+        # Deleting field 'MessageStream.email_outgoing'
+        db.delete_column('messaging_messagestream', 'email_outgoing_id')
+
+        # Deleting field 'MessageStream.email_incoming'
+        db.delete_column('messaging_messagestream', 'email_incoming_id')
+
+    def backwards(self, orm):
+
+        # Adding model 'EmailBox'
+        db.create_table('messaging_emailbox', (
+            ('server_password', self.gf(
+                'django.db.models.fields.CharField')(max_length=255)),
+            ('email_type', self.gf(
+                'django.db.models.fields.CharField')(max_length=255)),
+            ('last_checked', self.gf('django.db.models.fields.DateTimeField')
+             (null=True, blank=True)),
+            ('server_type', self.gf(
+                'django.db.models.fields.CharField')(max_length=255)),
+            ('email_name', self.gf(
+                'django.db.models.fields.CharField')(max_length=255)),
+            ('server_name', self.gf(
+                'django.db.models.fields.CharField')(max_length=255)),
+            ('object_ptr', self.gf('django.db.models.fields.related.OneToOneField')(
+                to=orm['core.Object'], unique=True, primary_key=True)),
+            ('server_username', self.gf(
+                'django.db.models.fields.CharField')(max_length=255)),
+        ))
+        db.send_create_signal('messaging', ['EmailBox'])
+
+        # Adding field 'MessageStream.email_outgoing'
+        db.add_column('messaging_messagestream', 'email_outgoing', self.gf('django.db.models.fields.related.ForeignKey')(
+            related_name='outgoing', null=True, to=orm['messaging.EmailBox'], blank=True), keep_default=False)
+
+        # Adding field 'MessageStream.email_incoming'
+        db.add_column('messaging_messagestream', 'email_incoming', self.gf('django.db.models.fields.related.ForeignKey')(
+            related_name='incoming', null=True, to=orm['messaging.EmailBox'], blank=True), keep_default=False)
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'core.accessentity': {
+            'Meta': {'object_name': 'AccessEntity'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        },
+        'core.comment': {
+            'Meta': {'object_name': 'Comment'},
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'}),
+            'body': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"})
+        },
+        'core.group': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Group', '_ormbases': ['core.AccessEntity']},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True', 'primary_key': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['core.Group']"})
+        },
+        'core.object': {
+            'Meta': {'object_name': 'Object'},
+            'comments': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.Comment']"}),
+            'creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'objects_created'", 'null': 'True', 'to': "orm['core.User']"}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'full_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_full_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'links': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'links_rel_+'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'nuvius_resource': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'object_name': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'object_type': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'read_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_read_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'subscribers': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'subscriptions'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Tag']", 'null': 'True', 'blank': 'True'}),
+            'trash': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'core.tag': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Tag'},
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'})
+        },
+        'core.user': {
+            'Meta': {'ordering': "['name']", 'object_name': 'User', '_ormbases': ['core.AccessEntity']},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True', 'primary_key': 'True'}),
+            'default_group': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'default_user_set'", 'null': 'True', 'to': "orm['core.Group']"}),
+            'disabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_access': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'other_groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'identities.contact': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Contact', '_ormbases': ['core.Object']},
+            'contact_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.ContactType']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['identities.Contact']"}),
+            'related_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.AccessEntity']", 'null': 'True', 'blank': 'True'})
+        },
+        'identities.contactfield': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ContactField', '_ormbases': ['core.Object']},
+            'allowed_values': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'field_type': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'required': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'identities.contacttype': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ContactType', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'fields': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['identities.ContactField']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'slug': ('django.db.models.fields.CharField', [], {'max_length': '256'})
+        },
+        'messaging.mailinglist': {
+            'Meta': {'ordering': "['-date_created']", 'object_name': 'MailingList', '_ormbases': ['core.Object']},
+            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'from_contact': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'from_contact_set'", 'to': "orm['identities.Contact']"}),
+            'members': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'members_set'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['identities.Contact']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'opt_in': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['messaging.Template']", 'null': 'True', 'blank': 'True'})
+        },
+        'messaging.message': {
+            'Meta': {'ordering': "['-date_created']", 'object_name': 'Message', '_ormbases': ['core.Object']},
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.Contact']"}),
+            'body': ('django.db.models.fields.TextField', [], {}),
+            'mlist': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'mlist'", 'null': 'True', 'to': "orm['messaging.MailingList']"}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'read_by': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'read_by_user'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'recipients': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'message_recipients'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['identities.Contact']"}),
+            'reply_to': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['messaging.Message']"}),
+            'stream': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'stream'", 'null': 'True', 'to': "orm['messaging.MessageStream']"}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'})
+        },
+        'messaging.messagestream': {
+            'Meta': {'ordering': "['name', 'last_updated']", 'object_name': 'MessageStream', '_ormbases': ['core.Object']},
+            'faulty': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'incoming_password': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'incoming_server_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'incoming_server_type': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'incoming_server_username': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'last_checked': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'outgoing_email': ('django.db.models.fields.EmailField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'outgoing_password': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'outgoing_server_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'outgoing_server_type': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'outgoing_server_username': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'})
+        },
+        'messaging.template': {
+            'Meta': {'object_name': 'Template', '_ormbases': ['core.Object']},
+            'body': ('django.db.models.fields.TextField', [], {}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'subject': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        }
+    }
+
+    complete_apps = ['messaging']
diff --git a/data/treeio/treeio/treeio/messaging/views.py b/data/treeio/treeio/treeio/messaging/views.py
new file mode 100644
index 0000000..3498898
--- /dev/null
+++ b/data/treeio/treeio/treeio/messaging/views.py
@@ -0,0 +1,764 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+"""
+Messaging module views
+"""
+from django.shortcuts import get_object_or_404
+from django.template import RequestContext
+from django.http import HttpResponseRedirect
+from django.core.urlresolvers import reverse
+from django.utils.translation import ugettext as _
+from django.contrib import messages
+from django.db.models import Q
+from treeio.core.models import Object, ModuleSetting
+from treeio.core.views import user_denied
+from treeio.core.conf import settings
+from treeio.core.rendering import render_to_response
+from treeio.core.decorators import treeio_login_required, handle_response_format
+from treeio.identities.models import ContactType, Contact
+from treeio.messaging.models import Message, MessageStream, MailingList
+from treeio.messaging.forms import MessageForm, MessageStreamForm, FilterForm, MassActionForm, SettingsForm, \
+    MessageReplyForm, MailingListForm
+import re
+
+
+def _get_filter_query(args):
+    "Creates a query to filter Messages based on FilterForm arguments"
+    query = Q()
+
+    for arg in args:
+        if hasattr(Message, arg) and args[arg]:
+            kwargs = {str(arg + '__id'): long(args[arg])}
+            query = query & Q(**kwargs)
+
+    return query
+
+
+def _get_default_context(request):
+    "Returns default context as a dict()"
+    streams = Object.filter_by_request(request, MessageStream.objects)
+    mlists = MailingList.objects.all()
+    massform = MassActionForm(request.user.profile)
+
+    context = {'streams': streams,
+               'mlists': mlists,
+               'massform': massform}
+
+    return context
+
+
+def _process_mass_form(f):
+    "Pre-process request to handle mass action form for Messages"
+
+    def wrap(request, *args, **kwargs):
+        "Wrap"
+        user = request.user.profile
+        if 'massform' in request.POST:
+            for key in request.POST:
+                if 'mass-message' in key:
+                    try:
+                        message = Message.objects.get(pk=request.POST[key])
+                        form = MassActionForm(
+                            user, request.POST, instance=message)
+                        if form.is_valid() and user.has_permission(message, mode='w'):
+                            form.save()
+                    except Exception:
+                        pass
+            try:
+                form = MassActionForm(request.user.profile, request.POST)
+                if form.is_valid():
+                    form.save()
+            except Exception:
+                pass
+
+        return f(request, *args, **kwargs)
+
+    wrap.__doc__ = f.__doc__
+    wrap.__name__ = f.__name__
+
+    return wrap
+
+
+@handle_response_format
+@treeio_login_required
+@_process_mass_form
+def index(request, response_format='html'):
+    "Messaging index page"
+
+    query = Q(reply_to__isnull=True)
+    if request.GET:
+        query = query & _get_filter_query(request.GET)
+        objects = Object.filter_by_request(
+            request, Message.objects.filter(query))
+    else:
+        objects = Object.filter_by_request(
+            request, Message.objects.filter(query))
+
+    filters = FilterForm(request.user.profile, 'title', request.GET)
+
+    context = _get_default_context(request)
+    context.update({'filters': filters,
+                    'messages': objects})
+
+    return render_to_response('messaging/index', context,
+                              context_instance=RequestContext(request),
+                              response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+@_process_mass_form
+def index_sent(request, response_format='html'):
+    "Sent messages index page"
+
+    query = Q(reply_to__isnull=True) & Q(
+        author=request.user.profile.get_contact())
+    if request.GET:
+        query = query & _get_filter_query(request.GET)
+        objects = Object.filter_by_request(
+            request, Message.objects.filter(query))
+    else:
+        objects = Object.filter_by_request(
+            request, Message.objects.filter(query))
+
+    filters = FilterForm(request.user.profile, 'title', request.GET)
+
+    context = _get_default_context(request)
+    context.update({'filters': filters,
+                    'messages': objects})
+
+    return render_to_response('messaging/index_sent', context,
+                              context_instance=RequestContext(request),
+                              response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+@_process_mass_form
+def index_inbox(request, response_format='html'):
+    "Received messages index page"
+
+    query = Q(reply_to__isnull=True) & ~Q(
+        author=request.user.profile.get_contact())
+    if request.GET:
+        query = query & _get_filter_query(request.GET)
+        objects = Object.filter_by_request(
+            request, Message.objects.filter(query))
+    else:
+        objects = Object.filter_by_request(
+            request, Message.objects.filter(query))
+
+    filters = FilterForm(request.user.profile, 'title', request.GET)
+    context = _get_default_context(request)
+    context.update({'filters': filters,
+                    'messages': objects})
+
+    return render_to_response('messaging/index_inbox', context,
+                              context_instance=RequestContext(request),
+                              response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+@_process_mass_form
+def index_unread(request, response_format='html'):
+    "Messaging unread page"
+
+    user = request.user.profile
+
+    query = Q(reply_to__isnull=True) & ~Q(read_by=user)
+    if request.GET:
+        query = query & _get_filter_query(request.GET)
+        objects = Object.filter_by_request(
+            request, Message.objects.filter(query))
+    else:
+        objects = Object.filter_by_request(
+            request, Message.objects.filter(query))
+
+    filters = FilterForm(request.user.profile, 'title', request.GET)
+
+    context = _get_default_context(request)
+    context.update({'filters': filters,
+                    'messages': objects})
+
+    return render_to_response('messaging/unread', context,
+                              context_instance=RequestContext(request),
+                              response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def stream_add(request, response_format='html'):
+    "New message stream"
+    user = request.user.profile
+
+    if request.POST:
+        if 'cancel' not in request.POST:
+            stream = MessageStream()
+            form = MessageStreamForm(user, request.POST, instance=stream)
+            if form.is_valid():
+                stream = form.save()
+                stream.set_user_from_request(request)
+                return HttpResponseRedirect(reverse('messaging'))
+        else:
+            return HttpResponseRedirect(reverse('messaging'))
+    else:
+        form = MessageStreamForm(user)
+
+    context = _get_default_context(request)
+    context.update({'form': form})
+
+    return render_to_response('messaging/stream_add', context,
+                              context_instance=RequestContext(request),
+                              response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+@_process_mass_form
+def stream_view(request, stream_id, response_format='html'):
+    "Stream view page"
+
+    user = request.user.profile
+
+    stream = get_object_or_404(MessageStream, pk=stream_id)
+    if not request.user.profile.has_permission(stream):
+        return user_denied(request, message="You don't have access to this Stream",
+                           response_format=response_format)
+
+    if request.user.profile.has_permission(stream, mode='x'):
+        if request.POST:
+            message = Message()
+            message.author = user.get_contact()
+            if not message.author:
+                return user_denied(request,
+                                   message="You can't send message without a Contact Card assigned to you.",
+                                   response_format=response_format)
+
+            form = MessageForm(
+                request.user.profile, None, None, request.POST, instance=message)
+            if form.is_valid():
+                message = form.save()
+                message.recipients.add(user.get_contact())
+                message.set_user_from_request(request)
+                message.read_by.add(user)
+                try:
+                    # if email entered create contact and add to recipients
+                    if 'multicomplete_recipients' in request.POST and request.POST['multicomplete_recipients']:
+                        try:
+                            conf = ModuleSetting.get_for_module(
+                                'treeio.messaging', 'default_contact_type')[0]
+                            default_contact_type = ContactType.objects.get(
+                                pk=long(conf.value))
+                        except Exception:
+                            default_contact_type = None
+                        emails = request.POST[
+                            'multicomplete_recipients'].split(',')
+                        for email in emails:
+                            emailstr = unicode(email).strip()
+                            if re.match('[a-zA-Z0-9+_\-\.]+@[0-9a-zA-Z][.-0-9a-zA-Z]*.[a-zA-Z]+', emailstr):
+                                contact, created = Contact.get_or_create_by_email(
+                                    emailstr, contact_type=default_contact_type)
+                                message.recipients.add(contact)
+                                if created:
+                                    contact.set_user_from_request(request)
+                except:
+                    pass
+                # send email to all recipients
+                message.send_email()
+
+                return HttpResponseRedirect(reverse('messaging_stream_view', args=[stream.id]))
+        else:
+            form = MessageForm(request.user.profile, stream_id)
+
+    else:
+        form = None
+
+    objects = Object.filter_by_request(request, Message.objects.filter(
+        reply_to__isnull=True, stream=stream).order_by('-date_created'))
+    context = _get_default_context(request)
+    context.update({'messages': objects,
+                    'form': form,
+                    'stream': stream})
+
+    return render_to_response('messaging/stream_view', context,
+                              context_instance=RequestContext(request),
+                              response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def stream_edit(request, stream_id, response_format='html'):
+    "Stream edit page"
+    user = request.user.profile
+
+    stream = get_object_or_404(MessageStream, pk=stream_id)
+    if not request.user.profile.has_permission(stream, mode="w"):
+        return user_denied(request, message="You don't have access to this Stream",
+                           response_format=response_format)
+
+    if request.POST:
+        if 'cancel' not in request.POST:
+            form = MessageStreamForm(user, request.POST, instance=stream)
+            if form.is_valid():
+                stream = form.save()
+                return HttpResponseRedirect(reverse('messaging_stream_view', args=[stream.id]))
+        else:
+            return HttpResponseRedirect(reverse('messaging_stream_view', args=[stream.id]))
+    else:
+        form = MessageStreamForm(user, instance=stream)
+
+    context = _get_default_context(request)
+    context.update({'form': form,
+                    'stream': stream})
+
+    return render_to_response('messaging/stream_edit', context,
+                              context_instance=RequestContext(request),
+                              response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def stream_checkmail(request, stream_id, response_format='html'):
+    "Stream check mail"
+    user = request.user.profile
+
+    stream = get_object_or_404(MessageStream, pk=stream_id)
+    if not user.has_permission(stream):
+        return user_denied(request, message="You don't have access to this Stream",
+                           response_format=response_format)
+
+    try:
+        stream.process_email()
+        messages.add_message(
+            request, messages.INFO, _("E-mails fetched successfully."), fail_silently=True)
+    except:
+        try:
+            messages.add_message(request, messages.ERROR, _(
+                "Failed to retrieve messages for this stream. Please check stream settings"), fail_silently=True)
+        except:
+            pass
+
+    return HttpResponseRedirect(reverse('messaging_stream_view', args=[stream.id]))
+
+
+@handle_response_format
+@treeio_login_required
+def stream_delete(request, stream_id, response_format='html'):
+    "Delete stream page"
+
+    stream = get_object_or_404(MessageStream, pk=stream_id)
+    if not request.user.profile.has_permission(stream, mode="w"):
+        return user_denied(request, message="You don't have access to this Stream",
+                           response_format=response_format)
+
+    if request.POST:
+        if 'delete' in request.POST:
+            if 'trash' in request.POST:
+                stream.trash = True
+                stream.save()
+            else:
+                stream.delete()
+            return HttpResponseRedirect('/messaging/')
+        elif 'cancel' in request.POST:
+            return HttpResponseRedirect(reverse('messaging_stream_view', args=[stream.id]))
+
+    context = _get_default_context(request)
+    context.update({'stream': stream})
+
+    return render_to_response('messaging/stream_delete', context,
+                              context_instance=RequestContext(request),
+                              response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def messaging_compose(request, response_format='html'):
+    "New message page"
+
+    user = request.user.profile
+
+    if request.POST:
+        if 'cancel' not in request.POST:
+            message = Message()
+            message.author = user.get_contact()
+            if not message.author:
+                return user_denied(request,
+                                   message="You can't send message without a Contact Card assigned to you.",
+                                   response_format=response_format)
+
+            form = MessageForm(
+                request.user.profile, None, None, request.POST, instance=message)
+            if form.is_valid():
+                message = form.save()
+                message.recipients.add(user.get_contact())
+                message.set_user_from_request(request)
+                message.read_by.add(user)
+                try:
+                    # if email entered create contact and add to recipients
+                    if 'multicomplete_recipients' in request.POST and request.POST['multicomplete_recipients']:
+                        try:
+                            conf = ModuleSetting.get_for_module(
+                                'treeio.messaging', 'default_contact_type')[0]
+                            default_contact_type = ContactType.objects.get(
+                                pk=long(conf.value))
+                        except Exception:
+                            default_contact_type = None
+                        emails = request.POST[
+                            'multicomplete_recipients'].split(',')
+                        for email in emails:
+                            emailstr = unicode(email).strip()
+                            if re.match('[a-zA-Z0-9+_\-\.]+@[0-9a-zA-Z][.-0-9a-zA-Z]*.[a-zA-Z]+', emailstr):
+                                contact, created = Contact.get_or_create_by_email(
+                                    emailstr, contact_type=default_contact_type)
+                                message.recipients.add(contact)
+                                if created:
+                                    contact.set_user_from_request(request)
+                except:
+                    pass
+                # send email to all recipients
+                message.send_email()
+
+                return HttpResponseRedirect(reverse('messaging'))
+        else:
+            return HttpResponseRedirect(reverse('messaging'))
+
+    else:
+        form = MessageForm(request.user.profile, None)
+
+    context = _get_default_context(request)
+    context.update({'form': form})
+
+    return render_to_response('messaging/message_compose', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def messaging_view(request, message_id, response_format='html'):
+    "Single message page"
+
+    message = get_object_or_404(Message, pk=message_id)
+    user = request.user.profile
+
+    if not user.has_permission(message):
+        return user_denied(request, message="You don't have access to this Message",
+                           response_format=response_format)
+
+    message.read_by.add(user)
+
+    if request.POST and request.POST.get('body', False):
+        "Unread message"
+
+        reply = Message()
+        reply.author = user.get_contact()
+        if not reply.author:
+            return user_denied(request,
+                               message="You can't send message without a Contact Card assigned to you.",
+                               response_format=response_format)
+        reply.reply_to = message
+        form = MessageReplyForm(
+            user, message.stream_id, message, request.POST, instance=reply)
+        if form.is_valid():
+            reply = form.save()
+            reply.set_user_from_request(request)
+            # Add author to recipients
+            reply.recipients.add(reply.author)
+            message.read_by.clear()
+
+            try:
+                # if email entered create contact and add to recipients
+                if 'multicomplete_recipients' in request.POST and request.POST['multicomplete_recipients']:
+                    try:
+                        conf = ModuleSetting.get_for_module(
+                            'treeio.messaging', 'default_contact_type')[0]
+                        default_contact_type = ContactType.objects.get(
+                            pk=long(conf.value))
+                    except Exception:
+                        default_contact_type = None
+                    emails = request.POST[
+                        'multicomplete_recipients'].split(',')
+                    for email in emails:
+                        emailstr = unicode(email).strip()
+                        if re.match('[a-zA-Z0-9+_\-\.]+@[0-9a-zA-Z][.-0-9a-zA-Z]*.[a-zA-Z]+', emailstr):
+                            contact, created = Contact.get_or_create_by_email(
+                                emailstr, contact_type=default_contact_type)
+                            reply.recipients.add(contact)
+                            if created:
+                                contact.set_user_from_request(request)
+            except:
+                pass
+
+            # Add each recipient of the reply to the original message
+            for recipient in reply.recipients.all():
+                message.recipients.add(recipient)
+
+            # send email to all recipients
+            reply.send_email()
+
+            return HttpResponseRedirect(reverse('messaging_message_view', args=[message.id]))
+
+    else:
+        form = MessageReplyForm(
+            request.user.profile, message.stream_id, message)
+
+    replies = Object.filter_by_request(request,
+                                       Message.objects.filter(reply_to=message).order_by('date_created'))
+
+    context = _get_default_context(request)
+    context.update({'message': message,
+                    'messages': replies,
+                    'form': form})
+
+    return render_to_response('messaging/message_view', context,
+                              context_instance=RequestContext(request),
+                              response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def messaging_delete(request, message_id, response_format='html'):
+    "Delete message page"
+
+    message = get_object_or_404(Message, pk=message_id)
+
+    if not request.user.profile.has_permission(message, mode="w"):
+        return user_denied(request, message="You don't have access to this Message",
+                           response_format=response_format)
+
+    if request.POST:
+        if 'delete' in request.POST:
+            if 'trash' in request.POST:
+                message.trash = True
+                message.save()
+            else:
+                message.delete()
+            return HttpResponseRedirect('/messaging/')
+        elif 'cancel' in request.POST:
+            return HttpResponseRedirect(reverse('messaging_stream_view', args=[message.stream.id]))
+
+    context = _get_default_context(request)
+    context.update({'message': message})
+
+    return render_to_response('messaging/message_delete', context,
+                              context_instance=RequestContext(request),
+                              response_format=response_format)
+
+"""
+Mailing Lists
+"""
+
+
+@handle_response_format
+@treeio_login_required
+def mlist_add(request, response_format='html'):
+    "New message mlist"
+    user = request.user.profile
+
+    if request.POST:
+
+        mlist = MailingList()
+
+        form = MailingListForm(user, request.POST, instance=mlist)
+        if form.is_valid():
+            mlist = form.save()
+            mlist.set_user_from_request(request)
+            return HttpResponseRedirect('/messaging/')
+    else:
+        form = MailingListForm(user)
+
+    context = _get_default_context(request)
+    context.update({'form': form})
+
+    return render_to_response('messaging/mlist_add', context,
+                              context_instance=RequestContext(request),
+                              response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+@_process_mass_form
+def mlist_view(request, mlist_id, response_format='html'):
+    "Mailing List view page"
+
+    user = request.user.profile
+
+    mlist = get_object_or_404(MailingList, pk=mlist_id)
+    if not request.user.profile.has_permission(mlist):
+        return user_denied(request, message="You don't have access to this Mailing List",
+                           response_format=response_format)
+
+    if request.user.profile.has_permission(mlist, mode='x'):
+        if request.POST:
+            message = Message()
+            message.author = request.user.profile.get_contact()
+            if not message.author:
+                return user_denied(request,
+                                   message="You can't send message without a Contact Card assigned to you.",
+                                   response_format=response_format)
+            form = MessageForm(
+                request.user.profile, mlist_id, None, request.POST, instance=message)
+            if form.is_valid():
+                message = form.save()
+                message.set_user_from_request(request)
+                message.read_by.add(user)
+                return HttpResponseRedirect(reverse('messaging_mlist_view', args=[mlist.id]))
+        else:
+            form = MessageForm(request.user.profile, mlist_id)
+
+    else:
+        form = None
+
+    messages = Object.filter_by_request(request,
+                                        Message.objects.filter(reply_to__isnull=True,
+                                                               mlist=mlist).order_by('-date_created'))
+    context = _get_default_context(request)
+    context.update({'messages': messages,
+                    'form': form,
+                    'mlist': mlist})
+
+    return render_to_response('messaging/mlist_view', context,
+                              context_instance=RequestContext(request),
+                              response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def mlist_edit(request, mlist_id, response_format='html'):
+    "MailingList edit page"
+    user = request.user.profile
+
+    mlist = get_object_or_404(MailingList, pk=mlist_id)
+    if not user.has_permission(mlist, mode="w"):
+        return user_denied(request, message="You don't have access to this Mailing List",
+                           response_format=response_format)
+
+    context = _get_default_context(request)
+    context.update({'mlist': mlist})
+
+    return render_to_response('messaging/mlist_edit', context,
+                              context_instance=RequestContext(request),
+                              response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def mlist_delete(request, mlist_id, response_format='html'):
+    "Delete mlist page"
+
+    mlist = get_object_or_404(MailingList, pk=mlist_id)
+    if not request.user.profile.has_permission(mlist, mode="w"):
+        return user_denied(request, message="You don't have access to this Mailing List",
+                           response_format=response_format)
+
+    if request.POST:
+        if 'delete' in request.POST:
+            if 'trash' in request.POST:
+                mlist.trash = True
+                mlist.save()
+            else:
+                mlist.delete()
+            return HttpResponseRedirect('/messaging/')
+        elif 'cancel' in request.POST:
+            return HttpResponseRedirect(reverse('messaging_mlist_view', args=[mlist.id]))
+
+    context = _get_default_context(request)
+    context.update({'mlist': mlist})
+
+    return render_to_response('messaging/mlist_delete', context,
+                              context_instance=RequestContext(request),
+                              response_format=response_format)
+
+
+"""
+Settings
+"""
+
+
+@handle_response_format
+@treeio_login_required
+def settings_view(request, response_format='html'):
+    "Settings admin view"
+
+    # default content type
+    try:
+        conf = ModuleSetting.get_for_module('treeio.messaging', 'default_contact_type',
+                                            user=request.user.profile)[0]
+        default_contact_type = ContactType.objects.get(pk=long(conf.value))
+    except:
+        default_contact_type = None
+
+    # default imap folder
+    try:
+        conf = ModuleSetting.get_for_module(
+            'treeio.messaging', 'default_imap_folder')[0]
+        default_imap_folder = conf.value
+    except:
+        default_imap_folder = getattr(
+            settings, 'HARDTREE_MESSAGING_IMAP_DEFAULT_FOLDER_NAME', 'UNSEEN')
+
+    # signature
+    try:
+        conf = ModuleSetting.get_for_module('treeio.messaging', 'signature',
+                                            user=request.user.profile, strict=True)[0]
+        signature = conf.value
+    except:
+        signature = ''
+
+    types = Object.filter_by_request(
+        request, ContactType.objects.order_by('name'))
+
+    context = _get_default_context(request)
+    context.update({'types': types,
+                    'signature': signature,
+                    'default_contact_type': default_contact_type,
+                    'default_imap_folder': default_imap_folder})
+
+    return render_to_response('messaging/settings_view', context,
+                              context_instance=RequestContext(request),
+                              response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def settings_edit(request, response_format='html'):
+    "Settings admin view"
+
+    if request.POST:
+        if 'cancel' not in request.POST:
+            form = SettingsForm(request.user.profile, request.POST)
+            if form.is_valid():
+                form.save()
+                return HttpResponseRedirect(reverse('messaging_settings_view'))
+        else:
+            return HttpResponseRedirect(reverse('messaging_settings_view'))
+    else:
+        form = SettingsForm(request.user.profile)
+
+    context = _get_default_context(request)
+    context.update({'form': form})
+
+    return render_to_response('messaging/settings_edit', context,
+                              context_instance=RequestContext(request),
+                              response_format=response_format)
+
+
+#
+# Widgets
+#
+
+@treeio_login_required
+def widget_new_messages(request, response_format='html'):
+    "A list of new messages. Limit by 5."
+
+    query = Q(reply_to__isnull=True) & ~Q(read_by=request.user.profile)
+
+    messages = Object.filter_by_request(
+        request, Message.objects.filter(query))[:5]
+
+    return render_to_response('messaging/widgets/new_messages',
+                              {'messages': messages},
+                              context_instance=RequestContext(request), response_format=response_format)
diff --git a/data/treeio/treeio/treeio/news/forms.py b/data/treeio/treeio/treeio/news/forms.py
new file mode 100644
index 0000000..da053ca
--- /dev/null
+++ b/data/treeio/treeio/treeio/news/forms.py
@@ -0,0 +1,83 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+"""
+News module forms
+"""
+
+from django import forms
+from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse
+from treeio.core.conf import settings
+from treeio.core.models import UpdateRecord, ModuleSetting, Object
+
+
+class UpdateRecordForm(forms.ModelForm):
+
+    """ UpdateRecord form """
+
+    def __init__(self, *args, **kwargs):
+
+        self.user = kwargs.pop('user', None)
+        super(UpdateRecordForm, self).__init__(*args, **kwargs)
+
+        self.fields['body'].required = True
+        self.fields['body'].label = _("Details")
+
+        self.fields['recipients'].help_text = ""
+        self.fields['recipients'].required = False
+        self.fields['recipients'].widget.attrs.update({'class': 'multicomplete',
+                                                       'callback': reverse('identities_ajax_access_lookup')})
+
+        # get default permissions from settings
+        try:
+            conf = ModuleSetting.get_for_module(
+                'treeio.core', 'default_permissions')[0]
+            default_permissions = conf.value
+        except:
+            default_permissions = settings.HARDTREE_DEFAULT_PERMISSIONS
+
+        if self.user and 'userallgroups' in default_permissions:
+            self.fields['recipients'].initial = [
+                i.id for i in self.user.other_groups.all().only('id')]
+            self.fields['recipients'].initial.append(
+                self.user.default_group.id)
+        elif self.user and 'usergroup' in default_permissions:
+            self.fields['recipients'].initial = [self.user.default_group.id]
+
+    class Meta:
+
+        "TaskRecordForm"
+        model = UpdateRecord
+        fields = ['body', 'recipients']
+
+
+class UpdateRecordFilterForm(forms.ModelForm):
+
+    """ Filter form definition """
+
+    def __init__(self, user, *args, **kwargs):
+        super(UpdateRecordFilterForm, self).__init__(*args, **kwargs)
+
+        self.fields['author'].label = _("Author")
+        self.fields['about'].label = _("About")
+
+        self.fields['author'].required = False
+        self.fields['author'].widget.attrs.update({'class': 'autocomplete',
+                                                  'callback': reverse('identities_ajax_user_lookup')})
+
+        self.fields['about'].queryset = Object.filter_permitted(
+            user, Object.objects, mode='x')
+        self.fields['about'].required = False
+        self.fields['about'].null = True
+        self.fields['about'].help_text = ""
+        self.fields['about'].widget.attrs.update({'class': 'multicomplete',
+                                                  'callback': reverse('core_ajax_object_lookup')})
+
+    class Meta:
+
+        "Filter"
+        model = UpdateRecord
+        fields = ('author', 'about')
diff --git a/data/treeio/treeio/treeio/news/south_migrations/0001_initial.py b/data/treeio/treeio/treeio/news/south_migrations/0001_initial.py
new file mode 100644
index 0000000..31e00cc
--- /dev/null
+++ b/data/treeio/treeio/treeio/news/south_migrations/0001_initial.py
@@ -0,0 +1,25 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        pass
+
+    def backwards(self, orm):
+        pass
+
+    models = {
+
+    }
+
+    complete_apps = ['news']
diff --git a/data/treeio/treeio/treeio/projects/ajax.py b/data/treeio/treeio/treeio/projects/ajax.py
new file mode 100644
index 0000000..5c94d3f
--- /dev/null
+++ b/data/treeio/treeio/treeio/projects/ajax.py
@@ -0,0 +1,31 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+from datetime import datetime
+from dajaxice.core import dajaxice_functions
+from dajax.core import Dajax
+from treeio.projects.models import Task, Milestone
+from django.contrib import messages
+from django.utils.translation import ugettext as _
+
+
+def gantt(request, task, start, end):
+    dajax = Dajax()
+    try:
+        t = Task.objects.get(pk=task)
+        ot = _("Task")
+    except:
+        t = Milestone.objects.get(pk=task)
+        ot = _("Milestone")
+    s = datetime.strptime(start, '%Y-%m-%d').replace(hour=12)
+    e = datetime.strptime(end, '%Y-%m-%d').replace(hour=12)
+    t.start_date = s
+    t.end_date = e
+    t.save()
+    messages.add_message(request, messages.INFO, _(
+        "%(ot)s \"%(t)s\" dates have been updated.") % {'ot': ot, 't': unicode(t)})
+    return dajax.json()
+
+dajaxice_functions.register(gantt)
diff --git a/data/treeio/treeio/treeio/projects/identities.py b/data/treeio/treeio/treeio/projects/identities.py
new file mode 100644
index 0000000..4999add
--- /dev/null
+++ b/data/treeio/treeio/treeio/projects/identities.py
@@ -0,0 +1,65 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+"""
+Handle objects from this module relevant to a Contact or a User
+"""
+from treeio.core.models import Object
+from treeio.projects.templatetags.projects import projects_task_list
+
+CONTACT_OBJECTS = {'manager': {'label': 'Managed Projects',
+                               'objects': [],
+                               'templatetag': None}, 'client': {'label': 'Ordered Projects',
+                                                                'objects': [],
+                                                                'templatetag': None},
+                   'task_set': {'label': 'Managed Tasks',
+                                'objects': [],
+                                'templatetag': projects_task_list}}
+
+USER_OBJECTS = {'task_set': {'label': 'Assigned Tasks',
+                             'objects': [],
+                             'templatetag': projects_task_list}}
+
+
+def get_contact_objects(current_user, contact):
+    """
+    Returns a dictionary with keys specified as contact attributes
+    and values as dictionaries with labels and set of relevant objects.
+    """
+
+    objects = dict(CONTACT_OBJECTS)
+
+    for key in objects:
+        if hasattr(contact, key):
+            manager = getattr(contact, key)
+            try:
+                manager = manager.filter(status__hidden=False)
+            except:
+                pass
+            objects[key]['objects'] = Object.filter_permitted(
+                current_user, manager)
+
+    return objects
+
+
+def get_user_objects(current_user, user):
+    """
+    Returns a dictionary with keys specified as contact attributes
+    and values as dictionaries with labels and set of relevant objects.
+    """
+
+    objects = dict(USER_OBJECTS)
+
+    for key in objects:
+        if hasattr(user, key):
+            manager = getattr(user, key)
+            try:
+                manager = manager.filter(status__hidden=False)
+            except:
+                pass
+            objects[key]['objects'] = Object.filter_permitted(
+                current_user, manager)
+
+    return objects
diff --git a/data/treeio/treeio/treeio/projects/south_migrations/0001_initial.py b/data/treeio/treeio/treeio/projects/south_migrations/0001_initial.py
new file mode 100644
index 0000000..fad4e33
--- /dev/null
+++ b/data/treeio/treeio/treeio/projects/south_migrations/0001_initial.py
@@ -0,0 +1,322 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Adding model 'Project'
+        db.create_table('projects_project', (
+            ('object_ptr', self.gf('django.db.models.fields.related.OneToOneField')(
+                to=orm['core.Object'], unique=True, primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')
+             (max_length=255)),
+            ('parent', self.gf('django.db.models.fields.related.ForeignKey')(
+                blank=True, related_name='child_set', null=True, to=orm['projects.Project'])),
+            ('manager', self.gf('django.db.models.fields.related.ForeignKey')(
+                blank=True, related_name='manager', null=True, to=orm['identities.Contact'])),
+            ('client', self.gf('django.db.models.fields.related.ForeignKey')(
+                blank=True, related_name='client', null=True, to=orm['identities.Contact'])),
+            ('details', self.gf('django.db.models.fields.TextField')
+             (max_length=255, null=True, blank=True)),
+        ))
+        db.send_create_signal('projects', ['Project'])
+
+        # Adding model 'TaskStatus'
+        db.create_table('projects_taskstatus', (
+            ('object_ptr', self.gf('django.db.models.fields.related.OneToOneField')(
+                to=orm['core.Object'], unique=True, primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')
+             (max_length=255)),
+            ('details', self.gf('django.db.models.fields.TextField')
+             (max_length=255, null=True, blank=True)),
+            ('active', self.gf('django.db.models.fields.BooleanField')
+             (default=False)),
+            ('hidden', self.gf('django.db.models.fields.BooleanField')
+             (default=False)),
+        ))
+        db.send_create_signal('projects', ['TaskStatus'])
+
+        # Adding model 'Milestone'
+        db.create_table('projects_milestone', (
+            ('object_ptr', self.gf('django.db.models.fields.related.OneToOneField')(
+                to=orm['core.Object'], unique=True, primary_key=True)),
+            ('project', self.gf('django.db.models.fields.related.ForeignKey')
+             (to=orm['projects.Project'])),
+            ('name', self.gf('django.db.models.fields.CharField')
+             (max_length=255)),
+            ('status', self.gf('django.db.models.fields.related.ForeignKey')
+             (to=orm['projects.TaskStatus'])),
+            ('details', self.gf('django.db.models.fields.TextField')
+             (max_length=255, null=True, blank=True)),
+            ('start_date', self.gf('django.db.models.fields.DateTimeField')
+             (null=True, blank=True)),
+            ('end_date', self.gf('django.db.models.fields.DateTimeField')
+             (null=True, blank=True)),
+        ))
+        db.send_create_signal('projects', ['Milestone'])
+
+        # Adding model 'Task'
+        db.create_table('projects_task', (
+            ('object_ptr', self.gf('django.db.models.fields.related.OneToOneField')(
+                to=orm['core.Object'], unique=True, primary_key=True)),
+            ('parent', self.gf('django.db.models.fields.related.ForeignKey')(
+                blank=True, related_name='child_set', null=True, to=orm['projects.Task'])),
+            ('project', self.gf('django.db.models.fields.related.ForeignKey')
+             (to=orm['projects.Project'])),
+            ('milestone', self.gf('django.db.models.fields.related.ForeignKey')(
+                to=orm['projects.Milestone'], null=True, blank=True)),
+            ('status', self.gf('django.db.models.fields.related.ForeignKey')
+             (to=orm['projects.TaskStatus'])),
+            ('name', self.gf('django.db.models.fields.CharField')
+             (max_length=255)),
+            ('details', self.gf('django.db.models.fields.TextField')
+             (max_length=255, null=True, blank=True)),
+            ('caller', self.gf('django.db.models.fields.related.ForeignKey')
+             (to=orm['identities.Contact'], null=True, blank=True)),
+            ('start_date', self.gf('django.db.models.fields.DateTimeField')
+             (null=True, blank=True)),
+            ('end_date', self.gf('django.db.models.fields.DateTimeField')
+             (null=True, blank=True)),
+            ('priority', self.gf(
+                'django.db.models.fields.IntegerField')(default=3)),
+            ('estimated_time', self.gf('django.db.models.fields.IntegerField')
+             (null=True, blank=True)),
+        ))
+        db.send_create_signal('projects', ['Task'])
+
+        # Adding M2M table for field assigned on 'Task'
+        db.create_table('projects_task_assigned', (
+            ('id', models.AutoField(
+                verbose_name='ID', primary_key=True, auto_created=True)),
+            ('task', models.ForeignKey(orm['projects.task'], null=False)),
+            ('user', models.ForeignKey(orm['core.user'], null=False))
+        ))
+        db.create_unique('projects_task_assigned', ['task_id', 'user_id'])
+
+        # Adding model 'TaskTimeSlot'
+        db.create_table('projects_tasktimeslot', (
+            ('object_ptr', self.gf('django.db.models.fields.related.OneToOneField')(
+                to=orm['core.Object'], unique=True, primary_key=True)),
+            ('task', self.gf('django.db.models.fields.related.ForeignKey')
+             (to=orm['projects.Task'])),
+            ('time_from', self.gf('django.db.models.fields.DateTimeField')()),
+            ('time_to', self.gf('django.db.models.fields.DateTimeField')
+             (null=True, blank=True)),
+            ('timezone', self.gf(
+                'django.db.models.fields.IntegerField')(default=0)),
+            ('details', self.gf('django.db.models.fields.TextField')
+             (max_length=255, null=True, blank=True)),
+        ))
+        db.send_create_signal('projects', ['TaskTimeSlot'])
+
+        # Adding model 'TaskRecord'
+        db.create_table('projects_taskrecord', (
+            ('object_ptr', self.gf('django.db.models.fields.related.OneToOneField')(
+                to=orm['core.Object'], unique=True, primary_key=True)),
+            ('task', self.gf('django.db.models.fields.related.ForeignKey')
+             (to=orm['projects.Task'])),
+            ('record_type', self.gf(
+                'django.db.models.fields.CharField')(max_length=256)),
+            ('details', self.gf('django.db.models.fields.TextField')()),
+        ))
+        db.send_create_signal('projects', ['TaskRecord'])
+
+    def backwards(self, orm):
+
+        # Deleting model 'Project'
+        db.delete_table('projects_project')
+
+        # Deleting model 'TaskStatus'
+        db.delete_table('projects_taskstatus')
+
+        # Deleting model 'Milestone'
+        db.delete_table('projects_milestone')
+
+        # Deleting model 'Task'
+        db.delete_table('projects_task')
+
+        # Removing M2M table for field assigned on 'Task'
+        db.delete_table('projects_task_assigned')
+
+        # Deleting model 'TaskTimeSlot'
+        db.delete_table('projects_tasktimeslot')
+
+        # Deleting model 'TaskRecord'
+        db.delete_table('projects_taskrecord')
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'core.group': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Group'},
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['core.Group']"})
+        },
+        'core.object': {
+            'Meta': {'object_name': 'Object'},
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'everybody_execute': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'everybody_read': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'everybody_write': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Group']"}),
+            'group_execute': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'group_read': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'group_write': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'links': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'links_rel_+'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'nuvius_resource': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'object_name': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'object_type': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'subscribers': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'subscriptions'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'trash': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']"}),
+            'user_execute': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'user_read': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'user_write': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'core.user': {
+            'Meta': {'ordering': "['name']", 'object_name': 'User'},
+            'default_group': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'default_user_set'", 'null': 'True', 'to': "orm['core.Group']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'other_groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'identities.contact': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Contact', '_ormbases': ['core.Object']},
+            'contact_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.ContactType']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['identities.Contact']"}),
+            'related_group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'related_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'})
+        },
+        'identities.contactfield': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ContactField', '_ormbases': ['core.Object']},
+            'allowed_values': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'field_type': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'required': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'identities.contacttype': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ContactType', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'fields': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['identities.ContactField']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'slug': ('django.db.models.fields.CharField', [], {'max_length': '256'})
+        },
+        'projects.milestone': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Milestone', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'end_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['projects.Project']"}),
+            'start_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'status': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['projects.TaskStatus']"})
+        },
+        'projects.project': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Project', '_ormbases': ['core.Object']},
+            'client': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'client'", 'null': 'True', 'to': "orm['identities.Contact']"}),
+            'details': ('django.db.models.fields.TextField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'manager': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'manager'", 'null': 'True', 'to': "orm['identities.Contact']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['projects.Project']"})
+        },
+        'projects.task': {
+            'Meta': {'ordering': "('-priority', 'name')", 'object_name': 'Task', '_ormbases': ['core.Object']},
+            'assigned': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.User']", 'null': 'True', 'blank': 'True'}),
+            'caller': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.Contact']", 'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'end_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'estimated_time': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'milestone': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['projects.Milestone']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['projects.Task']"}),
+            'priority': ('django.db.models.fields.IntegerField', [], {'default': '3'}),
+            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['projects.Project']"}),
+            'start_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'status': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['projects.TaskStatus']"})
+        },
+        'projects.taskrecord': {
+            'Meta': {'object_name': 'TaskRecord', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'record_type': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'task': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['projects.Task']"})
+        },
+        'projects.taskstatus': {
+            'Meta': {'ordering': "('hidden', '-active', 'name')", 'object_name': 'TaskStatus', '_ormbases': ['core.Object']},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'details': ('django.db.models.fields.TextField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'hidden': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'projects.tasktimeslot': {
+            'Meta': {'ordering': "['-date_created']", 'object_name': 'TaskTimeSlot', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'task': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['projects.Task']"}),
+            'time_from': ('django.db.models.fields.DateTimeField', [], {}),
+            'time_to': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'timezone': ('django.db.models.fields.IntegerField', [], {'default': '0'})
+        }
+    }
+
+    complete_apps = ['projects']
diff --git a/data/treeio/treeio/treeio/projects/south_migrations/0002_updaterecords.py b/data/treeio/treeio/treeio/projects/south_migrations/0002_updaterecords.py
new file mode 100644
index 0000000..2c4d855
--- /dev/null
+++ b/data/treeio/treeio/treeio/projects/south_migrations/0002_updaterecords.py
@@ -0,0 +1,236 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import DataMigration
+from django.db import models
+
+
+class Migration(DataMigration):
+
+    def forwards(self, orm):
+        "Migrate the UpdateRecords"
+        for record in orm['projects.TaskRecord'].objects.all():
+            update = orm['core.UpdateRecord'].objects.create()
+            update.author = record.creator
+            if record.record_type == 'manual':
+                update.record_type = 'manual'
+            else:
+                update.record_type = 'update'
+            update.body = record.details
+            update.date_created = record.date_created
+            update.save()
+            try:
+                update.about.add(record.task)
+            except:
+                pass
+
+    def backwards(self, orm):
+        raise RuntimeError("Cannot reverse this migration.")
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'core.accessentity': {
+            'Meta': {'object_name': 'AccessEntity'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        },
+        'core.comment': {
+            'Meta': {'object_name': 'Comment'},
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'}),
+            'body': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"})
+        },
+        'core.group': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Group'},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['core.Group']"})
+        },
+        'core.object': {
+            'Meta': {'object_name': 'Object'},
+            'comments': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.Comment']"}),
+            'creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'objects_created'", 'null': 'True', 'to': "orm['core.User']"}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'full_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_full_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'links': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'links_rel_+'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'nuvius_resource': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'object_name': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'object_type': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'read_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_read_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'subscribers': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'subscriptions'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Tag']", 'null': 'True', 'blank': 'True'}),
+            'trash': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+        },
+        'core.tag': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Tag'},
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'})
+        },
+        'core.updaterecord': {
+            'Meta': {'ordering': "['-date_created']", 'object_name': 'UpdateRecord'},
+            'about': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'updates'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.Object']"}),
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'sent_updates'", 'null': 'True', 'to': "orm['core.User']"}),
+            'body': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
+            'comments': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_on_updates'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.Comment']"}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'updates_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'format_message': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'format_strings': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'updates_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'recipients': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'received_updates'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'record_type': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
+            'score': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'sender': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'sent_updates'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'url': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'})
+        },
+        'core.user': {
+            'Meta': {'ordering': "['name']", 'object_name': 'User'},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'default_group': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'default_user_set'", 'null': 'True', 'to': "orm['core.AccessEntity']"}),
+            'disabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_access': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'other_groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'identities.contact': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Contact', '_ormbases': ['core.Object']},
+            'contact_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.ContactType']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['identities.Contact']"}),
+            'related_group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'related_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.AccessEntity']", 'null': 'True', 'blank': 'True'})
+        },
+        'identities.contactfield': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ContactField', '_ormbases': ['core.Object']},
+            'allowed_values': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'field_type': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'required': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'identities.contacttype': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ContactType', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'fields': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['identities.ContactField']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'slug': ('django.db.models.fields.CharField', [], {'max_length': '256'})
+        },
+        'projects.milestone': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Milestone', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'end_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['projects.Project']"}),
+            'start_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'status': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['projects.TaskStatus']"})
+        },
+        'projects.project': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Project', '_ormbases': ['core.Object']},
+            'client': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'client'", 'null': 'True', 'to': "orm['identities.Contact']"}),
+            'details': ('django.db.models.fields.TextField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'manager': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'manager'", 'null': 'True', 'to': "orm['identities.Contact']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['projects.Project']"})
+        },
+        'projects.task': {
+            'Meta': {'ordering': "('-priority', 'name')", 'object_name': 'Task', '_ormbases': ['core.Object']},
+            'assigned': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.User']", 'null': 'True', 'blank': 'True'}),
+            'caller': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.Contact']", 'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'end_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'estimated_time': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'milestone': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['projects.Milestone']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['projects.Task']"}),
+            'priority': ('django.db.models.fields.IntegerField', [], {'default': '3'}),
+            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['projects.Project']"}),
+            'start_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'status': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['projects.TaskStatus']"})
+        },
+        'projects.taskrecord': {
+            'Meta': {'object_name': 'TaskRecord', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'record_type': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'task': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['projects.Task']"})
+        },
+        'projects.taskstatus': {
+            'Meta': {'ordering': "('hidden', '-active', 'name')", 'object_name': 'TaskStatus', '_ormbases': ['core.Object']},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'details': ('django.db.models.fields.TextField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'hidden': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'projects.tasktimeslot': {
+            'Meta': {'ordering': "['-date_created']", 'object_name': 'TaskTimeSlot', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'task': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['projects.Task']"}),
+            'time_from': ('django.db.models.fields.DateTimeField', [], {}),
+            'time_to': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'timezone': ('django.db.models.fields.IntegerField', [], {'default': '0'})
+        }
+    }
+
+    complete_apps = ['projects']
diff --git a/data/treeio/treeio/treeio/projects/south_migrations/0003_auto__add_field_tasktimeslot_user.py b/data/treeio/treeio/treeio/projects/south_migrations/0003_auto__add_field_tasktimeslot_user.py
new file mode 100644
index 0000000..1296752
--- /dev/null
+++ b/data/treeio/treeio/treeio/projects/south_migrations/0003_auto__add_field_tasktimeslot_user.py
@@ -0,0 +1,210 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Adding field 'TaskTimeSlot.user'
+        db.add_column('projects_tasktimeslot', 'user', self.gf(
+            'django.db.models.fields.related.ForeignKey')(default=1, to=orm['core.User']), keep_default=False)
+
+    def backwards(self, orm):
+
+        # Deleting field 'TaskTimeSlot.user'
+        db.delete_column('projects_tasktimeslot', 'user_id')
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'core.accessentity': {
+            'Meta': {'object_name': 'AccessEntity'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        },
+        'core.comment': {
+            'Meta': {'object_name': 'Comment'},
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'}),
+            'body': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"})
+        },
+        'core.group': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Group'},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['core.Group']"})
+        },
+        'core.object': {
+            'Meta': {'object_name': 'Object'},
+            'comments': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.Comment']"}),
+            'creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'objects_created'", 'null': 'True', 'to': "orm['core.User']"}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'full_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_full_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'links': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'links_rel_+'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'nuvius_resource': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'object_name': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'object_type': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'read_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_read_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'subscribers': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'subscriptions'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Tag']", 'null': 'True', 'blank': 'True'}),
+            'trash': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'core.tag': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Tag'},
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'})
+        },
+        'core.user': {
+            'Meta': {'ordering': "['name']", 'object_name': 'User'},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'default_group': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'default_user_set'", 'null': 'True', 'to': "orm['core.AccessEntity']"}),
+            'disabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_access': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'other_groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'identities.contact': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Contact', '_ormbases': ['core.Object']},
+            'contact_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.ContactType']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['identities.Contact']"}),
+            'related_group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'related_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.AccessEntity']", 'null': 'True', 'blank': 'True'})
+        },
+        'identities.contactfield': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ContactField', '_ormbases': ['core.Object']},
+            'allowed_values': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'field_type': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'required': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'identities.contacttype': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ContactType', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'fields': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['identities.ContactField']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'slug': ('django.db.models.fields.CharField', [], {'max_length': '256'})
+        },
+        'projects.milestone': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Milestone', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'end_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['projects.Project']"}),
+            'start_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'status': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['projects.TaskStatus']"})
+        },
+        'projects.project': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Project', '_ormbases': ['core.Object']},
+            'client': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'client'", 'null': 'True', 'to': "orm['identities.Contact']"}),
+            'details': ('django.db.models.fields.TextField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'manager': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'manager'", 'null': 'True', 'to': "orm['identities.Contact']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['projects.Project']"})
+        },
+        'projects.task': {
+            'Meta': {'ordering': "('-priority', 'name')", 'object_name': 'Task', '_ormbases': ['core.Object']},
+            'assigned': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.User']", 'null': 'True', 'blank': 'True'}),
+            'caller': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.Contact']", 'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'end_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'estimated_time': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'milestone': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['projects.Milestone']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['projects.Task']"}),
+            'priority': ('django.db.models.fields.IntegerField', [], {'default': '3'}),
+            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['projects.Project']"}),
+            'start_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'status': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['projects.TaskStatus']"})
+        },
+        'projects.taskrecord': {
+            'Meta': {'object_name': 'TaskRecord', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'record_type': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'task': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['projects.Task']"})
+        },
+        'projects.taskstatus': {
+            'Meta': {'ordering': "('hidden', '-active', 'name')", 'object_name': 'TaskStatus', '_ormbases': ['core.Object']},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'details': ('django.db.models.fields.TextField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'hidden': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'projects.tasktimeslot': {
+            'Meta': {'ordering': "['-date_created']", 'object_name': 'TaskTimeSlot', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'task': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['projects.Task']"}),
+            'time_from': ('django.db.models.fields.DateTimeField', [], {}),
+            'time_to': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'timezone': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']"})
+        }
+    }
+
+    complete_apps = ['projects']
diff --git a/data/treeio/treeio/treeio/projects/south_migrations/0004_timeslots.py b/data/treeio/treeio/treeio/projects/south_migrations/0004_timeslots.py
new file mode 100644
index 0000000..e17bdab
--- /dev/null
+++ b/data/treeio/treeio/treeio/projects/south_migrations/0004_timeslots.py
@@ -0,0 +1,211 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import DataMigration
+from django.db import models
+
+
+class Migration(DataMigration):
+
+    def forwards(self, orm):
+        "Migrate TimeSlots to set .user"
+        for obj in orm['projects.TaskTimeSlot'].objects.all():
+            if obj.object_ptr.creator:
+                obj.user = obj.object_ptr.creator
+            else:
+                obj.user = orm['core.User'].objects.all()[0]
+            obj.save()
+
+    def backwards(self, orm):
+        raise RuntimeError("Cannot reverse this migration.")
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'core.accessentity': {
+            'Meta': {'object_name': 'AccessEntity'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        },
+        'core.comment': {
+            'Meta': {'object_name': 'Comment'},
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'}),
+            'body': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"})
+        },
+        'core.group': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Group'},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['core.Group']"})
+        },
+        'core.object': {
+            'Meta': {'object_name': 'Object'},
+            'comments': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.Comment']"}),
+            'creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'objects_created'", 'null': 'True', 'to': "orm['core.User']"}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'full_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_full_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'links': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'links_rel_+'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'nuvius_resource': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'object_name': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'object_type': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'read_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_read_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'subscribers': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'subscriptions'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Tag']", 'null': 'True', 'blank': 'True'}),
+            'trash': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'core.tag': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Tag'},
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'})
+        },
+        'core.user': {
+            'Meta': {'ordering': "['name']", 'object_name': 'User'},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'default_group': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'default_user_set'", 'null': 'True', 'to': "orm['core.AccessEntity']"}),
+            'disabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_access': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'other_groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'identities.contact': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Contact', '_ormbases': ['core.Object']},
+            'contact_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.ContactType']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['identities.Contact']"}),
+            'related_group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'related_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.AccessEntity']", 'null': 'True', 'blank': 'True'})
+        },
+        'identities.contactfield': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ContactField', '_ormbases': ['core.Object']},
+            'allowed_values': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'field_type': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'required': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'identities.contacttype': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ContactType', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'fields': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['identities.ContactField']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'slug': ('django.db.models.fields.CharField', [], {'max_length': '256'})
+        },
+        'projects.milestone': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Milestone', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'end_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['projects.Project']"}),
+            'start_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'status': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['projects.TaskStatus']"})
+        },
+        'projects.project': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Project', '_ormbases': ['core.Object']},
+            'client': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'client'", 'null': 'True', 'to': "orm['identities.Contact']"}),
+            'details': ('django.db.models.fields.TextField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'manager': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'manager'", 'null': 'True', 'to': "orm['identities.Contact']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['projects.Project']"})
+        },
+        'projects.task': {
+            'Meta': {'ordering': "('-priority', 'name')", 'object_name': 'Task', '_ormbases': ['core.Object']},
+            'assigned': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.User']", 'null': 'True', 'blank': 'True'}),
+            'caller': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.Contact']", 'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'end_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'estimated_time': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'milestone': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['projects.Milestone']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['projects.Task']"}),
+            'priority': ('django.db.models.fields.IntegerField', [], {'default': '3'}),
+            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['projects.Project']"}),
+            'start_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'status': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['projects.TaskStatus']"})
+        },
+        'projects.taskrecord': {
+            'Meta': {'object_name': 'TaskRecord', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'record_type': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'task': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['projects.Task']"})
+        },
+        'projects.taskstatus': {
+            'Meta': {'ordering': "('hidden', '-active', 'name')", 'object_name': 'TaskStatus', '_ormbases': ['core.Object']},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'details': ('django.db.models.fields.TextField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'hidden': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'projects.tasktimeslot': {
+            'Meta': {'ordering': "['-date_created']", 'object_name': 'TaskTimeSlot', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'task': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['projects.Task']"}),
+            'time_from': ('django.db.models.fields.DateTimeField', [], {}),
+            'time_to': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'timezone': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']"})
+        }
+    }
+
+    complete_apps = ['projects']
diff --git a/data/treeio/treeio/treeio/projects/south_migrations/0005_auto__del_taskrecord.py b/data/treeio/treeio/treeio/projects/south_migrations/0005_auto__del_taskrecord.py
new file mode 100644
index 0000000..edc772f
--- /dev/null
+++ b/data/treeio/treeio/treeio/projects/south_migrations/0005_auto__del_taskrecord.py
@@ -0,0 +1,208 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Deleting model 'TaskRecord'
+        db.delete_table('projects_taskrecord')
+
+    def backwards(self, orm):
+
+        # Adding model 'TaskRecord'
+        db.create_table('projects_taskrecord', (
+            ('record_type', self.gf(
+                'django.db.models.fields.CharField')(max_length=256)),
+            ('object_ptr', self.gf('django.db.models.fields.related.OneToOneField')(
+                to=orm['core.Object'], unique=True, primary_key=True)),
+            ('details', self.gf('django.db.models.fields.TextField')()),
+            ('task', self.gf('django.db.models.fields.related.ForeignKey')
+             (to=orm['projects.Task'])),
+        ))
+        db.send_create_signal('projects', ['TaskRecord'])
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'core.accessentity': {
+            'Meta': {'object_name': 'AccessEntity'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        },
+        'core.comment': {
+            'Meta': {'object_name': 'Comment'},
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'}),
+            'body': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"})
+        },
+        'core.group': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Group', '_ormbases': ['core.AccessEntity']},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True', 'primary_key': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['core.Group']"})
+        },
+        'core.object': {
+            'Meta': {'object_name': 'Object'},
+            'comments': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.Comment']"}),
+            'creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'objects_created'", 'null': 'True', 'to': "orm['core.User']"}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'full_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_full_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'links': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'links_rel_+'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'nuvius_resource': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'object_name': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'object_type': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'read_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_read_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'subscribers': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'subscriptions'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Tag']", 'null': 'True', 'blank': 'True'}),
+            'trash': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'core.tag': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Tag'},
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'})
+        },
+        'core.user': {
+            'Meta': {'ordering': "['name']", 'object_name': 'User', '_ormbases': ['core.AccessEntity']},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True', 'primary_key': 'True'}),
+            'default_group': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'default_user_set'", 'null': 'True', 'to': "orm['core.Group']"}),
+            'disabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_access': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'other_groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'identities.contact': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Contact', '_ormbases': ['core.Object']},
+            'contact_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.ContactType']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['identities.Contact']"}),
+            'related_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.AccessEntity']", 'null': 'True', 'blank': 'True'})
+        },
+        'identities.contactfield': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ContactField', '_ormbases': ['core.Object']},
+            'allowed_values': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'field_type': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'required': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'identities.contacttype': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ContactType', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'fields': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['identities.ContactField']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'slug': ('django.db.models.fields.CharField', [], {'max_length': '256'})
+        },
+        'projects.milestone': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Milestone', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'end_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['projects.Project']"}),
+            'start_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'status': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['projects.TaskStatus']"})
+        },
+        'projects.project': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Project', '_ormbases': ['core.Object']},
+            'client': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'client'", 'null': 'True', 'to': "orm['identities.Contact']"}),
+            'details': ('django.db.models.fields.TextField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'manager': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'manager'", 'null': 'True', 'to': "orm['identities.Contact']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['projects.Project']"})
+        },
+        'projects.task': {
+            'Meta': {'ordering': "('-priority', 'name')", 'object_name': 'Task', '_ormbases': ['core.Object']},
+            'assigned': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.User']", 'null': 'True', 'blank': 'True'}),
+            'caller': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.Contact']", 'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'end_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'estimated_time': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'milestone': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['projects.Milestone']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['projects.Task']"}),
+            'priority': ('django.db.models.fields.IntegerField', [], {'default': '3'}),
+            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['projects.Project']"}),
+            'start_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'status': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['projects.TaskStatus']"})
+        },
+        'projects.taskstatus': {
+            'Meta': {'ordering': "('hidden', '-active', 'name')", 'object_name': 'TaskStatus', '_ormbases': ['core.Object']},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'details': ('django.db.models.fields.TextField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'hidden': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'projects.tasktimeslot': {
+            'Meta': {'ordering': "['-date_created']", 'object_name': 'TaskTimeSlot', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'task': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['projects.Task']"}),
+            'time_from': ('django.db.models.fields.DateTimeField', [], {}),
+            'time_to': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'timezone': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']"})
+        }
+    }
+
+    complete_apps = ['projects']
diff --git a/data/treeio/treeio/treeio/projects/south_migrations/0006_auto__add_field_task_depends.py b/data/treeio/treeio/treeio/projects/south_migrations/0006_auto__add_field_task_depends.py
new file mode 100644
index 0000000..b58068a
--- /dev/null
+++ b/data/treeio/treeio/treeio/projects/south_migrations/0006_auto__add_field_task_depends.py
@@ -0,0 +1,196 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Adding field 'Task.depends'
+        db.add_column('projects_task', 'depends', self.gf('django.db.models.fields.related.ForeignKey')(
+            to=orm['projects.Task'], null=True, blank=True), keep_default=False)
+
+    def backwards(self, orm):
+
+        # Deleting field 'Task.depends'
+        db.delete_column('projects_task', 'depends_id')
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'core.accessentity': {
+            'Meta': {'object_name': 'AccessEntity'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        },
+        'core.comment': {
+            'Meta': {'object_name': 'Comment'},
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'}),
+            'body': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"})
+        },
+        'core.group': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Group', '_ormbases': ['core.AccessEntity']},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True', 'primary_key': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['core.Group']"})
+        },
+        'core.object': {
+            'Meta': {'object_name': 'Object'},
+            'comments': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.Comment']"}),
+            'creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'objects_created'", 'null': 'True', 'to': "orm['core.User']"}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'full_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_full_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'links': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'links_rel_+'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'nuvius_resource': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'object_name': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'object_type': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'read_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_read_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'subscribers': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'subscriptions'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Tag']", 'null': 'True', 'blank': 'True'}),
+            'trash': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'core.tag': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Tag'},
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'})
+        },
+        'core.user': {
+            'Meta': {'ordering': "['name']", 'object_name': 'User', '_ormbases': ['core.AccessEntity']},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True', 'primary_key': 'True'}),
+            'default_group': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'default_user_set'", 'null': 'True', 'to': "orm['core.Group']"}),
+            'disabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_access': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'other_groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'identities.contact': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Contact', '_ormbases': ['core.Object']},
+            'contact_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.ContactType']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['identities.Contact']"}),
+            'related_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.AccessEntity']", 'null': 'True', 'blank': 'True'})
+        },
+        'identities.contactfield': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ContactField', '_ormbases': ['core.Object']},
+            'allowed_values': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'field_type': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'required': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'identities.contacttype': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ContactType', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'fields': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['identities.ContactField']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'slug': ('django.db.models.fields.CharField', [], {'max_length': '256'})
+        },
+        'projects.milestone': {
+            'Meta': {'ordering': "['start_date', 'name']", 'object_name': 'Milestone', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'end_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['projects.Project']"}),
+            'start_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'status': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['projects.TaskStatus']"})
+        },
+        'projects.project': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Project', '_ormbases': ['core.Object']},
+            'client': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'client'", 'null': 'True', 'to': "orm['identities.Contact']"}),
+            'details': ('django.db.models.fields.TextField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'manager': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'manager'", 'null': 'True', 'to': "orm['identities.Contact']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['projects.Project']"})
+        },
+        'projects.task': {
+            'Meta': {'ordering': "('-priority', 'name')", 'object_name': 'Task', '_ormbases': ['core.Object']},
+            'assigned': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.User']", 'null': 'True', 'blank': 'True'}),
+            'caller': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.Contact']", 'null': 'True', 'blank': 'True'}),
+            'depends': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['projects.Task']", 'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'end_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'estimated_time': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'milestone': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['projects.Milestone']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['projects.Task']"}),
+            'priority': ('django.db.models.fields.IntegerField', [], {'default': '3'}),
+            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['projects.Project']"}),
+            'start_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'status': ('django.db.models.fields.related.ForeignKey', [], {'default': '26', 'to': "orm['projects.TaskStatus']"})
+        },
+        'projects.taskstatus': {
+            'Meta': {'ordering': "('hidden', '-active', 'name')", 'object_name': 'TaskStatus', '_ormbases': ['core.Object']},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'details': ('django.db.models.fields.TextField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'hidden': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'projects.tasktimeslot': {
+            'Meta': {'ordering': "['-date_created']", 'object_name': 'TaskTimeSlot', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'task': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['projects.Task']"}),
+            'time_from': ('django.db.models.fields.DateTimeField', [], {}),
+            'time_to': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'timezone': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']"})
+        }
+    }
+
+    complete_apps = ['projects']
diff --git a/data/treeio/treeio/treeio/projects/views.py b/data/treeio/treeio/treeio/projects/views.py
new file mode 100644
index 0000000..0b2cec0
--- /dev/null
+++ b/data/treeio/treeio/treeio/projects/views.py
@@ -0,0 +1,1301 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+"""
+Project Management module views
+"""
+
+from django.shortcuts import get_object_or_404
+from django.template import RequestContext
+from django.http import HttpResponseRedirect, Http404
+from django.core.urlresolvers import reverse
+from django.db.models import Q
+from treeio.core.models import Object, ModuleSetting, UpdateRecord
+from treeio.core.views import user_denied
+from treeio.core.rendering import render_to_response
+from treeio.core.decorators import treeio_login_required, handle_response_format
+from treeio.projects.models import Project, Milestone, Task, TaskStatus, TaskTimeSlot
+from treeio.projects.forms import ProjectForm, MilestoneForm, TaskForm, FilterForm, TaskRecordForm, \
+    MassActionForm, TaskTimeSlotForm, TaskStatusForm, SettingsForm
+from django.utils.translation import ugettext as _
+from datetime import datetime
+import json
+
+
+def _get_filter_query(args):
+    "Creates a query to filter Tasks based on FilterForm arguments"
+    query = Q()
+
+    for arg in args:
+        if hasattr(Task, arg) and args[arg]:
+            kwargs = {str(arg + '__id'): long(args[arg])}
+            query = query & Q(**kwargs)
+
+    return query
+
+
+def _get_default_context(request):
+    "Returns default context as a dict()"
+
+    projects = Object.filter_by_request(request, Project.objects)
+    statuses = Object.filter_by_request(request, TaskStatus.objects)
+    massform = MassActionForm(request.user.profile)
+
+    context = {'projects': projects,
+               'statuses': statuses,
+               'massform': massform}
+
+    return context
+
+
+def _process_mass_form(f):
+    "Pre-process request to handle mass action form for Tasks and Milestones"
+
+    def wrap(request, *args, **kwargs):
+        "Wrap"
+        if 'massform' in request.POST:
+            for key in request.POST:
+                if 'mass-milestone' in key:
+                    try:
+                        milestone = Milestone.objects.get(pk=request.POST[key])
+                        form = MassActionForm(
+                            request.user.profile, request.POST, instance=milestone)
+                        if form.is_valid() and request.user.profile.has_permission(milestone, mode='w'):
+                            form.save()
+                    except Exception:
+                        pass
+            for key in request.POST:
+                if 'mass-task' in key:
+                    try:
+                        task = Task.objects.get(pk=request.POST[key])
+                        form = MassActionForm(
+                            request.user.profile, request.POST, instance=task)
+                        if form.is_valid() and request.user.profile.has_permission(task, mode='w'):
+                            form.save()
+                    except Exception:
+                        pass
+
+        return f(request, *args, **kwargs)
+
+    wrap.__doc__ = f.__doc__
+    wrap.__name__ = f.__name__
+
+    return wrap
+
+
+@handle_response_format
+@treeio_login_required
+@_process_mass_form
+def index(request, response_format='html'):
+    """Project Management index page"""
+
+    query = Q(parent__isnull=True)
+    if request.GET:
+        if 'status' in request.GET and request.GET['status']:
+            query = query & _get_filter_query(request.GET)
+        else:
+            query = query & Q(status__hidden=False) & _get_filter_query(request.GET)
+    else:
+        query = query & Q(status__hidden=False)
+
+    tasks = Object.filter_by_request(request, Task.objects.filter(query))
+    milestones = Object.filter_by_request(
+        request, Milestone.objects.filter(status__hidden=False))
+    filters = FilterForm(request.user.profile, '', request.GET)
+
+    context = _get_default_context(request)
+    context.update({'milestones': milestones,
+                    'tasks': tasks,
+                    'filters': filters})
+
+    return render_to_response('projects/index', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+@_process_mass_form
+def index_owned(request, response_format='html'):
+    """Tasks owned by current user"""
+
+    query = Q(
+        parent__isnull=True, caller__related_user=request.user.profile)
+    if request.GET:
+        if 'status' in request.GET and request.GET['status']:
+            query = query & _get_filter_query(request.GET)
+        else:
+            query = query & Q(
+                status__hidden=False) & _get_filter_query(request.GET)
+    else:
+        query = query & Q(status__hidden=False)
+
+    tasks = Object.filter_by_request(request, Task.objects.filter(query))
+    milestones = Object.filter_by_request(
+        request, Milestone.objects.filter(status__hidden=False))
+    filters = FilterForm(request.user.profile, 'status', request.GET)
+
+    context = _get_default_context(request)
+    context.update({'milestones': milestones,
+                    'tasks': tasks,
+                    'filters': filters})
+
+    return render_to_response('projects/index_owned', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+@_process_mass_form
+def index_assigned(request, response_format='html'):
+    """Tasks assigned to current user"""
+
+    query = Q(parent__isnull=True, assigned=request.user.profile)
+    if request.GET:
+        if 'status' in request.GET and request.GET['status']:
+            query = query & _get_filter_query(request.GET)
+        else:
+            query = query & Q(
+                status__hidden=False) & _get_filter_query(request.GET)
+    else:
+        query = query & Q(status__hidden=False)
+
+    tasks = Object.filter_by_request(request, Task.objects.filter(query))
+
+    milestones = Object.filter_by_request(
+        request, Milestone.objects.filter(status__hidden=False))
+    filters = FilterForm(request.user.profile, 'assigned', request.GET)
+
+    context = _get_default_context(request)
+    context.update({'milestones': milestones,
+                    'tasks': tasks,
+                    'filters': filters})
+
+    return render_to_response('projects/index_assigned', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+@_process_mass_form
+def index_by_status(request, status_id, response_format='html'):
+    """Sort tasks by status"""
+
+    status = get_object_or_404(TaskStatus, pk=status_id)
+
+    if not request.user.profile.has_permission(status):
+        return user_denied(request, message="You don't have access to this Task Status")
+
+    query = Q(parent__isnull=True, status=status)
+    if request.GET:
+        query = query & _get_filter_query(request.GET)
+    tasks = Object.filter_by_request(request, Task.objects.filter(query))
+
+    milestones = Object.filter_by_request(
+        request, Milestone.objects.filter(task__status=status).distinct())
+    filters = FilterForm(request.user.profile, 'status', request.GET)
+
+    context = _get_default_context(request)
+    context.update({'milestones': milestones,
+                    'tasks': tasks,
+                    'status': status,
+                    'filters': filters})
+
+    return render_to_response('projects/index_by_status', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+@_process_mass_form
+def index_in_progress(request, response_format='html'):
+    """A page with a list of tasks in progress"""
+
+    query = Q(parent__isnull=True)
+    if request.GET:
+        query = query & Q(
+            status__hidden=False) & _get_filter_query(request.GET)
+    else:
+        query = query & Q(status__hidden=False)
+
+    tasks = Object.filter_by_request(request, Task.objects.filter(query))
+
+    milestones = Object.filter_by_request(
+        request, Milestone.objects.filter(status__hidden=False))
+    filters = FilterForm(request.user.profile, 'status', request.GET)
+    time_slots = Object.filter_by_request(
+        request, TaskTimeSlot.objects.filter(time_from__isnull=False, time_to__isnull=True))
+
+    context = _get_default_context(request)
+    context.update({'milestones': milestones,
+                    'tasks': tasks,
+                    'filters': filters,
+                    'time_slots': time_slots})
+
+    return render_to_response('projects/index_in_progress', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+#
+# Projects
+#
+@handle_response_format
+@treeio_login_required
+def project_add(request, response_format='html'):
+    """New project form"""
+
+    if request.POST:
+        if 'cancel' not in request.POST:
+            project = Project()
+            form = ProjectForm(
+                request.user.profile, None, request.POST, instance=project)
+            if form.is_valid():
+                project = form.save()
+                project.set_user_from_request(request)
+                return HttpResponseRedirect(reverse('projects_project_view', args=[project.id]))
+        else:
+            return HttpResponseRedirect(reverse('projects'))
+    else:
+        form = ProjectForm(request.user.profile, None)
+
+    context = _get_default_context(request)
+    context.update({'form': form})
+
+    return render_to_response('projects/project_add', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def project_add_typed(request, project_id, response_format='html'):
+    """Project add to preselected parent project"""
+
+    parent_project = None
+    if project_id:
+        parent_project = get_object_or_404(Project, pk=project_id)
+        if not request.user.profile.has_permission(parent_project, mode='x'):
+            parent_project = None
+
+    if request.POST:
+        if 'cancel' not in request.POST:
+            project = Project()
+            form = ProjectForm(
+                request.user.profile, project_id, request.POST, instance=project)
+            if form.is_valid():
+                project = form.save()
+                project.set_user_from_request(request)
+                return HttpResponseRedirect(reverse('projects_project_view', args=[project.id]))
+        else:
+            return HttpResponseRedirect(reverse('projects'))
+    else:
+        form = ProjectForm(request.user.profile, project_id)
+
+    context = _get_default_context(request)
+    context.update({'form': form, 'project': parent_project})
+
+    return render_to_response('projects/project_add_typed', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+@_process_mass_form
+def project_view(request, project_id, response_format='html'):
+    """Single project view page"""
+
+    project = get_object_or_404(Project, pk=project_id)
+    if not request.user.profile.has_permission(project):
+        return user_denied(request, message="You don't have access to this Project")
+
+    query = Q(parent__isnull=True, project=project)
+    if request.GET:
+        if 'status' in request.GET and request.GET['status']:
+            query = query & _get_filter_query(request.GET)
+        else:
+            query = query & Q(
+                status__hidden=False) & _get_filter_query(request.GET)
+    else:
+        query = query & Q(status__hidden=False)
+
+    if request.user.profile.has_permission(project, mode='r'):
+        if request.POST:
+            record = UpdateRecord()
+            record.record_type = 'manual'
+            form = TaskRecordForm(
+                request.user.profile, request.POST, instance=record)
+            if form.is_valid():
+                record = form.save()
+                record.set_user_from_request(request)
+                record.save()
+                record.about.add(project)
+                project.set_last_updated()
+                return HttpResponseRedirect(reverse('projects_project_view', args=[project.id]))
+        else:
+            form = TaskRecordForm(request.user.profile)
+    else:
+        form = None
+
+    tasks = Object.filter_by_request(request, Task.objects.filter(query))
+
+    tasks_progress = float(0)
+    tasks_progress_query = Object.filter_by_request(
+        request, Task.objects.filter(Q(parent__isnull=True, project=project)))
+    if tasks_progress_query:
+        for task in tasks_progress_query:
+            if not task.status.active:
+                tasks_progress += 1
+        tasks_progress = (tasks_progress / len(tasks_progress_query)) * 100
+        tasks_progress = round(tasks_progress, ndigits=1)
+
+    filters = FilterForm(request.user.profile, 'project', request.GET)
+
+    milestones = Object.filter_by_request(request,
+                                          Milestone.objects.filter(project=project).filter(status__hidden=False))
+    subprojects = Project.objects.filter(parent=project)
+
+    context = _get_default_context(request)
+    context.update({'project': project,
+                    'milestones': milestones,
+                    'tasks': tasks,
+                    'tasks_progress': tasks_progress,
+                    'record_form': form,
+                    'subprojects': subprojects,
+                    'filters': filters})
+
+    return render_to_response('projects/project_view', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def project_edit(request, project_id, response_format='html'):
+    """Project edit page"""
+
+    project = get_object_or_404(Project, pk=project_id)
+    if not request.user.profile.has_permission(project, mode='w'):
+        return user_denied(request, message="You don't have access to this Project")
+
+    if request.POST:
+        if 'cancel' not in request.POST:
+            form = ProjectForm(
+                request.user.profile, None, request.POST, instance=project)
+            if form.is_valid():
+                project = form.save()
+                return HttpResponseRedirect(reverse('projects_project_view', args=[project.id]))
+        else:
+            return HttpResponseRedirect(reverse('projects_project_view', args=[project.id]))
+    else:
+        form = ProjectForm(request.user.profile, None, instance=project)
+
+    context = _get_default_context(request)
+    context.update({'form': form, 'project': project})
+
+    return render_to_response('projects/project_edit', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def project_delete(request, project_id, response_format='html'):
+    """Project delete"""
+
+    project = get_object_or_404(Project, pk=project_id)
+    if not request.user.profile.has_permission(project, mode='w'):
+        return user_denied(request, message="You don't have access to this Project")
+
+    if request.POST:
+        if 'delete' in request.POST:
+            if 'trash' in request.POST:
+                project.trash = True
+                project.save()
+            else:
+                project.delete()
+            return HttpResponseRedirect(reverse('projects_index'))
+        elif 'cancel' in request.POST:
+            return HttpResponseRedirect(reverse('projects_project_view', args=[project.id]))
+
+    context = _get_default_context(request)
+    context.update({'project': project})
+
+    return render_to_response('projects/project_delete', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+#
+# Milestones
+#
+
+@handle_response_format
+@treeio_login_required
+def milestone_add(request, response_format='html'):
+    """New milestone form"""
+
+    if request.POST:
+        if 'cancel' not in request.POST:
+            milestone = Milestone()
+            form = MilestoneForm(
+                request.user.profile, None, request.POST, instance=milestone)
+            if form.is_valid():
+                milestone = form.save()
+                milestone.set_user_from_request(request)
+                return HttpResponseRedirect(reverse('projects_milestone_view', args=[milestone.id]))
+        else:
+            return HttpResponseRedirect(reverse('projects'))
+    else:
+        form = MilestoneForm(request.user.profile, None)
+
+    context = _get_default_context(request)
+    context.update({'form': form})
+
+    return render_to_response('projects/milestone_add', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def milestone_add_typed(request, project_id=None, response_format='html'):
+    """Milestone add to preselected project"""
+
+    project = None
+    if project_id:
+        project = get_object_or_404(Project, pk=project_id)
+        if not request.user.profile.has_permission(project, mode='x'):
+            project = None
+
+    if request.POST:
+        if 'cancel' not in request.POST:
+            milestone = Milestone()
+            form = MilestoneForm(
+                request.user.profile, project_id, request.POST, instance=milestone)
+            if form.is_valid():
+                milestone = form.save()
+                milestone.set_user_from_request(request)
+                return HttpResponseRedirect(reverse('projects_milestone_view', args=[milestone.id]))
+        else:
+            return HttpResponseRedirect(reverse('projects'))
+    else:
+        form = MilestoneForm(request.user.profile, project_id)
+
+    context = _get_default_context(request)
+    context.update({'form': form, 'project': project})
+
+    return render_to_response('projects/milestone_add_typed', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+@_process_mass_form
+def milestone_view(request, milestone_id, response_format='html'):
+    """Single milestone view page"""
+
+    milestone = get_object_or_404(Milestone, pk=milestone_id)
+    project = milestone.project
+    if not request.user.profile.has_permission(milestone):
+        return user_denied(request, message="You don't have access to this Milestone")
+
+    query = Q(milestone=milestone, parent__isnull=True)
+    if request.GET:
+        if 'status' in request.GET and request.GET['status']:
+            query = query & _get_filter_query(request.GET)
+        else:
+            query = query & Q(
+                status__hidden=False) & _get_filter_query(request.GET)
+        tasks = Object.filter_by_request(request, Task.objects.filter(query))
+    else:
+        tasks = Object.filter_by_request(request,
+                                         Task.objects.filter(query & Q(status__hidden=False)))
+
+    filters = FilterForm(request.user.profile, 'milestone', request.GET)
+
+    tasks_progress = float(0)
+    tasks_progress_query = Object.filter_by_request(
+        request, Task.objects.filter(Q(parent__isnull=True, milestone=milestone)))
+    if tasks_progress_query:
+        for task in tasks_progress_query:
+            if not task.status.active:
+                tasks_progress += 1
+        tasks_progress = (tasks_progress / len(tasks_progress_query)) * 100
+        tasks_progress = round(tasks_progress, ndigits=1)
+
+    context = _get_default_context(request)
+    context.update({'milestone': milestone,
+                    'tasks': tasks,
+                    'tasks_progress': tasks_progress,
+                    'filters': filters,
+                    'project': project})
+
+    return render_to_response('projects/milestone_view', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def milestone_edit(request, milestone_id, response_format='html'):
+    """Milestone edit page"""
+
+    milestone = get_object_or_404(Milestone, pk=milestone_id)
+    project = milestone.project
+    if not request.user.profile.has_permission(milestone, mode='w'):
+        return user_denied(request, message="You don't have access to this Milestone")
+
+    if request.POST:
+        if 'cancel' not in request.POST:
+            form = MilestoneForm(
+                request.user.profile, None, request.POST, instance=milestone)
+            if form.is_valid():
+                milestone = form.save()
+                return HttpResponseRedirect(reverse('projects_milestone_view', args=[milestone.id]))
+        else:
+            return HttpResponseRedirect(reverse('projects_milestone_view', args=[milestone.id]))
+    else:
+        form = MilestoneForm(
+            request.user.profile, None, instance=milestone)
+
+    context = _get_default_context(request)
+    context.update({'form': form,
+                    'milestone': milestone,
+                    'project': project})
+
+    return render_to_response('projects/milestone_edit', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def milestone_delete(request, milestone_id, response_format='html'):
+    """Milestone delete"""
+
+    milestone = get_object_or_404(Milestone, pk=milestone_id)
+    project = milestone.project
+    if not request.user.profile.has_permission(milestone, mode='w'):
+        return user_denied(request, message="You don't have access to this Milestone")
+
+    query = Q(milestone=milestone, parent__isnull=True)
+    if request.GET:
+        query = query & _get_filter_query(request.GET)
+    tasks = Object.filter_by_request(request, Task.objects.filter(query))
+
+    if request.POST:
+        if 'delete' in request.POST:
+            if 'trash' in request.POST:
+                milestone.trash = True
+                milestone.save()
+            else:
+                milestone.delete()
+            return HttpResponseRedirect(reverse('projects_index'))
+        elif 'cancel' in request.POST:
+            return HttpResponseRedirect(reverse('projects_milestone_view', args=[milestone.id]))
+
+    context = _get_default_context(request)
+    context.update({'milestone': milestone,
+                    'tasks': tasks,
+                    'project': project})
+
+    return render_to_response('projects/milestone_delete', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def milestone_set_status(request, milestone_id, status_id, response_format='html'):
+    """Milestone quick set: Status"""
+
+    milestone = get_object_or_404(Milestone, pk=milestone_id)
+    if not request.user.profile.has_permission(milestone, mode='x'):
+        return user_denied(request, message="You don't have access to this Milestone")
+
+    status = get_object_or_404(TaskStatus, pk=status_id)
+    if not request.user.profile.has_permission(status):
+        return user_denied(request, message="You don't have access to this Milestone Status")
+
+    if not milestone.status == status:
+        milestone.status = status
+        milestone.save()
+
+    return milestone_view(request, milestone_id, response_format)
+
+#
+# Tasks
+#
+
+
+@handle_response_format
+@treeio_login_required
+def task_add(request, response_format='html'):
+    """New task form"""
+
+    if request.POST:
+        if 'cancel' not in request.POST:
+            task = Task()
+            form = TaskForm(
+                request.user.profile, None, None, None, request.POST, instance=task)
+            if form.is_valid():
+                task = form.save()
+                task.set_user_from_request(request)
+                return HttpResponseRedirect(reverse('projects_task_view', args=[task.id]))
+        else:
+            return HttpResponseRedirect(reverse('projects'))
+    else:
+        form = TaskForm(request.user.profile, None, None, None)
+
+    context = _get_default_context(request)
+    context.update({'form': form})
+
+    return render_to_response('projects/task_add', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def task_add_typed(request, project_id=None, response_format='html'):
+    """Task add to preselected project"""
+
+    project = None
+    if project_id:
+        project = get_object_or_404(Project, pk=project_id)
+        if not request.user.profile.has_permission(project, mode='x'):
+            project = None
+
+    if request.POST:
+        if 'cancel' not in request.POST:
+            task = Task()
+            form = TaskForm(
+                request.user.profile, None, project_id, None, request.POST, instance=task)
+            if form.is_valid():
+                task = form.save()
+                task.set_user_from_request(request)
+                return HttpResponseRedirect(reverse('projects_task_view', args=[task.id]))
+        else:
+            return HttpResponseRedirect(reverse('projects_project_view', args=[project.id]))
+    else:
+        form = TaskForm(request.user.profile, None, project_id, None)
+
+    context = _get_default_context(request)
+    context.update({'form': form,
+                    'project': project})
+
+    return render_to_response('projects/task_add_typed', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def task_add_to_milestone(request, milestone_id=None, response_format='html'):
+    """Task add to preselected project"""
+
+    milestone = None
+    if milestone_id:
+        milestone = get_object_or_404(Milestone, pk=milestone_id)
+        if not request.user.profile.has_permission(milestone, mode='x'):
+            milestone = None
+
+    project = milestone.project
+    project_id = milestone.project.id
+
+    if request.POST:
+        if 'cancel' not in request.POST:
+            task = Task()
+            form = TaskForm(request.user.profile, None,
+                            project_id, milestone_id, request.POST, instance=task)
+            if form.is_valid():
+                task = form.save()
+                task.set_user_from_request(request)
+                return HttpResponseRedirect(reverse('projects_task_view', args=[task.id]))
+        else:
+            return HttpResponseRedirect(reverse('projects_milestone_view', args=[milestone.id]))
+    else:
+        form = TaskForm(
+            request.user.profile, None, project_id, milestone_id)
+
+    context = _get_default_context(request)
+    context.update({'form': form,
+                    'project': project,
+                    'milestone': milestone})
+
+    return render_to_response('projects/task_add_to_milestone', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def task_add_subtask(request, task_id=None, response_format='html'):
+    """New subtask form"""
+
+    parent = None
+    if task_id:
+        parent = get_object_or_404(Task, pk=task_id)
+        if not request.user.profile.has_permission(parent, mode='x'):
+            parent = None
+
+    if request.POST:
+        if 'cancel' not in request.POST:
+            task = Task()
+            form = TaskForm(
+                request.user.profile, parent, None, None, request.POST, instance=task)
+            if form.is_valid():
+                task = form.save()
+                task.set_user_from_request(request)
+                return HttpResponseRedirect(reverse('projects_task_view', args=[parent.id]))
+        else:
+            return HttpResponseRedirect(reverse('projects_task_view', args=[parent.id]))
+    else:
+        form = TaskForm(request.user.profile, parent, None, None)
+
+    context = _get_default_context(request)
+    context.update({'form': form,
+                    'task': parent})
+
+    return render_to_response('projects/task_add_subtask', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+@_process_mass_form
+def task_view(request, task_id, response_format='html'):
+    """Single task view page"""
+
+    task = get_object_or_404(Task, pk=task_id)
+    if not request.user.profile.has_permission(task):
+        return user_denied(request, message="You don't have access to this Task")
+
+    if request.user.profile.has_permission(task, mode='x'):
+        if request.POST:
+            if 'add-work' in request.POST:
+                return HttpResponseRedirect(reverse('projects_task_time_slot_add', args=[task.id]))
+            elif 'start-work' in request.POST:
+                return HttpResponseRedirect(reverse('projects_task_view', args=[task.id]))
+            record = UpdateRecord()
+            record.record_type = 'manual'
+            form = TaskRecordForm(
+                request.user.profile, request.POST, instance=record)
+            if form.is_valid():
+                record = form.save()
+                record.set_user_from_request(request)
+                record.save()
+                record.about.add(task)
+                task.set_last_updated()
+                return HttpResponseRedirect(reverse('projects_task_view', args=[task.id]))
+        else:
+            form = TaskRecordForm(request.user.profile)
+    else:
+        form = None
+
+    subtasks = Object.filter_by_request(
+        request, Task.objects.filter(parent=task))
+    time_slots = Object.filter_by_request(
+        request, TaskTimeSlot.objects.filter(task=task))
+
+    context = _get_default_context(request)
+    context.update({'task': task,
+                    'subtasks': subtasks,
+                    'record_form': form,
+                    'time_slots': time_slots})
+
+    if 'massform' in context and 'project' in context['massform'].fields:
+        del context['massform'].fields['project']
+
+    return render_to_response('projects/task_view', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def task_edit(request, task_id, response_format='html'):
+    """Task edit page"""
+
+    task = get_object_or_404(Task, pk=task_id)
+    if not request.user.profile.has_permission(task, mode='w'):
+        return user_denied(request, message="You don't have access to this Task")
+
+    if request.POST:
+        if 'cancel' not in request.POST:
+            form = TaskForm(
+                request.user.profile, None, None, None, request.POST, instance=task)
+            if form.is_valid():
+                task = form.save()
+                return HttpResponseRedirect(reverse('projects_task_view', args=[task.id]))
+        else:
+            return HttpResponseRedirect(reverse('projects_task_view', args=[task.id]))
+    else:
+        form = TaskForm(
+            request.user.profile, None, None, None, instance=task)
+
+    context = _get_default_context(request)
+    context.update({'form': form,
+                    'task': task})
+
+    return render_to_response('projects/task_edit', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def task_delete(request, task_id, response_format='html'):
+    """Task delete"""
+
+    task = get_object_or_404(Task, pk=task_id)
+    if not request.user.profile.has_permission(task, mode='w'):
+        return user_denied(request, message="You don't have access to this Task")
+
+    if request.POST:
+        if 'delete' in request.POST:
+            if 'trash' in request.POST:
+                task.trash = True
+                task.save()
+            else:
+                task.delete()
+            return HttpResponseRedirect(reverse('projects_index'))
+        elif 'cancel' in request.POST:
+            return HttpResponseRedirect(reverse('projects_task_view', args=[task.id]))
+
+    subtasks = Object.filter_by_request(
+        request, Task.objects.filter(parent=task))
+    time_slots = Object.filter_by_request(
+        request, TaskTimeSlot.objects.filter(task=task))
+
+    context = _get_default_context(request)
+    context.update({'task': task,
+                    'subtasks': subtasks,
+                    'time_slots': time_slots})
+
+    return render_to_response('projects/task_delete', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def task_set_status(request, task_id, status_id, response_format='html'):
+    """Task quick set: Status"""
+
+    task = get_object_or_404(Task, pk=task_id)
+    if not request.user.profile.has_permission(task, mode='x'):
+        return user_denied(request, message="You don't have access to this Task")
+
+    status = get_object_or_404(TaskStatus, pk=status_id)
+    if not request.user.profile.has_permission(status):
+        return user_denied(request, message="You don't have access to this Task Status")
+
+    if not task.status == status:
+        task.status = status
+        task.save()
+
+    return task_view(request, task_id, response_format)
+
+
+#
+# Task Time Slots
+#
+
+@handle_response_format
+@treeio_login_required
+def task_time_slot_start(request, task_id, response_format='html'):
+    """Start TaskTimeSlot for preselected Task"""
+
+    task = get_object_or_404(Task, pk=task_id)
+    if not request.user.profile.has_permission(task, mode='x'):
+        return user_denied(request, message="You don't have access to this Task")
+
+    if not task.is_being_done_by(request.user.profile):
+        task_time_slot = TaskTimeSlot(
+            task=task, time_from=datetime.now(), user=request.user.profile)
+        task_time_slot.save()
+        task_time_slot.set_user_from_request(request)
+
+    return HttpResponseRedirect(reverse('projects_task_view', args=[task_id]))
+
+
+@handle_response_format
+@treeio_login_required
+def task_time_slot_stop(request, slot_id, response_format='html'):
+    """Stop TaskTimeSlot for preselected Task"""
+
+    slot = get_object_or_404(TaskTimeSlot, pk=slot_id)
+    if not request.user.profile.has_permission(slot, mode='w'):
+        return user_denied(request, message="You don't have access to this TaskTimeSlot")
+
+    if request.POST and 'stop' in request.POST:
+        slot.time_to = datetime.now()
+        slot.details = request.POST['details']
+        slot.save()
+
+    return HttpResponseRedirect(reverse('projects_task_view', args=[slot.task_id]))
+
+
+@handle_response_format
+@treeio_login_required
+def task_time_slot_add(request, task_id, response_format='html'):
+    """Time slot add to preselected task"""
+
+    task = get_object_or_404(Task, pk=task_id)
+    if not request.user.profile.has_permission(task, mode='x'):
+        return user_denied(request, message="You don't have access to this Task")
+
+    if request.POST:
+        task_time_slot = TaskTimeSlot(
+            task=task, time_to=datetime.now(), user=request.user.profile)
+        form = TaskTimeSlotForm(
+            request.user.profile, task_id, request.POST, instance=task_time_slot)
+        if 'cancel' in request.POST:
+            return HttpResponseRedirect(reverse('projects_task_view', args=[task.id]))
+        elif form.is_valid():
+            task_time_slot = form.save()
+            task_time_slot.set_user_from_request(request)
+            return HttpResponseRedirect(reverse('projects_task_view', args=[task.id]))
+    else:
+        form = TaskTimeSlotForm(request.user.profile, task_id)
+
+    subtasks = Object.filter_by_request(
+        request, Task.objects.filter(parent=task))
+    time_slots = Object.filter_by_request(
+        request, TaskTimeSlot.objects.filter(task=task))
+
+    context = _get_default_context(request)
+    context.update({'form': form,
+                    'task': task,
+                    'subtasks': subtasks,
+                    'time_slots': time_slots})
+
+    return render_to_response('projects/task_time_add', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def task_time_slot_view(request, time_slot_id, response_format='html'):
+    """Task time slot view page"""
+
+    task_time_slot = get_object_or_404(TaskTimeSlot, pk=time_slot_id)
+    task = task_time_slot.task
+    if not request.user.profile.has_permission(task_time_slot) \
+            and not request.user.profile.has_permission(task):
+        return user_denied(request, message="You don't have access to this Task Time Slot")
+
+    context = _get_default_context(request)
+    context.update({'task_time_slot': task_time_slot,
+                    'task': task})
+
+    return render_to_response('projects/task_time_view', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def task_time_slot_edit(request, time_slot_id, response_format='html'):
+    """Task time slot edit page"""
+
+    task_time_slot = get_object_or_404(TaskTimeSlot, pk=time_slot_id)
+    task = task_time_slot.task
+
+    if not request.user.profile.has_permission(task_time_slot, mode='w') \
+            and not request.user.profile.has_permission(task, mode='w'):
+        return user_denied(request, message="You don't have access to this Task Time Slot")
+
+    if request.POST:
+        form = TaskTimeSlotForm(
+            request.user.profile, None, request.POST, instance=task_time_slot)
+        if form.is_valid():
+            task_time_slot = form.save()
+            return HttpResponseRedirect(reverse('projects_task_view', args=[task.id]))
+
+        elif 'cancel' in request.POST:
+            return HttpResponseRedirect(reverse('projects_task_view', args=[task.id]))
+    else:
+        form = TaskTimeSlotForm(
+            request.user.profile, None, instance=task_time_slot)
+
+    context = _get_default_context(request)
+    context.update({'form': form,
+                    'task_time_slot': task_time_slot,
+                    'task': task})
+
+    return render_to_response('projects/task_time_edit', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def task_time_slot_delete(request, time_slot_id, response_format='html'):
+    """Task time slot delete"""
+
+    task_time_slot = get_object_or_404(TaskTimeSlot, pk=time_slot_id)
+    task = task_time_slot.task
+
+    if not request.user.profile.has_permission(task_time_slot, mode='w') \
+            and not request.user.profile.has_permission(task, mode='w'):
+        return user_denied(request, message="You don't have access to this Task Time Slot")
+
+    if request.POST:
+        if 'delete' in request.POST:
+            if 'trash' in request.POST:
+                task_time_slot.trash = True
+                task_time_slot.save()
+            else:
+                task_time_slot.delete()
+            return HttpResponseRedirect(reverse('projects_task_view', args=[task.id]))
+        elif 'cancel' in request.POST:
+            return HttpResponseRedirect(reverse('projects_task_view', args=[task.id]))
+
+    context = _get_default_context(request)
+    context.update({'task_time_slot': task_time_slot,
+                    'task': task})
+
+    return render_to_response('projects/task_time_delete', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+#
+# Task Statuses
+#
+
+
+@handle_response_format
+@treeio_login_required
+def task_status_add(request, response_format='html'):
+    """TaskStatus add"""
+
+    if not request.user.profile.is_admin('treeio.projects'):
+        return user_denied(request, message="You don't have administrator access to the Projects module")
+
+    if request.POST:
+        if 'cancel' not in request.POST:
+            status = TaskStatus()
+            form = TaskStatusForm(
+                request.user.profile, request.POST, instance=status)
+            if form.is_valid():
+                status = form.save()
+                status.set_user_from_request(request)
+                return HttpResponseRedirect(reverse('projects_index_by_status', args=[status.id]))
+        else:
+            return HttpResponseRedirect(reverse('projects_settings_view'))
+    else:
+        form = TaskStatusForm(request.user.profile)
+
+    context = _get_default_context(request)
+    context.update({'form': form})
+
+    return render_to_response('projects/status_add', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def task_status_edit(request, status_id, response_format='html'):
+    """TaskStatus edit"""
+
+    status = get_object_or_404(TaskStatus, pk=status_id)
+    if not request.user.profile.has_permission(status, mode='w'):
+        return user_denied(request, message="You don't have access to this Task Status")
+
+    if request.POST:
+        if 'cancel' not in request.POST:
+            form = TaskStatusForm(
+                request.user.profile, request.POST, instance=status)
+            if form.is_valid():
+                status = form.save()
+                return HttpResponseRedirect(reverse('projects_index_by_status', args=[status.id]))
+        else:
+            return HttpResponseRedirect(reverse('projects_index_by_status', args=[status.id]))
+    else:
+        form = TaskStatusForm(request.user.profile, instance=status)
+
+    context = _get_default_context(request)
+    context.update({'form': form,
+                    'status': status})
+
+    return render_to_response('projects/status_edit', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def task_status_delete(request, status_id, response_format='html'):
+    """TaskStatus delete"""
+
+    status = get_object_or_404(TaskStatus, pk=status_id)
+    if not request.user.profile.has_permission(status, mode='w'):
+        return user_denied(request, message="You don't have access to this Task Status")
+
+    if request.POST:
+        if 'delete' in request.POST:
+            if 'trash' in request.POST:
+                status.trash = True
+                status.save()
+            else:
+                status.delete()
+            return HttpResponseRedirect(reverse('projects_index'))
+        elif 'cancel' in request.POST:
+            return HttpResponseRedirect(reverse('projects_index_by_status', args=[status.id]))
+
+    milestones = Object.filter_by_request(request, Milestone.objects)
+
+    context = _get_default_context(request)
+    context.update({'status': status,
+                    'milestones': milestones})
+
+    return render_to_response('projects/status_delete', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+#
+# Settings
+#
+
+@handle_response_format
+@treeio_login_required
+def settings_view(request, response_format='html'):
+    """Settings"""
+
+    if not request.user.profile.is_admin('treeio.projects'):
+        return user_denied(request, message="You don't have administrator access to the Projects module")
+
+    # default task status
+    try:
+        conf = ModuleSetting.get_for_module(
+            'treeio.projects', 'default_task_status')[0]
+        default_task_status = TaskStatus.objects.get(
+            pk=long(conf.value), trash=False)
+    except Exception:
+        default_task_status = None
+
+    statuses = TaskStatus.objects.filter(trash=False)
+    context = _get_default_context(request)
+    context.update({'default_task_status': default_task_status,
+                    'statuses': statuses})
+
+    return render_to_response('projects/settings_view', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def settings_edit(request, response_format='html'):
+    """Settings"""
+
+    if not request.user.profile.is_admin('treeio.projects'):
+        return user_denied(request, message="You don't have administrator access to the Projects module")
+
+    form = None
+    if request.POST:
+        if 'cancel' not in request.POST:
+            form = SettingsForm(request.user.profile, request.POST)
+            if form.is_valid():
+                form.save()
+                return HttpResponseRedirect(reverse('projects_settings_view'))
+        else:
+            return HttpResponseRedirect(reverse('projects_settings_view'))
+    else:
+        form = SettingsForm(request.user.profile)
+
+    context = _get_default_context(request)
+    context.update({'form': form})
+
+    return render_to_response('projects/settings_edit', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+#
+# AJAX lookups
+#
+
+
+@treeio_login_required
+def ajax_task_lookup(request, response_format='html'):
+    """Returns a list of matching tasks"""
+
+    if request.GET and 'term' in request.GET:
+        tasks = Task.objects.filter(name__icontains=request.GET['term'])[:10]
+    else:
+        tasks = []
+
+    return render_to_response('projects/ajax_task_lookup',
+                              {'tasks': tasks},
+                              context_instance=RequestContext(request),
+                              response_format=response_format)
+
+
+#
+# Widgets
+#
+
+@treeio_login_required
+def widget_tasks_assigned_to_me(request, response_format='html'):
+    "A list of tasks assigned to current user"
+
+    query = Q(parent__isnull=True) & Q(status__hidden=False)
+
+    tasks = Object.filter_by_request(request, Task.objects.filter(query))
+
+    return render_to_response('projects/widgets/tasks_assigned_to_me',
+                              {'tasks': tasks},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+#
+# Gantt Chart
+#
+
+
+@treeio_login_required
+def gantt_view(request, project_id, response_format='html'):
+    projects = Project.objects.filter(trash=False)
+    project = projects.filter(pk=project_id)[0]
+    if not project:
+        raise Http404
+    ganttData = []
+
+    # generate json
+    milestones = Milestone.objects.filter(project=project).filter(trash=False)
+    for milestone in milestones:
+        tasks = Task.objects.filter(milestone=milestone).filter(
+            start_date__isnull=False).filter(end_date__isnull=False).filter(trash=False)
+        series = []
+        for task in tasks:
+            tlabel = (
+                task.name[:30] + '..') if len(task.name) > 30 else task.name
+            tn = '<a href="%s" class="popup-link">%s</a>' % (
+                reverse('projects_task_view', args=[task.id]), tlabel)
+            series.append({'id': task.id,
+                           'name': tn,
+                           'label': tlabel,
+                           'start': task.start_date.date().isoformat(),
+                           'end': task.end_date.date().isoformat()})
+        mlabel = (
+            milestone.name[:30] + '..') if len(milestone.name) > 30 else milestone.name
+        mn = '<a href="%s" class="popup-link projects-milestone">%s</a>' % (
+            reverse('projects_milestone_view', args=[milestone.id]), mlabel)
+        a = {'id': milestone.id, 'name': mn, 'label': mlabel}
+        if series:
+            a['series'] = series
+        else:
+            a['series'] = []
+        if milestone.start_date and milestone.end_date:
+            a['start'] = milestone.start_date.date().isoformat()
+            a['end'] = milestone.end_date.date().isoformat()
+            a['color'] = '#E3F3D9'
+        if series or (milestone.start_date and milestone.end_date):
+            ganttData.append(a)
+    unclassified = Task.objects.filter(project=project).filter(milestone__isnull=True).filter(
+        start_date__isnull=False).filter(end_date__isnull=False).filter(trash=False)
+    series = []
+    for task in unclassified:
+        tlabel = (task.name[:30] + '..') if len(task.name) > 30 else task.name
+        tn = '<a href="%s" class="popup-link">%s</a>' % (
+            reverse('projects_task_view', args=[task.id]), tlabel)
+        series.append({'id': task.id,
+                       'name': tn,
+                       'label': tlabel,
+                       'start': task.start_date.date().isoformat(),
+                       'end': task.end_date.date().isoformat()})
+    if series:
+        ganttData.append(
+            {'id': 0, 'name': _('Unclassified Tasks'), 'series': series})
+    if ganttData:
+        jdata = json.dumps(ganttData)
+    else:
+        jdata = None
+
+    return render_to_response('projects/gantt_view',
+                              {'jdata': jdata,
+                               'project': project,
+                               'projects': projects},
+                              context_instance=RequestContext(request), response_format=response_format)
diff --git a/data/treeio/treeio/treeio/reports/south_migrations/0001_initial.py b/data/treeio/treeio/treeio/reports/south_migrations/0001_initial.py
new file mode 100644
index 0000000..6d8f7a4
--- /dev/null
+++ b/data/treeio/treeio/treeio/reports/south_migrations/0001_initial.py
@@ -0,0 +1,144 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Adding model 'Template'
+        db.create_table('reports_template', (
+            ('object_ptr', self.gf('django.db.models.fields.related.OneToOneField')(
+                to=orm['core.Object'], unique=True, primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')
+             (max_length=512)),
+            ('details', self.gf('django.db.models.fields.TextField')
+             (null=True, blank=True)),
+            ('model', self.gf('django.db.models.fields.TextField')
+             (null=True, blank=True)),
+        ))
+        db.send_create_signal('reports', ['Template'])
+
+        # Adding model 'Report'
+        db.create_table('reports_report', (
+            ('object_ptr', self.gf('django.db.models.fields.related.OneToOneField')(
+                to=orm['core.Object'], unique=True, primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')
+             (max_length=512)),
+            ('template', self.gf('django.db.models.fields.related.ForeignKey')
+             (to=orm['reports.Template'], null=True, blank=True)),
+            ('content', self.gf('django.db.models.fields.TextField')
+             (null=True, blank=True)),
+        ))
+        db.send_create_signal('reports', ['Report'])
+
+    def backwards(self, orm):
+
+        # Deleting model 'Template'
+        db.delete_table('reports_template')
+
+        # Deleting model 'Report'
+        db.delete_table('reports_report')
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'core.group': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Group'},
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['core.Group']"})
+        },
+        'core.object': {
+            'Meta': {'object_name': 'Object'},
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'everybody_execute': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'everybody_read': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'everybody_write': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Group']"}),
+            'group_execute': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'group_read': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'group_write': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'links': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'links_rel_+'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'nuvius_resource': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'object_name': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'object_type': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'subscribers': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'subscriptions'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'trash': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']"}),
+            'user_execute': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'user_read': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'user_write': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'core.user': {
+            'Meta': {'ordering': "['name']", 'object_name': 'User'},
+            'default_group': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'default_user_set'", 'null': 'True', 'to': "orm['core.Group']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'other_groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'reports.report': {
+            'Meta': {'ordering': "['-date_created']", 'object_name': 'Report', '_ormbases': ['core.Object']},
+            'content': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'template': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['reports.Template']", 'null': 'True', 'blank': 'True'})
+        },
+        'reports.template': {
+            'Meta': {'ordering': "['-date_created']", 'object_name': 'Template', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'model': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'})
+        }
+    }
+
+    complete_apps = ['reports']
diff --git a/data/treeio/treeio/treeio/reports/south_migrations/0002_auto__del_template__add_chart__del_field_report_template__add_field_re.py b/data/treeio/treeio/treeio/reports/south_migrations/0002_auto__del_template__add_chart__del_field_report_template__add_field_re.py
new file mode 100644
index 0000000..3b692d8
--- /dev/null
+++ b/data/treeio/treeio/treeio/reports/south_migrations/0002_auto__del_template__add_chart__del_field_report_template__add_field_re.py
@@ -0,0 +1,174 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Deleting model 'Template'
+        db.delete_table('reports_template')
+
+        # Adding model 'Chart'
+        db.create_table('reports_chart', (
+            ('object_ptr', self.gf('django.db.models.fields.related.OneToOneField')(
+                to=orm['core.Object'], unique=True, primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')
+             (max_length=255)),
+            ('report', self.gf('django.db.models.fields.related.ForeignKey')
+             (to=orm['reports.Report'])),
+            ('options', self.gf('django.db.models.fields.TextField')
+             (null=True, blank=True)),
+        ))
+        db.send_create_signal('reports', ['Chart'])
+
+        # Deleting field 'Report.template'
+        db.delete_column('reports_report', 'template_id')
+
+        # Adding field 'Report.model'
+        db.add_column('reports_report', 'model', self.gf(
+            'django.db.models.fields.TextField')(null=True, blank=True), keep_default=False)
+
+    def backwards(self, orm):
+
+        # Adding model 'Template'
+        db.create_table('reports_template', (
+            ('model', self.gf('django.db.models.fields.TextField')
+             (null=True, blank=True)),
+            ('object_ptr', self.gf('django.db.models.fields.related.OneToOneField')(
+                to=orm['core.Object'], unique=True, primary_key=True)),
+            ('details', self.gf('django.db.models.fields.TextField')
+             (null=True, blank=True)),
+            ('name', self.gf('django.db.models.fields.CharField')
+             (max_length=512)),
+        ))
+        db.send_create_signal('reports', ['Template'])
+
+        # Deleting model 'Chart'
+        db.delete_table('reports_chart')
+
+        # Adding field 'Report.template'
+        db.add_column('reports_report', 'template', self.gf('django.db.models.fields.related.ForeignKey')(
+            to=orm['reports.Template'], null=True, blank=True), keep_default=False)
+
+        # Deleting field 'Report.model'
+        db.delete_column('reports_report', 'model')
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'core.accessentity': {
+            'Meta': {'object_name': 'AccessEntity'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        },
+        'core.comment': {
+            'Meta': {'object_name': 'Comment'},
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'}),
+            'body': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"})
+        },
+        'core.group': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Group', '_ormbases': ['core.AccessEntity']},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True', 'primary_key': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['core.Group']"})
+        },
+        'core.object': {
+            'Meta': {'object_name': 'Object'},
+            'comments': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.Comment']"}),
+            'creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'objects_created'", 'null': 'True', 'to': "orm['core.User']"}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'full_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_full_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'links': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'links_rel_+'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'nuvius_resource': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'object_name': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'object_type': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'read_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_read_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'subscribers': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'subscriptions'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Tag']", 'null': 'True', 'blank': 'True'}),
+            'trash': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'core.tag': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Tag'},
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'})
+        },
+        'core.user': {
+            'Meta': {'ordering': "['name']", 'object_name': 'User', '_ormbases': ['core.AccessEntity']},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True', 'primary_key': 'True'}),
+            'default_group': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'default_user_set'", 'null': 'True', 'to': "orm['core.Group']"}),
+            'disabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_access': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'other_groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'reports.chart': {
+            'Meta': {'object_name': 'Chart', '_ormbases': ['core.Object']},
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'options': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'report': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['reports.Report']"})
+        },
+        'reports.report': {
+            'Meta': {'ordering': "['-date_created']", 'object_name': 'Report', '_ormbases': ['core.Object']},
+            'content': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'model': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'})
+        }
+    }
+
+    complete_apps = ['reports']
diff --git a/data/treeio/treeio/treeio/reports/south_migrations/0003_delete_old.py b/data/treeio/treeio/treeio/reports/south_migrations/0003_delete_old.py
new file mode 100644
index 0000000..4d8e439
--- /dev/null
+++ b/data/treeio/treeio/treeio/reports/south_migrations/0003_delete_old.py
@@ -0,0 +1,134 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import DataMigration
+from django.db import models
+
+
+class Migration(DataMigration):
+
+    def forwards(self, orm):
+        "Removes all old reports (these need to be re-created manually)"
+        for report in orm['reports.Report'].objects.all():
+            report.delete()
+
+    def backwards(self, orm):
+        raise RuntimeError("Cannot reverse this migration.")
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'core.accessentity': {
+            'Meta': {'object_name': 'AccessEntity'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        },
+        'core.comment': {
+            'Meta': {'object_name': 'Comment'},
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'}),
+            'body': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"})
+        },
+        'core.group': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Group'},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['core.Group']"})
+        },
+        'core.object': {
+            'Meta': {'object_name': 'Object'},
+            'comments': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.Comment']"}),
+            'creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'objects_created'", 'null': 'True', 'to': "orm['core.User']"}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'full_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_full_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'links': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'links_rel_+'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'nuvius_resource': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'object_name': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'object_type': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'read_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_read_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'subscribers': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'subscriptions'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Tag']", 'null': 'True', 'blank': 'True'}),
+            'trash': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'core.tag': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Tag'},
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'})
+        },
+        'core.user': {
+            'Meta': {'ordering': "['name']", 'object_name': 'User'},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'default_group': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'default_user_set'", 'null': 'True', 'to': "orm['core.AccessEntity']"}),
+            'disabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_access': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'other_groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'reports.chart': {
+            'Meta': {'object_name': 'Chart', '_ormbases': ['core.Object']},
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'options': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'report': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['reports.Report']"})
+        },
+        'reports.report': {
+            'Meta': {'ordering': "['-date_created']", 'object_name': 'Report', '_ormbases': ['core.Object']},
+            'content': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'model': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'})
+        }
+    }
+
+    complete_apps = ['reports']
diff --git a/data/treeio/treeio/treeio/reports/templatetags/reports.py b/data/treeio/treeio/treeio/reports/templatetags/reports.py
new file mode 100644
index 0000000..bbbdcf8
--- /dev/null
+++ b/data/treeio/treeio/treeio/reports/templatetags/reports.py
@@ -0,0 +1,237 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+from __future__ import division
+
+"""
+Reports templatetags
+"""
+from coffin import template
+from treeio.core.rendering import render_to_string
+from django.utils.translation import ugettext as _
+from jinja2 import contextfunction, Markup
+from jinja2.utils import internalcode
+from django.template import RequestContext
+from random import random
+from datetime import datetime
+import hashlib
+from treeio.reports.helpers import loads, aggregate_functions, number_field_regex
+from treeio.reports.views import _get_report_content
+import json
+
+register = template.Library()
+
+
+@contextfunction
+def display_chart(context, chart, skip_group=False):
+    "Return HTML for chart"
+
+    request = context['request']
+
+    response_format = 'html'
+    if 'response_format' in context:
+        response_format = context['response_format']
+
+    options = loads(chart.options)
+
+    content = _get_report_content(chart.report, request)
+
+    objs = content['set']
+
+    chart_dict = {}
+
+    field_name = options['grouping']
+
+    model = loads(chart.report.model)
+
+    chart_dict['yAxis'] = {'allowDecimals': False,
+                           'title': {
+                               'text': model.name.split('.')[-1] + " Count vs. " + field_name.replace('_', ' ').title()}
+                           }
+    chart_dict['xAxis'] = {}
+    try:
+        xfield = objs[0]._meta.get_field_by_name(field_name)[0]
+    except:
+        chart.delete()
+        return
+
+    def get_date(g, mindate):
+        if g and g != datetime.min.date():
+            return g
+        else:
+            return mindate
+
+    if xfield.get_internal_type() == 'ManyToManyField':
+        l = []
+        for obj in objs:
+            for mi in getattr(obj, field_name).all():
+                l.append(unicode(mi))
+    elif xfield.get_internal_type() == 'DateTimeField' or xfield.get_internal_type() == 'DateField':
+        chart_dict['xAxis']['labels'] = {  # 'rotation':90,
+                                           'align': 'left',
+                                           'x': 3,
+                                           'y': 15}
+        l, m, datelist = [], [], []
+        maxdate = None
+        mindate = None
+        for obj in objs:
+            if getattr(obj, field_name):
+                x = getattr(obj, field_name)
+                if xfield.get_internal_type() == 'DateTimeField':
+                    x = x.date()
+                if not maxdate or x > maxdate:
+                    maxdate = x
+                if not mindate or x < mindate:
+                    mindate = x
+                datelist.append(x)
+                if unicode(x) not in m:
+                    m.append(unicode(x))
+            else:
+                datelist.append(datetime.min.date())
+        while datetime.min.date() in datelist:
+            datelist.append(mindate)
+            datelist.remove(datetime.min.date())
+        datelist = sorted(datelist, key=lambda g: get_date(g, mindate))
+        l = [unicode(g) for g in datelist]
+
+        # chart_dict['xAxis']['categories']=m
+
+        chart_dict['xAxis']['type'] = 'datetime'
+        td = maxdate - mindate
+        # print (td.microseconds + (td.seconds + td.days * 24 * 3600) * 10**6) / 10**6
+        chart_dict['zoomType'] = 'x'
+        chart_dict['xAxis']['tickInterval'] = (
+                                                  td.microseconds + (
+                                                      td.seconds + td.days * 24 * 3600) * 10 ** 6) / 10 ** 4
+        # chart_dict['xAxis']['tickWidth']= 0,
+        chart_dict['maxZoom'] = 14 * 24 * 3600000  # 2wks
+        # chart_dict['xAxis']['gridLineWidth']= 1,
+        chart_dict['series'] = [{'name': model.name.split('.')[-1], 'data': []}]
+        for x in set(l):
+            chart_dict['series'][0]['data'].append(('%s UTC' % x, l.count(x)))
+
+    else:
+        l = [unicode(obj.get_field_value(field_name)) for obj in objs]
+
+    if 'series' not in chart_dict:
+        chart_dict['series'] = []
+        # chart_dict['series'].append({'name':field_name, 'data': [{'name': x, 'y':l.count(x)} for x in set(l)]})
+        chart_dict['series'].append({'name': field_name.replace(
+            '_', ' ').title(), 'data': [[x, l.count(x)] for x in set(l)]})
+        # for x in set(l):
+        # chart_dict['series'].append({'name':x, 'data': l.count(x)})
+        # chart_dict['series'].append({'data':[{'name':x, 'y': [l.count(x)]} for x in set(l)]})
+        if 'xAxis' not in chart_dict:
+            chart_dict['xAxis']['categories'] = [x for x in set(l)]
+        # Chart type specific options
+
+        if 'legend' in options and options['legend'] == 'on':
+            chart_dict['legend'] = {
+                'layout': 'vertical',
+                'align': 'right',
+                'verticalAlign': 'top',
+                'x': -10,
+                'y': 100,
+                'borderWidth': 0
+            }
+    if 'title' in options:
+        chart_dict['title'] = {'text': options['title']}
+
+    # Create a hash and use it as a unqiue div id and var name for the chart.
+    hasher = hashlib.md5()
+    hasher.update(str(random()))
+    id = 'chartcontainer' + str(hasher.hexdigest())
+    # Disable animation for when saving as PDF
+    chart_dict['chart'] = {'renderTo': id,
+                           'defaultSeriesType': options['type']}
+    # chart_dict['plotOptions'] = {'series': {'animation': False}}
+
+    chart_dict['plotOptions'] = {'pie': {
+        'allowPointSelect': True,
+        'cursor': 'pointer',
+        'dataLabels': {
+            'enabled': False
+        },
+        'showInLegend': True
+    }}
+
+    chart_dict['credits'] = {'enabled': False}
+
+    rendered_options = json.dumps(chart_dict)
+
+    rendered_options = rendered_options[
+                       :-1] + ", tooltip: {formatter: function() {return '<b>'+ this.point.name +'</b>: '+ this.y;}}}"
+
+    if 'type' in chart_dict['xAxis'] and chart_dict['xAxis']['type'] == 'datetime':
+        rendered_options += """
+        datedata = [];
+        jQuery.each(options.series[0].data, function(i,item){
+        date = Date.parse(item[0]);
+        count = item[1];
+        datedata.push([date, count]);
+        });
+      options.series[0].data = datedata;
+
+      function merge_options(obj1,obj2){
+        var obj3 = {};
+        for (attrname in obj1) { obj3[attrname] = obj1[attrname]; }
+        for (attrname in obj2) { obj3[attrname] = obj2[attrname]; }
+        return obj3;
+      }
+      var dateoptions =  {
+
+
+      tooltip: {
+         shared: true,
+         crosshairs: true
+
+      },
+
+      };
+
+
+    options = merge_options(options, dateoptions);
+
+              """
+
+    return Markup(render_to_string('reports/tags/chart',
+                                   {'rendered_options': rendered_options,
+                                    'id': id,
+                                    'chart_id': chart.id,
+                                    'chart': chart,
+                                    'name': options['title']},
+                                   context_instance=RequestContext(request),
+                                   response_format=response_format))
+
+
+register.object(display_chart)
+
+
+@internalcode
+def is_field_number(report, field_name):
+    model = loads(report.model)
+
+    classobj = model.get_class_object()
+    field = classobj._meta.get_field_by_name(field_name)[0]
+
+    if number_field_regex.match(field.get_internal_type()):
+        return True
+    return False
+
+
+register.object(is_field_number)
+
+
+@contextfunction
+def select_for_aggregation(context, field_name, value):
+    select_str = '<select type="select" name="aggregation-%(field_name)s"><option></option>%(options)s</select>'
+    options = ''.join(['<option value="%s"%s>%s</option>' % (name, ' selected' if value == name else '',
+                                                             _(func['description'])) for name, func in
+                       aggregate_functions.items()])
+    return Markup(select_str % {'field_name': field_name,
+                                'options': options})
+
+
+register.object(select_for_aggregation)
diff --git a/data/treeio/treeio/treeio/sales/forms.py b/data/treeio/treeio/treeio/sales/forms.py
new file mode 100644
index 0000000..4361df4
--- /dev/null
+++ b/data/treeio/treeio/treeio/sales/forms.py
@@ -0,0 +1,1095 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+# -*- coding: utf-8 -*-
+"""
+Sales module forms
+"""
+from django.shortcuts import get_object_or_404
+from django import forms
+from django.db.models import Q
+from treeio.sales.models import Product, SaleOrder, SaleSource, Lead, Opportunity, \
+    SaleStatus, OrderedProduct, Subscription, Currency
+from treeio.identities.models import Contact
+from treeio.core.models import Object, ModuleSetting, User, UpdateRecord
+from django.core.urlresolvers import reverse
+from treeio.core.decorators import preprocess_form
+from django.utils.translation import ugettext as _
+
+preprocess_form()
+
+standard_currencies = (
+    ("AED", "AED  United Arab Emirates, Dirhams"),
+    ("AFN", "AFN  Afghanistan, Afghanis"),
+    ("ALL", "ALL  Albania, Leke"),
+    ("AMD", "AMD  Armenia, Drams"),
+    ("ANG", "ANG  Netherlands Antilles, Guilders (also called Florins)"),
+    ("AOA", "AOA  Angola, Kwanza"),
+    ("ARS", "ARS  Argentina, Pesos"),
+    ("AUD", "AUD  Australia, Dollars"),
+    ("AWG", "AWG  Aruba, Guilders (also called Florins)"),
+    ("AZN", "AZN  Azerbaijan, New Manats"),
+    ("BAM", "BAM  Bosnia and Herzegovina, Convertible Marka"),
+    ("BBD", "BBD  Barbados, Dollars"),
+    ("BDT", "BDT  Bangladesh, Taka"),
+    ("BGN", "BGN  Bulgaria, Leva"),
+    ("BHD", "BHD  Bahrain, Dinars"),
+    ("BIF", "BIF  Burundi, Francs"),
+    ("BMD", "BMD  Bermuda, Dollars"),
+    ("BND", "BND  Brunei Darussalam, Dollars"),
+    ("BOB", "BOB  Bolivia, Bolivianos"),
+    ("BRL", "BRL  Brazil, Brazil Real"),
+    ("BSD", "BSD  Bahamas, Dollars"),
+    ("BTN", "BTN  Bhutan, Ngultrum"),
+    ("BWP", "BWP  Botswana, Pulas"),
+    ("BYR", "BYR  Belarus, Rubles"),
+    ("BZD", "BZD  Belize, Dollars"),
+    ("CAD", "CAD  Canada, Dollars"),
+    ("CDF", "CDF  Congo/Kinshasa, Congolese Francs"),
+    ("CHF", "CHF  Switzerland, Francs"),
+    ("CLP", "CLP  Chile, Pesos"),
+    ("CNY", "CNY  China, Yuan Renminbi"),
+    ("COP", "COP  Colombia, Pesos"),
+    ("CRC", "CRC  Costa Rica, Colones"),
+    ("CUP", "CUP  Cuba, Pesos"),
+    ("CVE", "CVE  Cape Verde, Escudos"),
+    ("CZK", "CZK  Czech Republic, Koruny"),
+    ("DJF", "DJF  Djibouti, Francs"),
+    ("DKK", "DKK  Denmark, Kroner"),
+    ("DOP", "DOP  Dominican Republic, Pesos"),
+    ("DZD", "DZD  Algeria, Algeria Dinars"),
+    ("EGP", "EGP  Egypt, Pounds"),
+    ("ERN", "ERN  Eritrea, Nakfa"),
+    ("ETB", "ETB  Ethiopia, Birr"),
+    ("EUR", "EUR  Euro Member Countries, Euro"),
+    ("FJD", "FJD  Fiji, Dollars"),
+    ("FKP", "FKP  Falkland Islands (Malvinas), Pounds"),
+    ("GBP", "GBP  United Kingdom, Pounds"),
+    ("GEL", "GEL  Georgia, Lari"),
+    ("GGP", "GGP  Guernsey, Pounds"),
+    ("GHS", "GHS  Ghana, Cedis"),
+    ("GIP", "GIP  Gibraltar, Pounds"),
+    ("GMD", "GMD  Gambia, Dalasi"),
+    ("GNF", "GNF  Guinea, Francs"),
+    ("GTQ", "GTQ  Guatemala, Quetzales"),
+    ("GYD", "GYD  Guyana, Dollars"),
+    ("HKD", "HKD  Hong Kong, Dollars"),
+    ("HNL", "HNL  Honduras, Lempiras"),
+    ("HRK", "HRK  Croatia, Kuna"),
+    ("HTG", "HTG  Haiti, Gourdes"),
+    ("HUF", "HUF  Hungary, Forint"),
+    ("IDR", "IDR  Indonesia, Rupiahs"),
+    ("ILS", "ILS  Israel, New Shekels"),
+    ("IMP", "IMP  Isle of Man, Pounds"),
+    ("INR", "INR  India, Rupees"),
+    ("IQD", "IQD  Iraq, Dinars"),
+    ("IRR", "IRR  Iran, Rials"),
+    ("ISK", "ISK  Iceland, Kronur"),
+    ("JEP", "JEP  Jersey, Pounds"),
+    ("JMD", "JMD  Jamaica, Dollars"),
+    ("JOD", "JOD  Jordan, Dinars"),
+    ("JPY", "JPY  Japan, Yen"),
+    ("KES", "KES  Kenya, Shillings"),
+    ("KGS", "KGS  Kyrgyzstan, Soms"),
+    ("KHR", "KHR  Cambodia, Riels"),
+    ("KMF", "KMF  Comoros, Francs"),
+    ("KPW", "KPW  Korea (North), Won"),
+    ("KRW", "KRW  Korea (South), Won"),
+    ("KWD", "KWD  Kuwait, Dinars"),
+    ("KYD", "KYD  Cayman Islands, Dollars"),
+    ("KZT", "KZT  Kazakhstan, Tenge"),
+    ("LAK", "LAK  Laos, Kips"),
+    ("LBP", "LBP  Lebanon, Pounds"),
+    ("LKR", "LKR  Sri Lanka, Rupees"),
+    ("LRD", "LRD  Liberia, Dollars"),
+    ("LSL", "LSL  Lesotho, Maloti"),
+    ("LTL", "LTL  Lithuania, Litai"),
+    ("LVL", "LVL  Latvia, Lati"),
+    ("LYD", "LYD  Libya, Dinars"),
+    ("MAD", "MAD  Morocco, Dirhams"),
+    ("MDL", "MDL  Moldova, Lei"),
+    ("MGA", "MGA  Madagascar, Ariary"),
+    ("MKD", "MKD  Macedonia, Denars"),
+    ("MMK", "MMK  Myanmar (Burma), Kyats"),
+    ("MNT", "MNT  Mongolia, Tugriks"),
+    ("MOP", "MOP  Macau, Patacas"),
+    ("MRO", "MRO  Mauritania, Ouguiyas"),
+    ("MUR", "MUR  Mauritius, Rupees"),
+    ("MVR", "MVR  Maldives (Maldive Islands), Rufiyaa"),
+    ("MWK", "MWK  Malawi, Kwachas"),
+    ("MXN", "MXN  Mexico, Pesos"),
+    ("MYR", "MYR  Malaysia, Ringgits"),
+    ("MZN", "MZN  Mozambique, Meticais"),
+    ("NAD", "NAD  Namibia, Dollars"),
+    ("NGN", "NGN  Nigeria, Nairas"),
+    ("NIO", "NIO  Nicaragua, Cordobas"),
+    ("NOK", "NOK  Norway, Krone"),
+    ("NPR", "NPR  Nepal, Nepal Rupees"),
+    ("NZD", "NZD  New Zealand, Dollars"),
+    ("OMR", "OMR  Oman, Rials"),
+    ("PAB", "PAB  Panama, Balboa"),
+    ("PEN", "PEN  Peru, Nuevos Soles"),
+    ("PGK", "PGK  Papua New Guinea, Kina"),
+    ("PHP", "PHP  Philippines, Pesos"),
+    ("PKR", "PKR  Pakistan, Rupees"),
+    ("PLN", "PLN  Poland, Zlotych"),
+    ("PYG", "PYG  Paraguay, Guarani"),
+    ("QAR", "QAR  Qatar, Rials"),
+    ("RON", "RON  Romania, New Lei"),
+    ("RSD", "RSD  Serbia, Dinars"),
+    ("RUB", "RUB  Russia, Rubles"),
+    ("RWF", "RWF  Rwanda, Rwanda Francs"),
+    ("SAR", "SAR  Saudi Arabia, Riyals"),
+    ("SBD", "SBD  Solomon Islands, Dollars"),
+    ("SCR", "SCR  Seychelles, Rupees"),
+    ("SDG", "SDG  Sudan, Pounds"),
+    ("SEK", "SEK  Sweden, Kronor"),
+    ("SGD", "SGD  Singapore, Dollars"),
+    ("SHP", "SHP  Saint Helena, Pounds"),
+    ("SLL", "SLL  Sierra Leone, Leones"),
+    ("SOS", "SOS  Somalia, Shillings"),
+    ("SPL", "SPL  Seborga, Luigini"),
+    ("SRD", "SRD  Suriname, Dollars"),
+    ("STD", "STD  Sao Tome and Principe, Dobras"),
+    ("SVC", "SVC  El Salvador, Colones"),
+    ("SYP", "SYP  Syria, Pounds"),
+    ("SZL", "SZL  Swaziland, Emalangeni"),
+    ("THB", "THB  Thailand, Baht"),
+    ("TJS", "TJS  Tajikistan, Somoni"),
+    ("TMM", "TMM  Turkmenistan, Manats"),
+    ("TND", "TND  Tunisia, Dinars"),
+    ("TOP", "TOP  Tonga, Pa'anga"),
+    ("TRY", "TRY  Turkey, New Lira"),
+    ("TTD", "TTD  Trinidad and Tobago, Dollars"),
+    ("TVD", "TVD  Tuvalu, Tuvalu Dollars"),
+    ("TWD", "TWD  Taiwan, New Dollars"),
+    ("TZS", "TZS  Tanzania, Shillings"),
+    ("UAH", "UAH  Ukraine, Hryvnia"),
+    ("UGX", "UGX  Uganda, Shillings"),
+    ("USD", "USD  United States of America, Dollars"),
+    ("UYU", "UYU  Uruguay, Pesos"),
+    ("UZS", "UZS  Uzbekistan, Sums"),
+    ("VEF", "VEF  Venezuela, Bolivares Fuertes"),
+    ("VND", "VND  Viet Nam, Dong"),
+    ("VUV", "VUV  Vanuatu, Vatu"),
+    ("WST", "WST  Samoa, Tala"),
+    ("XAF", "XAF  Communaute Financiere Africaine BEAC, Francs"),
+    ("XAG", "XAG  Silver, Ounces"),
+    ("XAU", "XAU  Gold, Ounces"),
+    ("XCD", "XCD  East Caribbean Dollars"),
+    ("XDR", "XDR  International Monetary Fund (IMF) Special Drawing Rights"),
+    ("XOF", "XOF  Communaute Financiere Africaine BCEAO, Francs"),
+    ("XPD", "XPD  Palladium Ounces"),
+    ("XPF", "XPF  Comptoirs Francais du Pacifique Francs"),
+    ("XPT", "XPT  Platinum, Ounces"),
+    ("YER", "YER  Yemen, Rials"),
+    ("ZAR", "ZAR  South Africa, Rand"),
+    ("ZMK", "ZMK  Zambia, Kwacha"),
+    ("ZWD", "ZWD  Zimbabwe, Zimbabwe Dollars")
+)
+
+dict_currencies = dict(standard_currencies)
+
+
+class SettingsForm(forms.Form):
+
+    """ Administration settings form """
+
+    default_currency = forms.ModelChoiceField(
+        label=_('Base Currency'), queryset=Currency.objects)
+    default_lead_status = forms.ModelChoiceField(
+        label=_('Default Lead Status'), queryset=[])
+    default_opportunity_status = forms.ModelChoiceField(
+        label=_('Default Opportunity Status'), queryset=[])
+    default_order_status = forms.ModelChoiceField(
+        label=_('Default Order Status'), queryset=[])
+    default_order_source = forms.ModelChoiceField(
+        label=_('Default Order Source'), queryset=[])
+    default_order_product = forms.ModelChoiceField(
+        label=_('Default Order Product'), queryset=[], required=False)
+    order_fulfil_status = forms.ModelChoiceField(
+        label=_('Order Fulfilment Status'), queryset=[])
+
+    def __init__(self, user, *args, **kwargs):
+        "Sets choices and initial value"
+        super(SettingsForm, self).__init__(*args, **kwargs)
+        self.fields['default_lead_status'].queryset = Object.filter_permitted(user,
+                                                                              SaleStatus.objects.filter(use_leads=True))
+        self.fields['default_opportunity_status'].queryset = Object.filter_permitted(user,
+                                                                                     SaleStatus.objects.filter(use_opportunities=True))
+        self.fields['default_order_status'].queryset = Object.filter_permitted(user,
+                                                                               SaleStatus.objects.filter(use_sales=True))
+        self.fields['default_order_source'].queryset = Object.filter_permitted(user,
+                                                                               SaleSource.objects.all())
+        self.fields['order_fulfil_status'].queryset = Object.filter_permitted(user,
+                                                                              SaleStatus.objects.filter(use_sales=True))
+        self.fields['default_order_product'].queryset = Object.filter_permitted(user,
+                                                                                Product.objects.filter(active=True))
+
+        # Translation
+
+        self.fields['default_currency'].label = _('Base Currency')
+        self.fields['default_lead_status'].label = _('Default Lead Status')
+        self.fields['default_opportunity_status'].label = _(
+            'Default Opportunity Status')
+        self.fields['default_order_status'].label = _('Default Order Status')
+        self.fields['default_order_source'].label = _('Default Order Source')
+        self.fields['default_order_product'].label = _('Default Order Product')
+        self.fields['order_fulfil_status'].label = _('Order Fulfilment Status')
+
+        try:
+            self.fields['default_currency'].queryset = Currency.objects
+            self.fields['default_currency'].initial = Currency.objects.get(
+                is_default__exact=True)
+            self.fields['default_currency'].widget.attrs.update(
+                {'popuplink': reverse('sales_currency_add')})
+        except:
+            pass
+
+        try:
+            conf = ModuleSetting.get_for_module(
+                'treeio.sales', 'default_opportunity_status')[0]
+            default_opportunity_status = SaleStatus.objects.get(
+                pk=long(conf.value))
+            self.fields[
+                'default_opportunity_status'].initial = default_opportunity_status.id
+        except:
+            pass
+
+        try:
+            conf = ModuleSetting.get_for_module(
+                'treeio.sales', 'default_lead_status')[0]
+            default_lead_status = SaleStatus.objects.get(pk=long(conf.value))
+            self.fields['default_lead_status'].initial = default_lead_status.id
+        except:
+            pass
+
+        try:
+            conf = ModuleSetting.get_for_module(
+                'treeio.sales', 'default_order_status')[0]
+            default_order_status = SaleStatus.objects.get(pk=long(conf.value))
+            self.fields[
+                'default_order_status'].initial = default_order_status.id
+        except:
+            pass
+
+        try:
+            conf = ModuleSetting.get_for_module(
+                'treeio.sales', 'default_order_source')[0]
+            default_order_source = SaleSource.objects.get(pk=long(conf.value))
+            self.fields[
+                'default_order_source'].initial = default_order_source.id
+        except:
+            pass
+
+        try:
+            conf = ModuleSetting.get_for_module(
+                'treeio.sales', 'default_order_product')[0]
+            default_order_product = Product.objects.get(pk=long(conf.value))
+            self.fields[
+                'default_order_product'].initial = default_order_product.id
+        except:
+            pass
+
+        try:
+            conf = ModuleSetting.get_for_module(
+                'treeio.sales', 'order_fulfil_status')[0]
+            order_fulfil_status = SaleStatus.objects.get(pk=long(conf.value))
+            self.fields['order_fulfil_status'].initial = order_fulfil_status.id
+        except:
+            pass
+
+    def save(self):
+        "Form processor"
+        fields = self.fields
+        try:
+            for field in fields:
+                if self.cleaned_data[field]:
+                    if field == 'default_currency':
+                        ModuleSetting.set_for_module('default_currency',
+                                                     self.cleaned_data[
+                                                         'default_currency'],
+                                                     'treeio.sales')
+                        currency = Currency.objects.get(
+                            pk=self.cleaned_data['default_currency'])
+                        currency.is_default = True
+                        currency.save()
+                    else:
+                        ModuleSetting.set_for_module(field, self.cleaned_data[field].id,
+                                                     'treeio.sales')
+            return True
+        except:
+            return False
+
+
+class MassActionForm(forms.Form):
+
+    """ Mass action form for Orders """
+
+    status = forms.ModelChoiceField(queryset=[], required=False)
+    assignedto = forms.ModelChoiceField(queryset=[], required=False)
+    delete = forms.ChoiceField(label=_("Delete"), choices=(('', '-----'), ('delete', _('Delete Completely')),
+                                                           ('trash', _('Move to Trash'))), required=False)
+
+    instance = None
+
+    def __init__(self, user, *args, **kwargs):
+        if 'instance' in kwargs:
+            self.instance = kwargs['instance']
+            del kwargs['instance']
+
+        super(MassActionForm, self).__init__(*args, **kwargs)
+
+        self.fields['status'].queryset = Object.filter_permitted(user,
+                                                                 SaleStatus.objects.filter(
+                                                                     use_sales=True),
+                                                                 mode='x')
+        self.fields['status'].label = _("Status:")
+        self.fields['delete'] = forms.ChoiceField(label=_("Delete"), choices=(('', '-----'),
+                                                                              ('delete', _(
+                                                                                  'Delete Completely')),
+                                                                              ('trash', _('Move to Trash'))), required=False)
+
+        self.fields['assignedto'].queryset = User.objects
+        self.fields['assignedto'].label = _("Assign To:")
+        # self.fields['assignedto'].widget.attrs.update({'class': 'autocomplete',
+        #                                               'callback': reverse('identities_ajax_user_lookup')})
+
+    def save(self, *args, **kwargs):
+        "Process form"
+
+        if self.instance:
+            if self.is_valid():
+                if self.cleaned_data['status']:
+                    self.instance.status = self.cleaned_data['status']
+                if self.cleaned_data['assignedto']:
+                    self.instance.assigned.add(self.cleaned_data['assignedto'])
+                self.instance.save()
+                if self.cleaned_data['delete']:
+                    if self.cleaned_data['delete'] == 'delete':
+                        self.instance.delete()
+                    if self.cleaned_data['delete'] == 'trash':
+                        self.instance.trash = True
+                        self.instance.save()
+
+
+class LeadMassActionForm(forms.Form):
+
+    """ Mass action form for Orders """
+
+    status = forms.ModelChoiceField(queryset=[], required=False)
+    assignedto = forms.ModelChoiceField(queryset=[], required=False)
+
+    instance = None
+
+    def __init__(self, user, *args, **kwargs):
+        if 'instance' in kwargs:
+            self.instance = kwargs['instance']
+            del kwargs['instance']
+
+        super(LeadMassActionForm, self).__init__(*args, **kwargs)
+
+        self.fields['status'].queryset = Object.filter_permitted(user,
+                                                                 SaleStatus.objects.filter(
+                                                                     use_leads=True),
+                                                                 mode='x')
+        self.fields['status'].label = _("Status:")
+
+        self.fields['assignedto'].queryset = User.objects
+        self.fields['assignedto'].label = _("Assign To:")
+        # self.fields['assignedto'].widget.attrs.update({'class': 'autocomplete',
+        #                                                'callback': reverse('identities_ajax_user_lookup')})
+
+    def save(self, *args, **kwargs):
+        "Process form"
+
+        if self.instance:
+            if self.is_valid():
+                if self.cleaned_data['status']:
+                    self.instance.status = self.cleaned_data['status']
+                if self.cleaned_data['assignedto']:
+                    self.instance.assigned.add(self.cleaned_data['assignedto'])
+                self.instance.save()
+
+
+class OpportunityMassActionForm(forms.Form):
+
+    """ Mass action form for Orders """
+
+    status = forms.ModelChoiceField(queryset=[], required=False)
+    assignedto = forms.ModelChoiceField(queryset=[], required=False)
+
+    instance = None
+
+    def __init__(self, user, *args, **kwargs):
+        if 'instance' in kwargs:
+            self.instance = kwargs['instance']
+            del kwargs['instance']
+
+        super(OpportunityMassActionForm, self).__init__(*args, **kwargs)
+
+        self.fields['status'].queryset = Object.filter_permitted(user,
+                                                                 SaleStatus.objects.filter(
+                                                                     use_opportunities=True),
+                                                                 mode='x')
+        self.fields['status'].label = _("Status:")
+
+        self.fields['assignedto'].queryset = User.objects
+        self.fields['assignedto'].label = _("Assign To:")
+    #   self.fields['assignedto'].widget.attrs.update({'class': 'autocomplete',
+    #                                                  'callback': reverse('identities_ajax_user_lookup')})
+
+    def save(self, *args, **kwargs):
+        "Process form"
+
+        if self.instance:
+            if self.is_valid():
+                if self.cleaned_data['status']:
+                    self.instance.status = self.cleaned_data['status']
+                if self.cleaned_data['assignedto']:
+                    self.instance.assigned.add(self.cleaned_data['assignedto'])
+                self.instance.save()
+
+
+class ProductMassActionForm(forms.Form):
+
+    """ Mass action form for Products """
+
+    active = forms.ChoiceField(label=_("Action"), choices=(('', '-------'), ('active', 'Mark as Active'),
+                                                           ('inactive', 'Mark as Inactive')), required=False)
+
+    instance = None
+
+    def __init__(self, user, *args, **kwargs):
+        if 'instance' in kwargs:
+            self.instance = kwargs['instance']
+            del kwargs['instance']
+
+        super(ProductMassActionForm, self).__init__(*args, **kwargs)
+
+        # Translation
+        self.fields['active'].label = _("Action")
+
+    def save(self, *args, **kwargs):
+        "Process form"
+        if self.instance:
+            if self.is_valid():
+                if self.cleaned_data['active'] == 'active':
+                    self.instance.active = True
+                if self.cleaned_data['active'] == 'inactive':
+                    self.instance.active = False
+                self.instance.save()
+
+
+class SaleStatusForm(forms.ModelForm):
+
+    """ Status form """
+    name = forms.CharField(widget=forms.TextInput(attrs={'size': '40'}))
+
+    def __init__(self, user, *args, **kwargs):
+        super(SaleStatusForm, self).__init__(*args, **kwargs)
+
+        self.fields['name'].label = _("Name")
+        self.fields['use_leads'].label = _("Enabled for Leads")
+        self.fields['use_opportunities'].label = _("Enabled for Opportunities")
+        self.fields['use_sales'].label = _("Enabled for Sales")
+
+        self.fields['active'].label = _("Active")
+        self.fields['hidden'].label = _("Hidden")
+        self.fields['details'].label = _("Details")
+
+        self.fields['active'].initial = True
+
+    class Meta:
+
+        "Sales Status Form"
+        model = SaleStatus
+        fields = ('name', 'use_leads', 'use_opportunities',
+                  'use_sales', 'active', 'hidden', 'details')
+
+
+class SaleSourceForm(forms.ModelForm):
+
+    """ Status form """
+    name = forms.CharField(widget=forms.TextInput(attrs={'size': '40'}))
+
+    def __init__(self, user, *args, **kwargs):
+        super(SaleSourceForm, self).__init__(*args, **kwargs)
+
+        self.fields['active'].initial = True
+        self.fields['name'].label = _("Name")
+        self.fields['active'].label = _("Active")
+        self.fields['details'].label = _("Details")
+
+    class Meta:
+
+        "Sale Source Form"
+        model = SaleSource
+        fields = ('name', 'active', 'details')
+
+
+class ProductForm(forms.ModelForm):
+
+    """ Product form """
+    name = forms.CharField(widget=forms.TextInput(attrs={'size': '40'}))
+
+    def __init__(self, user, parent=None, *args, **kwargs):
+        super(ProductForm, self).__init__(*args, **kwargs)
+
+        self.fields['supplier'].queryset = Object.filter_permitted(
+            user, Contact.objects)
+        self.fields['supplier'].widget.attrs.update({'class': 'autocomplete',
+                                                     'callback': reverse('identities_ajax_contact_lookup')})
+        self.fields['supplier'].widget.attrs.update(
+            {'popuplink': reverse('identities_contact_add')})
+        self.fields['supplier'].label = _("Supplier")
+        self.fields['active'].initial = True
+        self.fields['active'].label = _("Active")
+
+        manager = Product.objects.filter(active=True)
+        if 'instance' in kwargs:
+            instance = kwargs['instance']
+            manager = manager.exclude(Q(parent=instance) & Q(pk=instance.id))
+        self.fields['parent'].queryset = Object.filter_permitted(
+            user, manager, mode='x')
+
+        if parent:
+            self.fields['parent'].initial = get_object_or_404(
+                Product, pk=parent)
+            self.fields['parent'].label = _("Parent")
+
+        self.fields['product_type'].label = _("Product type")
+        self.fields['code'].label = _("Code")
+        self.fields['supplier_code'].label = _("Supplier code")
+        self.fields['buy_price'].label = _("Buy price")
+        self.fields['sell_price'].label = _("Sell price")
+        self.fields['stock_quantity'].label = _("Stock quantity")
+        self.fields['runout_action'].label = _("Runout action")
+        self.fields['details'].label = _("Details")
+
+    class Meta:
+
+        "ProductForm"
+        model = Product
+        fields = ('name', 'parent', 'product_type', 'code', 'supplier', 'supplier_code', 'buy_price',
+                  'sell_price', 'stock_quantity', 'active', 'runout_action', 'details')
+
+
+class ProductFilterForm(forms.ModelForm):
+
+    """ Ticket Filters definition """
+
+    def __init__(self, user, skip=None, *args, **kwargs):
+        if skip is None:
+            skip = []
+        super(ProductFilterForm, self).__init__(*args, **kwargs)
+
+        self.fields['product_type'].queryset = Object.filter_permitted(user,
+                                                                       Product.objects.filter(active=True))
+        self.fields['product_type'].required = False
+        self.fields['product_type'].label = _("Product type")
+
+        self.fields['supplier'].queryset = Object.filter_permitted(
+            user, Contact.objects)
+        self.fields['supplier'].required = False
+        self.fields['supplier'].widget.attrs.update({'class': 'autocomplete',
+                                                     'callback': reverse('identities_ajax_contact_lookup')})
+        self.fields['supplier'].label = _("Supplier")
+
+        self.fields['active'].required = False
+        self.fields['active'].initial = True
+        self.fields['active'].label = _("Active")
+
+    class Meta:
+
+        "Product Filter Form"
+        model = Product
+        fields = ('product_type', 'supplier', 'active')
+
+
+class UpdateRecordForm(forms.ModelForm):
+
+    "UpdateRecord form"
+
+    def __init__(self, *args, **kwargs):
+        super(UpdateRecordForm, self).__init__(*args, **kwargs)
+
+        self.fields['body'].label = _("Details")
+        self.fields['body'].required = True
+
+    class Meta:
+
+        "UpdateRecordForm"
+        model = UpdateRecord
+        fields = ['body']
+
+
+class OrderedProductForm(forms.ModelForm):
+
+    """ Add New Ordered Product """
+
+    def __init__(self, user, order, *args, **kwargs):
+
+        super(OrderedProductForm, self).__init__(*args, **kwargs)
+
+        self.fields['subscription'].queryset = Object.filter_permitted(
+            user, Subscription.objects)
+        self.fields['subscription'].widget.attrs.update({'class': 'autocomplete',
+                                                         'callback': reverse('sales_ajax_subscription_lookup')})
+        self.fields['subscription'].widget.attrs.update(
+            {'popuplink': reverse('sales_subscription_add')})
+        self.fields['subscription'].label = _("Subscription")
+
+        self.fields['product'].queryset = Object.filter_permitted(
+            user, Product.objects.filter(active=True))
+        if user.is_admin('treeio.sales'):
+            self.fields['product'].widget.attrs.update(
+                {'popuplink': reverse('sales_product_add')})
+            self.fields['product'].label = _("Product")
+
+        try:
+            conf = ModuleSetting.get_for_module(
+                'treeio.sales', 'default_order_product')[0]
+            # AJAX to set the initial rate as the currency converted value of
+            # product sell price
+            self.fields['product'].initial = long(conf.value)
+        except:
+            pass
+
+        # Tax
+        self.fields['tax'].widget.attrs.update(
+            {'popuplink': reverse('finance_tax_add')})
+
+        # TODO: rate
+        #  self.fields['rate_display'].label = _("Rate")
+        #  self.fields['rate_display'].help_text = order.currency.code
+
+        self.fields['quantity'].label = _("Quantity")
+        self.fields['quantity'].initial = 1
+        self.fields['discount'].label = _("Discount")
+        self.fields['discount'].help_text = "%"
+
+    def save(self, *args, **kwargs):
+        "Set Rate"
+        instance = super(OrderedProductForm, self).save(commit=False)
+        if 'product' in self.cleaned_data and self.cleaned_data['product']:
+            instance.rate = self.cleaned_data['product'].sell_price
+            instance.rate_display = instance.rate
+
+        return instance
+
+    class Meta:
+
+        "OrderedProductForm"
+        model = OrderedProduct
+        fields = ('product', 'quantity', 'subscription',
+                  'tax', 'discount', 'description')
+
+
+class SubscriptionForm(forms.ModelForm):
+
+    """ Add New Subscription """
+
+    def __init__(self, user, *args, **kwargs):
+        super(SubscriptionForm, self).__init__(*args, **kwargs)
+
+        del self.fields['cycle_end']
+
+        self.fields['product'].queryset = Object.filter_permitted(
+            user, Product.objects)
+        self.fields['product'].label = _("Product")
+
+        self.fields['client'].queryset = Object.filter_permitted(
+            user, Contact.objects)
+        self.fields['client'].widget.attrs.update({'class': 'autocomplete',
+                                                   'callback': reverse('identities_ajax_contact_lookup')})
+        self.fields['client'].widget.attrs.update(
+            {'popuplink': reverse('identities_contact_add')})
+        self.fields['client'].label = _("Client")
+
+        self.fields['start'].widget.attrs.update({'class': 'datepicker'})
+        self.fields['start'].label = _("Start")
+        self.fields['expiry'].widget.attrs.update({'class': 'datepicker'})
+        self.fields['expiry'].label = _("Expiry")
+
+        if 'instance' in kwargs:
+            self.instance = kwargs['instance']
+            self.fields['start'].widget.attrs['readonly'] = True
+            del kwargs['instance']
+
+        self.fields['active'].initial = True
+        self.fields['active'].label = _("Active")
+        self.fields['cycle_period'].label = _("Cycle period")
+        self.fields['details'].label = _("Details")
+
+    class Meta:
+
+        "Subscription Form"
+        model = Subscription
+        fields = ('client', 'product', 'start', 'expiry',
+                  'cycle_period', 'cycle_end', 'active', 'details')
+
+
+class OrderForm(forms.ModelForm):
+
+    """ Order form """
+
+    def __init__(self, user, lead=None, opportunity=None, *args, **kwargs):
+        super(OrderForm, self).__init__(*args, **kwargs)
+
+        self.fields['reference'].required = False
+        self.fields['reference'].label = _("Reference")
+        if hasattr(self, 'instance') and not self.instance.reference:
+            next_ref = self.instance.get_next_reference()
+            if next_ref:
+                self.fields['reference'].initial = next_ref
+
+        self.fields['client'].queryset = Object.filter_permitted(
+            user, Contact.objects)
+        self.fields['client'].widget.attrs.update({'class': 'autocomplete',
+                                                   'callback': reverse('identities_ajax_contact_lookup')})
+        self.fields['client'].widget.attrs.update(
+            {'popuplink': reverse('identities_contact_add')})
+        self.fields['client'].label = _("Client")
+
+        self.fields['source'].queryset = Object.filter_permitted(
+            user, SaleSource.objects.filter(active=True))
+        self.fields['source'].label = _("Source")
+
+        # Currency
+        self.fields['currency'].label = _('Currency')
+        instance = getattr(self, 'instance', None)
+        if instance and instance.id:
+            del self.fields['currency']
+        else:
+            self.fields['currency'].widget.attrs.update(
+                {'popuplink': reverse('finance_currency_add')})
+            self.fields['currency'].initial = Currency.objects.get(
+                is_default=True)
+
+        try:
+            conf = ModuleSetting.get_for_module(
+                'treeio.sales', 'default_order_source')[0]
+            self.fields['source'].initial = long(conf.value)
+        except:
+            pass
+
+        self.fields['status'].queryset = Object.filter_permitted(user,
+                                                                 SaleStatus.objects.filter(use_sales=True))
+        self.fields['status'].label = _("Status")
+
+        try:
+            conf = ModuleSetting.get_for_module(
+                'treeio.sales', 'default_order_status')[0]
+            self.fields['status'].initial = long(conf.value)
+        except:
+            pass
+
+        if opportunity:
+            self.fields['opportunity'].queryset = Object.filter_permitted(
+                user, Opportunity.objects)
+            self.fields['opportunity'].label = _("Opportunity")
+            self.fields['opportunity'].initial = opportunity.id
+            self.fields['client'].initial = opportunity.contact_id
+            self.fields['source'].initial = opportunity.source_id
+            self.fields['assigned'].initial = [
+                i.id for i in opportunity.assigned.only('id')]
+        else:
+            del self.fields['opportunity']
+
+        if lead:
+            self.fields['client'].initial = lead.contact_id
+            self.fields['source'].initial = lead.source_id
+            self.fields['assigned'].initial = [
+                i.id for i in lead.assigned.only('id')]
+
+        self.fields['assigned'].help_text = ""
+        self.fields['assigned'].label = _("Assigned to")
+        self.fields['assigned'].widget.attrs.update({'class': 'multicomplete',
+                                                     'callback': reverse('identities_ajax_user_lookup')})
+
+        self.fields['datetime'].label = _("Date")
+        self.fields['datetime'].widget.attrs.update(
+            {'class': 'datetimepicker'})
+        self.fields['details'].label = _("Details")
+
+    class Meta:
+
+        "Sale Order Form"
+        model = SaleOrder
+        fields = ('reference', 'client', 'opportunity', 'currency', 'source',
+                  'assigned', 'status', 'datetime', 'details')
+
+
+class OrderFilterForm(forms.ModelForm):
+
+    """ Order Filters definition """
+
+    paid = forms.ChoiceField(choices=(
+        (None, '-----'), ('paid', _("Paid in full")), ('unpaid', _("Pending Payments"))), required=False)
+
+    def __init__(self, user, skip=None, *args, **kwargs):
+        if skip is None:
+            skip = []
+        super(OrderFilterForm, self).__init__(*args, **kwargs)
+
+        if 'status' in skip:
+            del self.fields['status']
+        else:
+            self.fields['status'].queryset = Object.filter_permitted(user,
+                                                                     SaleStatus.objects.filter(use_sales=True))
+            self.fields['status'].required = False
+            self.fields['status'].label = _("Status")
+
+        self.fields['paid'].label = _("Payment Status")
+
+        self.fields['client'].queryset = Object.filter_permitted(
+            user, Contact.objects)
+        self.fields['client'].widget.attrs.update({'class': 'autocomplete',
+                                                   'callback': reverse('identities_ajax_contact_lookup')})
+        self.fields['client'].required = False
+        self.fields['client'].label = _("Client")
+
+        self.fields['source'].queryset = Object.filter_permitted(
+            user, SaleSource.objects.filter(active=True))
+        self.fields['source'].required = False
+        self.fields['source'].label = _("Source")
+
+        self.fields['assigned'].label = _("Assigned")
+        self.fields['assigned'].widget.attrs.update({'class': 'multicomplete',
+                                                     'callback': reverse('identities_ajax_user_lookup')})
+        if 'assigned' in skip:
+            del self.fields['assigned']
+        else:
+            self.fields['assigned'].help_text = ""
+
+    class Meta:
+
+        "Order Filter Form"
+        model = SaleOrder
+        fields = ('client', 'source', 'assigned', 'status')
+
+
+class LeadForm(forms.ModelForm):
+
+    """ Lead form """
+
+    def __init__(self, user, *args, **kwargs):
+        super(LeadForm, self).__init__(*args, **kwargs)
+
+        self.fields['contact'].queryset = Object.filter_permitted(
+            user, Contact.objects)
+        self.fields['contact'].widget.attrs.update({'class': 'autocomplete',
+                                                    'callback': reverse('identities_ajax_contact_lookup')})
+        self.fields['contact'].widget.attrs.update(
+            {'popuplink': reverse('identities_contact_add')})
+        self.fields['contact'].label = _("Contact")
+
+        self.fields['source'].queryset = Object.filter_permitted(
+            user, SaleSource.objects.filter(active=True))
+        self.fields['source'].label = _("Source")
+        self.fields['products_interested'].queryset = Object.filter_permitted(
+            user, Product.objects)
+        self.fields['products_interested'].help_text = ""
+        self.fields['products_interested'].widget.attrs.update(
+            {'popuplink': reverse('sales_product_add')})
+        self.fields['products_interested'].label = _("Products interested")
+
+        self.fields['assigned'].help_text = ""
+        self.fields['assigned'].label = _("Assigned to")
+        self.fields['assigned'].widget.attrs.update({'class': 'multicomplete',
+                                                     'callback': reverse('identities_ajax_user_lookup')})
+
+        try:
+            conf = ModuleSetting.get_for_module(
+                'treeio.sales', 'default_order_product')[0]
+            self.fields['products_interested'].initial = [long(conf.value)]
+        except:
+            pass
+
+        self.fields['status'].queryset = Object.filter_permitted(
+            user, SaleStatus.objects.filter(use_leads=True))
+        self.fields['status'].label = _("Status")
+
+        try:
+            conf = ModuleSetting.get_for_module(
+                'treeio.sales', 'default_lead_status')[0]
+            self.fields['status'].initial = long(conf.value)
+        except:
+            pass
+
+        self.fields['contact_method'].label = _("Contact method")
+        self.fields['details'].label = _("Details")
+
+    class Meta:
+
+        "Lead Form"
+        model = Lead
+        fields = ('contact', 'source', 'products_interested', 'contact_method',
+                  'assigned', 'status', 'details')
+
+
+class LeadFilterForm(forms.ModelForm):
+
+    """ Ticket Filters definition """
+
+    def __init__(self, user, skip=None, *args, **kwargs):
+        if skip is None:
+            skip = []
+        super(LeadFilterForm, self).__init__(*args, **kwargs)
+
+        self.fields['contact'].queryset = Object.filter_permitted(
+            user, Contact.objects)
+        self.fields['contact'].widget.attrs.update({'class': 'autocomplete',
+                                                    'callback': reverse('identities_ajax_contact_lookup')})
+        self.fields['contact'].required = False
+        self.fields['contact'].label = _("Contact")
+
+        self.fields['products_interested'].queryset = Object.filter_permitted(
+            user, Product.objects)
+        self.fields['products_interested'].required = False
+        self.fields['products_interested'].help_text = ""
+        self.fields['products_interested'].label = _("Products interested")
+
+        self.fields['source'].queryset = Object.filter_permitted(user,
+                                                                 SaleSource.objects.filter(active=True))
+        self.fields['source'].required = False
+        self.fields['source'].label = _("Source")
+
+        self.fields['status'].queryset = Object.filter_permitted(user,
+                                                                 SaleStatus.objects.filter(use_leads=True))
+        self.fields['status'].required = False
+        self.fields['status'].label = _("Status")
+
+        self.fields['contact_method'].required = False
+        self.fields['contact_method'].label = _("Contact method")
+
+    class Meta:
+
+        "Lead Filter Form"
+        model = Lead
+        fields = (
+            'contact', 'source', 'products_interested', 'contact_method', 'status')
+
+
+class OpportunityForm(forms.ModelForm):
+
+    """ Opportunity form """
+
+    def __init__(self, user, lead, *args, **kwargs):
+        super(OpportunityForm, self).__init__(*args, **kwargs)
+
+        self.fields['lead'].queryset = Object.filter_permitted(
+            user, Lead.objects)
+        self.fields['contact'].queryset = Object.filter_permitted(
+            user, Contact.objects)
+        self.fields['contact'].widget.attrs.update(
+            {'popuplink': reverse('identities_contact_add')})
+        self.fields['contact'].widget.attrs.update({'class': 'autocomplete',
+                                                    'callback': reverse('identities_ajax_contact_lookup')})
+        self.fields['products_interested'].queryset = Object.filter_permitted(
+            user, Product.objects)
+        self.fields['products_interested'].widget.attrs.update(
+            {'popuplink': reverse('sales_product_add')})
+        try:
+            conf = ModuleSetting.get_for_module(
+                'treeio.sales', 'default_order_product')[0]
+            self.fields['products_interested'].initial = [long(conf.value)]
+        except:
+            pass
+        self.fields['source'].queryset = Object.filter_permitted(user,
+                                                                 SaleSource.objects.filter(active=True))
+        self.fields['status'].queryset = Object.filter_permitted(user,
+                                                                 SaleStatus.objects.filter(use_opportunities=True))
+        self.fields['assigned'].widget.attrs.update({'class': 'multicomplete',
+                                                     'callback': reverse('identities_ajax_user_lookup')})
+
+        try:
+            conf = ModuleSetting.get_for_module(
+                'treeio.sales', 'default_opportunity_status')[0]
+            self.fields['status'].initial = long(conf.value)
+        except:
+            pass
+
+        if lead:
+            self.fields['lead'].initial = lead.id
+            self.fields['contact'].initial = lead.contact_id
+            self.fields['products_interested'].initial = [
+                i.id for i in lead.products_interested.only('id')]
+            self.fields['source'].initial = lead.source_id
+            self.fields['assigned'].initial = [
+                i.id for i in lead.assigned.only('id')]
+        else:
+            del self.fields['lead']
+
+        self.fields['products_interested'].help_text = ""
+        self.fields['assigned'].help_text = ""
+
+        self.fields['expected_date'].widget.attrs.update(
+            {'class': 'datepicker'})
+        self.fields['closed_date'].widget.attrs.update({'class': 'datepicker'})
+
+        self.fields['contact'].label = _("Contact")
+        self.fields['products_interested'].label = _("Products interested")
+        self.fields['source'].label = _("Source")
+        self.fields['expected_date'].label = _("Expected date")
+        self.fields['closed_date'].label = _("Closed date")
+        self.fields['assigned'].label = _("Assigned to")
+        self.fields['amount_display'].label = _("Amount")
+        self.fields['amount_currency'].label = _("Currency")
+        self.fields['amount_currency'].widget.attrs.update(
+            {'popuplink': reverse('finance_currency_add')})
+        self.fields['amount_currency'].initial = Currency.objects.get(
+            is_default=True)
+
+        self.fields['probability'].label = _("Probability")
+        self.fields['status'].label = _("Status")
+        self.fields['details'].label = _("Details")
+
+    class Meta:
+
+        "Opportunity Form"
+        model = Opportunity
+        fields = ('lead', 'contact', 'products_interested', 'source',
+                  'expected_date', 'closed_date', 'assigned', 'amount_currency', 'amount_display', 'probability', 'status', 'details')
+
+
+class OpportunityFilterForm(forms.ModelForm):
+
+    """ Opportunity Filters """
+
+    def __init__(self, user, skip=None, *args, **kwargs):
+        if skip is None:
+            skip = []
+        super(OpportunityFilterForm, self).__init__(*args, **kwargs)
+
+        self.fields['contact'].queryset = Object.filter_permitted(
+            user, Contact.objects)
+        self.fields['contact'].widget.attrs.update({'class': 'autocomplete',
+                                                    'callback': reverse('identities_ajax_contact_lookup')})
+        self.fields['contact'].required = False
+        self.fields['contact'].label = _("Contact")
+
+        self.fields['source'].queryset = Object.filter_permitted(user,
+                                                                 SaleSource.objects.filter(active=True))
+        self.fields['source'].required = False
+        self.fields['source'].label = _("Source")
+
+        self.fields['products_interested'].queryset = Object.filter_permitted(user,
+                                                                              Product.objects.filter(active=True))
+        self.fields['products_interested'].required = False
+        self.fields['products_interested'].help_text = ""
+        self.fields['products_interested'].label = _("Products interested")
+
+        self.fields['status'].queryset = Object.filter_permitted(user,
+                                                                 SaleStatus.objects.filter(use_opportunities=True))
+        self.fields['status'].required = False
+        self.fields['status'].label = _("Status")
+
+    class Meta:
+
+        "Opportunity Filter Form"
+        model = Opportunity
+        fields = ('contact', 'products_interested', 'source', 'status')
diff --git a/data/treeio/treeio/treeio/sales/models.py b/data/treeio/treeio/treeio/sales/models.py
new file mode 100644
index 0000000..bda2fdb
--- /dev/null
+++ b/data/treeio/treeio/treeio/sales/models.py
@@ -0,0 +1,560 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+"""
+Sales module objects.
+
+"""
+from django.core.urlresolvers import reverse
+from django.db import models
+
+from treeio.core.models import Object, User, ModuleSetting
+from treeio.identities.models import Contact
+from treeio.finance.models import Transaction, Currency, Tax
+
+from datetime import datetime, timedelta, time
+from dateutil.relativedelta import relativedelta
+from decimal import Decimal, ROUND_UP
+from time import time as ttime
+
+
+class SaleStatus(Object):
+    "Status of the Sale"
+    name = models.CharField(max_length=512)
+    use_leads = models.BooleanField(default=False)
+    use_opportunities = models.BooleanField(default=False)
+    use_sales = models.BooleanField(default=False)
+    active = models.BooleanField(default=False)
+    hidden = models.BooleanField(default=False)
+    details = models.TextField(blank=True, null=True)
+
+    searchable = False
+
+    def __unicode__(self):
+        return unicode(self.name)
+
+    def get_absolute_url(self):
+        "Returns absolute URL"
+        try:
+            return reverse('sales_status_view', args=[self.id])
+        except Exception:
+            return ""
+
+    class Meta:
+
+        "SalesStatus"
+        ordering = ('hidden', '-active', 'name')
+
+
+class Product(Object):
+    "Single Product"
+    PRODUCT_TYPES = (
+        ('service', 'Service'),
+        ('good', 'Good'),
+        ('subscription', 'Subscription'),
+        ('compound', 'Compound'),
+    )
+
+    ACTION_CHOICES = (
+        ('inactive', 'Mark Inactive'),
+        ('notify', 'Notify'),
+        ('ignore', 'Ignore'),
+    )
+
+    name = models.CharField(max_length=512)
+    product_type = models.CharField(max_length=32, default='good',
+                                    choices=PRODUCT_TYPES)
+    parent = models.ForeignKey('self', blank=True, null=True,
+                               related_name='child_set')
+    code = models.CharField(max_length=512, blank=True, null=True)
+    supplier = models.ForeignKey(Contact, blank=True, null=True,
+                                 on_delete=models.SET_NULL)
+    supplier_code = models.IntegerField(blank=True, null=True)
+    buy_price = models.DecimalField(max_digits=20, decimal_places=2, default=0)
+    sell_price = models.DecimalField(
+        max_digits=20, decimal_places=2, default=0)
+    stock_quantity = models.IntegerField(blank=True, null=True)
+    active = models.BooleanField(default=False)
+    runout_action = models.CharField(max_length=32, blank=True, null=True,
+                                     choices=ACTION_CHOICES)
+    details = models.TextField(blank=True, null=True)
+
+    access_inherit = ('parent', '*module', '*user')
+
+    def __unicode__(self):
+        return unicode(self.name)
+
+    def get_absolute_url(self):
+        "Returns absolute URL"
+        try:
+            return reverse('sales_product_view', args=[self.id])
+        except:
+            return ""
+
+    class Meta:
+
+        "Product"
+        ordering = ['code']
+
+
+class SaleSource(Object):
+    "Source of Sale e.g. Search Engine"
+    name = models.CharField(max_length=512)
+    active = models.BooleanField(default=False)
+    details = models.TextField(blank=True, null=True)
+
+    searchable = False
+
+    def __unicode__(self):
+        return unicode(self.name)
+
+    def get_absolute_url(self):
+        "Returns absolute URL"
+        try:
+            return reverse('sales_source_view', args=[self.id])
+        except Exception:
+            return ""
+
+    class Meta:
+        ordering = ('-active', 'name')
+
+
+class Lead(Object):
+    "Lead"
+    CONTACT_METHODS = (
+        ('email', 'E-Mail'),
+        ('phone', 'Phone'),
+        ('post', 'Post'),
+        ('face', 'Face to Face')
+    )
+
+    contact = models.ForeignKey(Contact)
+    source = models.ForeignKey(
+        SaleSource, blank=True, null=True, on_delete=models.SET_NULL)
+    products_interested = models.ManyToManyField(
+        Product, blank=True, null=True)
+    contact_method = models.CharField(max_length=32, choices=CONTACT_METHODS)
+    assigned = models.ManyToManyField(User, related_name='sales_lead_assigned',
+                                      blank=True, null=True)
+    status = models.ForeignKey(SaleStatus)
+    details = models.TextField(blank=True, null=True)
+
+    access_inherit = ('contact', '*module', '*user')
+
+    def __unicode__(self):
+        return unicode(self.contact.name)
+
+    def get_absolute_url(self):
+        "Returns absolute URL"
+        try:
+            return reverse('sales_lead_view', args=[self.id])
+        except Exception:
+            return ""
+
+    class Meta:
+
+        "Lead"
+        ordering = ['contact']
+
+
+class Opportunity(Object):
+    "Opportunity"
+    lead = models.ForeignKey(
+        Lead, blank=True, null=True, on_delete=models.SET_NULL)
+    contact = models.ForeignKey(Contact)
+    products_interested = models.ManyToManyField(Product)
+    source = models.ForeignKey(
+        SaleSource, blank=True, null=True, on_delete=models.SET_NULL)
+    expected_date = models.DateField(blank=True, null=True)
+    closed_date = models.DateField(blank=True, null=True)
+    assigned = models.ManyToManyField(
+        User, related_name='sales_opportunity_assigned', blank=True, null=True)
+    status = models.ForeignKey(SaleStatus)
+    probability = models.DecimalField(
+        max_digits=3, decimal_places=0, blank=True, null=True)
+    amount = models.DecimalField(max_digits=20, decimal_places=2, default=0)
+    amount_currency = models.ForeignKey(Currency)
+    amount_display = models.DecimalField(
+        max_digits=20, decimal_places=2, default=0)
+    details = models.TextField(blank=True, null=True)
+
+    access_inherit = ('lead', 'contact', '*module', '*user')
+
+    def __unicode__(self):
+        return unicode(self.contact)
+
+    def get_absolute_url(self):
+        "Returns absolute URL"
+        try:
+            return reverse('sales_opportunity_view', args=[self.id])
+        except Exception:
+            return ""
+
+    class Meta:
+
+        "Opportunity"
+        ordering = ['-expected_date']
+
+
+class SaleOrder(Object):
+    "Sale Order"
+    reference = models.CharField(max_length=512, blank=True, null=True)
+    datetime = models.DateTimeField(default=datetime.now)
+    client = models.ForeignKey(
+        Contact, blank=True, null=True, on_delete=models.SET_NULL)
+    opportunity = models.ForeignKey(
+        Opportunity, blank=True, null=True, on_delete=models.SET_NULL)
+    payment = models.ManyToManyField(Transaction, blank=True, null=True)
+    source = models.ForeignKey(SaleSource)
+    assigned = models.ManyToManyField(
+        User, related_name='sales_saleorder_assigned', blank=True, null=True)
+    status = models.ForeignKey(SaleStatus)
+    currency = models.ForeignKey(Currency)
+    total = models.DecimalField(max_digits=20, decimal_places=2, default=0)
+    total_display = models.DecimalField(
+        max_digits=20, decimal_places=2, default=0)
+    details = models.TextField(blank=True, null=True)
+
+    access_inherit = ('opportunity', 'client', '*module', '*user')
+
+    def fulfil(self):
+        "Fulfil"
+        for p in self.orderedproduct_set.all():
+            if not p.fulfilled:
+                product = p.product
+                product.stock_quantity -= p.quantity
+                product.save()
+                p.fulfilled = True
+                p.save()
+            if p.subscription:
+                p.subscription.renew()
+
+    def get_next_reference(self):
+        try:
+            # Very dirty hack, but kinda works for reference (i.e. it doesn't
+            # have to be unique)
+            next_ref = SaleOrder.objects.all().aggregate(
+                models.Max('id'))['id__max'] + 1
+        except:
+            next_ref = 1
+        full_ref = '%.5d/%s' % (next_ref, str(str(ttime() * 10)[8:-2]))
+        return full_ref
+
+    def save(self, *args, **kwargs):
+        "Automatically set order reference"
+        super(SaleOrder, self).save(*args, **kwargs)
+        try:
+            conf = ModuleSetting.get_for_module(
+                'treeio.sales', 'order_fulfil_status')[0]
+            fulfil_status = long(conf.value)
+            if self.status.id == fulfil_status:
+                self.fulfil()
+        except Exception:
+            pass
+
+    def __unicode__(self):
+        return unicode(self.reference)
+
+    def get_absolute_url(self):
+        "Returns absolute URL"
+        try:
+            return reverse('sales_order_view', args=[self.id])
+        except Exception:
+            return ""
+
+    def get_taxes(self, base=False):
+        # TODO: Compound taxes
+        taxes = {}
+        ops = self.orderedproduct_set.filter(
+            trash=False).filter(tax__isnull=False)
+        for p in ops:
+            if base:
+                item_total = p.get_total()
+            else:
+                item_total = p.get_total_display()
+            if p.tax.id in taxes:
+                taxes[p.tax.id]['amount'] += (item_total * (p.tax.rate / 100)).quantize(Decimal('.01'),
+                                                                                        rounding=ROUND_UP)
+            else:
+                taxes[p.tax.id] = {'name': p.tax.name, 'rate': p.tax.rate,
+                                   'amount': (item_total * (p.tax.rate / 100))
+                                       .quantize(Decimal('.01'), rounding=ROUND_UP)}
+        return taxes
+
+    def get_taxes_total(self):
+        taxes = self.get_taxes()
+        total = 0
+        for tax in taxes.values():
+            total += tax['amount']
+        return total
+
+    def get_subtotal(self):
+        sum = 0
+        for p in self.orderedproduct_set.filter(trash=False):
+            sum += p.get_total()
+        self.total = sum
+        return sum
+
+    def get_subtotal_display(self):
+        sum = 0
+        for p in self.orderedproduct_set.filter(trash=False):
+            sum += p.get_total_display()
+        self.total_display = sum
+        return sum
+
+    def get_total(self):
+        sum = 0
+        for p in self.orderedproduct_set.filter(trash=False):
+            sum += p.get_total()
+        sum += self.get_taxes_total()
+        self.total = sum
+        return sum
+
+    def get_total_display(self):
+        sum = 0
+        for p in self.orderedproduct_set.filter(trash=False):
+            sum += p.get_total_display()
+        sum += self.get_taxes_total()
+        self.total_display = sum
+        return sum
+
+    def update_total(self):
+        self.get_total()
+        self.get_total_display()
+        self.save()
+
+    def get_total_paid(self):
+        return Decimal(
+            self.payment.filter(trash=False).aggregate(models.Sum('value_display'))['value_display__sum'] or '0')
+
+    def balance_due(self):
+        return self.get_total() - self.get_total_paid()
+
+    class Meta:
+
+        "SaleOrder"
+        ordering = ['-datetime']
+
+
+class Subscription(Object):
+    "Subscription"
+    CYCLE_PERIODS = (
+        ('daily', 'Daily'),
+        ('weekly', 'Weekly'),
+        ('monthly', 'Monthly'),
+        ('quarterly', 'Quarterly'),
+        ('yearly', 'Yearly')
+    )
+
+    client = models.ForeignKey(
+        Contact, blank=True, null=True, on_delete=models.SET_NULL)
+    product = models.ForeignKey(Product, blank=True, null=True)
+    start = models.DateField(default=datetime.now)
+    expiry = models.DateField(blank=True, null=True)
+    cycle_period = models.CharField(max_length=32, choices=CYCLE_PERIODS, default='month')
+    cycle_end = models.DateField(blank=True, null=True)
+    active = models.BooleanField(default=False)
+    details = models.CharField(max_length=512, blank=True, null=True)
+
+    access_inherit = ('client', 'product', '*module', '*user')
+
+    def get_cycle_start(self):
+        "Get the cycle start date"
+        if not self.cycle_end:
+            return None
+
+        cycle_end = self.cycle_end
+        # check if we're in the 5 day window before the cycle ends for this
+        # subscription
+        if self.cycle_period == 'monthly':
+            p = relativedelta(months=+1)
+        elif self.cycle_period == 'weekly':
+            p = timedelta(weeks=1)
+        elif self.cycle_period == 'daily':
+            p = timedelta(days=1)
+        elif self.cycle_period == 'quarterly':
+            p = relativedelta(months=+4)
+        elif self.cycle_period == 'yearly':
+            p = relativedelta(years=1)
+        else:
+            p = relativedelta(months=+1)
+
+        cycle_start = cycle_end - p
+        return cycle_start
+
+    def renew(self):
+        "Renew"
+        if self.cycle_period == 'monthly':
+            p = relativedelta(months=+1)
+        elif self.cycle_period == 'daily':
+            p = timedelta(days=1)
+        elif self.cycle_period == 'weekly':
+            p = timedelta(weeks=1)
+        elif self.cycle_period == 'quarterly':
+            p = relativedelta(months=+4)
+        elif self.cycle_period == 'yearly':
+            p = relativedelta(years=1)
+        else:
+            p = relativedelta(months=+1)
+
+        self.cycle_end = datetime.now().date() + p
+        self.save()
+
+    def activate(self):
+        "Activate"
+        if self.active:
+            return
+        self.renew()
+        self.active = True
+        self.save()
+
+    def deactivate(self):
+        "Deactivate"
+        if not self.active:
+            return
+        self.active = False
+        self.save()
+
+    def invoice(self):
+        "Create a new sale order for self"
+        new_invoice = SaleOrder()
+        try:
+            conf = ModuleSetting.get_for_module(
+                'treeio.sales', 'default_order_status')[0]
+            new_invoice.status = long(conf.value)
+        except Exception:
+            ss = SaleStatus.objects.all()[0]
+            new_invoice.status = ss
+        so = SaleSource.objects.all()[0]
+        new_invoice.source = so
+        new_invoice.client = self.client
+        new_invoice.reference = "Subscription Invoice " + \
+                                str(datetime.today().strftime('%Y-%m-%d'))
+        new_invoice.save()
+        try:
+            op = self.orderedproduct_set.filter(
+                trash=False).order_by('-date_created')[0]
+            opn = OrderedProduct()
+            opn.order = new_invoice
+            opn.product = self.product
+            opn.quantity = op.quantity
+            opn.discount = op.discount
+            opn.subscription = self
+            opn.save()
+        except IndexError:
+            opn = OrderedProduct()
+            opn.order = new_invoice
+            opn.product = self.product
+            opn.quantity = 1
+            opn.subscription = self
+            opn.save()
+        return new_invoice.reference
+
+    def check_status(self):
+        """
+        Checks and sets the state of the subscription
+        """
+        if not self.active:
+            return 'Inactive'
+        if self.expiry:
+            if datetime.now() > datetime.combine(self.expiry, time.min):
+                self.deactivate()
+                return 'Expired'
+
+        if not self.cycle_end:
+            self.renew()
+
+        cycle_end = self.cycle_end
+        # check if we're in the 5 day window before the cycle ends for this
+        # subscription
+        if datetime.now().date() >= cycle_end:
+            cycle_start = self.get_cycle_start()
+            # if we haven't already invoiced them, invoice them
+            grace = 3
+            if (datetime.now().date() - cycle_end > timedelta(days=grace)):
+                # Subscription has overrun and must be shut down
+                return self.deactivate()
+
+            try:
+                conf = ModuleSetting.get_for_module(
+                    'treeio.sales', 'order_fulfil_status')[0]
+                order_fulfil_status = SaleStatus.objects.get(
+                    pk=long(conf.value))
+            except Exception:
+                order_fulfil_status = None
+
+            if self.orderedproduct_set.filter(order__datetime__gte=cycle_start).filter(
+                    order__status=order_fulfil_status):
+                return 'Paid'
+            elif self.orderedproduct_set.filter(order__datetime__gte=cycle_start):
+                return 'Invoiced'
+            else:
+                self.invoice()
+                return 'Invoiced'
+        else:
+            return 'Active'
+
+    def __unicode__(self):
+        return unicode(self.product)
+
+    def get_absolute_url(self):
+        "Returns absolute URL"
+        try:
+            return reverse('sales_subscription_view', args=[self.id])
+        except Exception:
+            return ""
+
+    class Meta:
+        "Subscription"
+        ordering = ['expiry']
+
+
+class OrderedProduct(Object):
+    "Ordered Product"
+    subscription = models.ForeignKey(Subscription, blank=True, null=True)
+    product = models.ForeignKey(Product)
+    quantity = models.DecimalField(max_digits=30, decimal_places=2, default=1)
+    discount = models.DecimalField(max_digits=5, decimal_places=2, default=0)
+    tax = models.ForeignKey(
+        Tax, blank=True, null=True, on_delete=models.SET_NULL)
+    rate = models.DecimalField(max_digits=20, decimal_places=2)
+    rate_display = models.DecimalField(
+        max_digits=20, decimal_places=2, default=0)
+    order = models.ForeignKey(SaleOrder)
+    description = models.TextField(blank=True, null=True)
+    fulfilled = models.BooleanField(default=False)
+
+    access_inherit = ('order', '*module', '*user')
+
+    def __unicode__(self):
+        return unicode(self.product)
+
+    def get_absolute_url(self):
+        "Returns absolute URL"
+        try:
+            return reverse('sales_ordered_view', args=[self.id])
+        except Exception:
+            return ""
+
+    def get_total(self):
+        "Returns total sum for this item"
+        total = self.rate * self.quantity
+        if self.discount:
+            total = total - (total * self.discount / 100)
+        if total < 0:
+            total = Decimal(0)
+        return total.quantize(Decimal('.01'), rounding=ROUND_UP)
+
+    def get_total_display(self):
+        "Returns total sum for this item in the display currency"
+        total = self.rate_display * self.quantity
+        if self.discount:
+            total = total - (total * self.discount / 100)
+        if total < 0:
+            total = Decimal(0)
+        return total.quantize(Decimal('.01'), rounding=ROUND_UP)
+
+    class Meta:
+        ordering = ['product']
diff --git a/data/treeio/treeio/treeio/sales/south_migrations/0002_auto__del_updaterecord__add_field_orderedproduct_tax__add_field_ordere.py b/data/treeio/treeio/treeio/sales/south_migrations/0002_auto__del_updaterecord__add_field_orderedproduct_tax__add_field_ordere.py
new file mode 100644
index 0000000..70247da
--- /dev/null
+++ b/data/treeio/treeio/treeio/sales/south_migrations/0002_auto__del_updaterecord__add_field_orderedproduct_tax__add_field_ordere.py
@@ -0,0 +1,502 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+from decimal import Decimal
+from treeio.sales.models import OrderedProduct, Product
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        if not db.dry_run:
+            ops = OrderedProduct.objects.all()
+            ps = Product.objects.all()
+
+        # Deleting model 'UpdateRecord'
+        db.delete_table('sales_updaterecord')
+
+        # Adding field 'OrderedProduct.tax'
+        db.add_column('sales_orderedproduct', 'tax', self.gf('django.db.models.fields.related.ForeignKey')(
+            to=orm['finance.Tax'], null=True, blank=True), keep_default=False)
+
+        # Adding field 'OrderedProduct.rate'
+        db.add_column('sales_orderedproduct', 'rate', self.gf('django.db.models.fields.DecimalField')(
+            default=1, max_digits=20, decimal_places=2), keep_default=False)
+
+        # Adding field 'OrderedProduct.rate_display'
+        db.add_column('sales_orderedproduct', 'rate_display', self.gf('django.db.models.fields.DecimalField')(
+            default=0, max_digits=20, decimal_places=2), keep_default=False)
+
+        # Adding field 'OrderedProduct.description'
+        db.add_column('sales_orderedproduct', 'description', self.gf(
+            'django.db.models.fields.TextField')(null=True, blank=True), keep_default=False)
+
+        if not db.dry_run:
+            # convert old Float fields to temporary fields
+            for op in ops:
+                op.discount_f = op.discount
+                op.discount = 0
+                op.quantity_f = op.quantity
+                op.quantity = 0
+                op.save()
+
+        # Changing field 'OrderedProduct.discount'
+        db.alter_column('sales_orderedproduct', 'discount', self.gf(
+            'django.db.models.fields.DecimalField')(max_digits=4, decimal_places=2))
+
+        # Changing field 'OrderedProduct.quantity'
+        db.alter_column('sales_orderedproduct', 'quantity', self.gf(
+            'django.db.models.fields.DecimalField')(max_digits=30, decimal_places=2))
+
+        if not db.dry_run:
+            for p in ps:
+                p.buy_price_f = p.buy_price
+                p.buy_price = 0
+                p.sell_price_f = p.sell_price
+                p.sell_price = 0
+                p.save()
+
+        # Changing field 'Product.buy_price'
+        db.alter_column('sales_product', 'buy_price', self.gf(
+            'django.db.models.fields.DecimalField')(max_digits=20, decimal_places=2))
+
+        # Changing field 'Product.sell_price'
+        db.alter_column('sales_product', 'sell_price', self.gf(
+            'django.db.models.fields.DecimalField')(max_digits=20, decimal_places=2))
+
+        # Adding field 'Opportunity.amount_currency'
+        db.add_column('sales_opportunity', 'amount_currency', self.gf(
+            'django.db.models.fields.related.ForeignKey')(default=1, to=orm['finance.Currency']), keep_default=False)
+
+        # Adding field 'Opportunity.amount_display'
+        db.add_column('sales_opportunity', 'amount_display', self.gf('django.db.models.fields.DecimalField')(
+            default=1, max_digits=20, decimal_places=2), keep_default=False)
+
+        # Changing field 'Opportunity.probability'
+        db.alter_column('sales_opportunity', 'probability', self.gf(
+            'django.db.models.fields.DecimalField')(null=True, max_digits=3, decimal_places=0))
+
+        # Changing field 'Opportunity.amount'
+        db.alter_column('sales_opportunity', 'amount', self.gf(
+            'django.db.models.fields.DecimalField')(max_digits=20, decimal_places=2))
+
+        # Deleting field 'SaleOrder.payment'
+        db.delete_column('sales_saleorder', 'payment_id')
+
+        # Adding field 'SaleOrder.currency'
+        db.add_column('sales_saleorder', 'currency', self.gf('django.db.models.fields.related.ForeignKey')(
+            default=1, to=orm['finance.Currency']), keep_default=False)
+
+        # Adding field 'SaleOrder.total'
+        db.add_column('sales_saleorder', 'total', self.gf('django.db.models.fields.DecimalField')(
+            default=0, max_digits=20, decimal_places=2), keep_default=False)
+
+        # Adding field 'SaleOrder.total_display'
+        db.add_column('sales_saleorder', 'total_display', self.gf('django.db.models.fields.DecimalField')(
+            default=0, max_digits=20, decimal_places=2), keep_default=False)
+
+        # Adding M2M table for field payment on 'SaleOrder'
+        db.create_table('sales_saleorder_payment', (
+            ('id', models.AutoField(
+                verbose_name='ID', primary_key=True, auto_created=True)),
+            ('saleorder', models.ForeignKey(
+                orm['sales.saleorder'], null=False)),
+            ('transaction', models.ForeignKey(
+                orm['finance.transaction'], null=False))
+        ))
+        db.create_unique(
+            'sales_saleorder_payment', ['saleorder_id', 'transaction_id'])
+
+        if not db.dry_run:
+            # convert temporary fields back into decimal
+            for op in ops:
+                if op.discount_f:
+                    op.discount = Decimal(unicode(op.discount_f)).quantize(
+                        Decimal('.01'), 'ROUND_DOWN')
+                if op.quantity_f:
+                    op.quantity = int(op.quantity_f)
+                op.save()
+
+            for p in ps:
+                if p.buy_price_f:
+                    p.buy_price = Decimal(unicode(p.buy_price_f))
+                if p.sell_price_f:
+                    p.sell_price = Decimal(unicode(p.sell_price_f))
+                p.save()
+
+    def backwards(self, orm):
+
+        # Adding model 'UpdateRecord'
+        db.create_table('sales_updaterecord', (
+            ('lead', self.gf('django.db.models.fields.related.ForeignKey')
+             (to=orm['sales.Lead'], null=True, blank=True)),
+            ('object_ptr', self.gf('django.db.models.fields.related.OneToOneField')(
+                to=orm['core.Object'], unique=True, primary_key=True)),
+            ('record_type', self.gf(
+                'django.db.models.fields.CharField')(max_length=32)),
+            ('details', self.gf('django.db.models.fields.TextField')
+             (null=True, blank=True)),
+            ('opportunity', self.gf('django.db.models.fields.related.ForeignKey')(
+                to=orm['sales.Opportunity'], null=True, blank=True)),
+            ('order', self.gf('django.db.models.fields.related.ForeignKey')
+             (to=orm['sales.SaleOrder'], null=True, blank=True)),
+        ))
+        db.send_create_signal('sales', ['UpdateRecord'])
+
+        # Deleting field 'OrderedProduct.tax'
+        db.delete_column('sales_orderedproduct', 'tax_id')
+
+        # Deleting field 'OrderedProduct.rate'
+        db.delete_column('sales_orderedproduct', 'rate')
+
+        # Deleting field 'OrderedProduct.rate_display'
+        db.delete_column('sales_orderedproduct', 'rate_display')
+
+        # Deleting field 'OrderedProduct.description'
+        db.delete_column('sales_orderedproduct', 'description')
+
+        # Changing field 'OrderedProduct.discount'
+        db.alter_column('sales_orderedproduct', 'discount', self.gf(
+            'django.db.models.fields.FloatField')(null=True))
+
+        # Changing field 'OrderedProduct.quantity'
+        db.alter_column('sales_orderedproduct', 'quantity', self.gf(
+            'django.db.models.fields.PositiveIntegerField')())
+
+        # Changing field 'Product.buy_price'
+        db.alter_column('sales_product', 'buy_price', self.gf(
+            'django.db.models.fields.FloatField')(null=True))
+
+        # Changing field 'Product.sell_price'
+        db.alter_column('sales_product', 'sell_price', self.gf(
+            'django.db.models.fields.FloatField')(null=True))
+
+        # Deleting field 'Opportunity.amount_currency'
+        db.delete_column('sales_opportunity', 'amount_currency_id')
+
+        # Deleting field 'Opportunity.amount_display'
+        db.delete_column('sales_opportunity', 'amount_display')
+
+        # Changing field 'Opportunity.probability'
+        db.alter_column('sales_opportunity', 'probability', self.gf(
+            'django.db.models.fields.FloatField')(null=True))
+
+        # Changing field 'Opportunity.amount'
+        db.alter_column('sales_opportunity', 'amount', self.gf(
+            'django.db.models.fields.FloatField')())
+
+        # Adding field 'SaleOrder.payment'
+        db.add_column('sales_saleorder', 'payment', self.gf('django.db.models.fields.related.ForeignKey')(
+            to=orm['finance.Transaction'], null=True, blank=True), keep_default=False)
+
+        # Deleting field 'SaleOrder.currency'
+        db.delete_column('sales_saleorder', 'currency_id')
+
+        # Deleting field 'SaleOrder.total'
+        db.delete_column('sales_saleorder', 'total')
+
+        # Deleting field 'SaleOrder.total_display'
+        db.delete_column('sales_saleorder', 'total_display')
+
+        # Removing M2M table for field payment on 'SaleOrder'
+        db.delete_table('sales_saleorder_payment')
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'core.accessentity': {
+            'Meta': {'object_name': 'AccessEntity'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        },
+        'core.comment': {
+            'Meta': {'object_name': 'Comment'},
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'}),
+            'body': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"})
+        },
+        'core.group': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Group'},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['core.Group']"})
+        },
+        'core.object': {
+            'Meta': {'object_name': 'Object'},
+            'comments': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.Comment']"}),
+            'creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'objects_created'", 'null': 'True', 'to': "orm['core.User']"}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'full_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_full_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'links': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'links_rel_+'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'nuvius_resource': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'object_name': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'object_type': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'read_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_read_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'subscribers': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'subscriptions'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Tag']", 'null': 'True', 'blank': 'True'}),
+            'trash': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+        },
+        'core.tag': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Tag'},
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'})
+        },
+        'core.user': {
+            'Meta': {'ordering': "['name']", 'object_name': 'User'},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'default_group': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'default_user_set'", 'null': 'True', 'to': "orm['core.AccessEntity']"}),
+            'disabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_access': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'other_groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'finance.account': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Account', '_ormbases': ['core.Object']},
+            'balance': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '20', 'decimal_places': '2'}),
+            'balance_currency': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Currency']"}),
+            'balance_display': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '20', 'decimal_places': '2'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.Contact']"})
+        },
+        'finance.category': {
+            'Meta': {'object_name': 'Category', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'finance.currency': {
+            'Meta': {'object_name': 'Currency', '_ormbases': ['core.Object']},
+            'code': ('django.db.models.fields.CharField', [], {'max_length': '3'}),
+            'factor': ('django.db.models.fields.DecimalField', [], {'default': '1', 'max_digits': '10', 'decimal_places': '4'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_default': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'symbol': ('django.db.models.fields.CharField', [], {'max_length': '1', 'null': 'True', 'blank': 'True'})
+        },
+        'finance.liability': {
+            'Meta': {'ordering': "['-due_date']", 'object_name': 'Liability', '_ormbases': ['core.Object']},
+            'account': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Account']"}),
+            'category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Category']", 'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'due_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'source': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'finance_liability_source'", 'to': "orm['identities.Contact']"}),
+            'target': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'finance_liability_target'", 'to': "orm['identities.Contact']"}),
+            'value': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '20', 'decimal_places': '2'}),
+            'value_currency': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Currency']"}),
+            'value_display': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '20', 'decimal_places': '2'})
+        },
+        'finance.tax': {
+            'Meta': {'object_name': 'Tax', '_ormbases': ['core.Object']},
+            'compound': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'rate': ('django.db.models.fields.DecimalField', [], {'max_digits': '4', 'decimal_places': '2'})
+        },
+        'finance.transaction': {
+            'Meta': {'ordering': "['-datetime']", 'object_name': 'Transaction', '_ormbases': ['core.Object']},
+            'account': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Account']"}),
+            'category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Category']", 'null': 'True', 'blank': 'True'}),
+            'datetime': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'details': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'liability': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Liability']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'source': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'finance_transaction_source'", 'to': "orm['identities.Contact']"}),
+            'target': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'finance_transaction_target'", 'to': "orm['identities.Contact']"}),
+            'value': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '20', 'decimal_places': '2'}),
+            'value_currency': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Currency']"}),
+            'value_display': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '20', 'decimal_places': '2'})
+        },
+        'identities.contact': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Contact', '_ormbases': ['core.Object']},
+            'contact_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.ContactType']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['identities.Contact']"}),
+            'related_group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'related_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.AccessEntity']", 'null': 'True', 'blank': 'True'})
+        },
+        'identities.contactfield': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ContactField', '_ormbases': ['core.Object']},
+            'allowed_values': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'field_type': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'required': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'identities.contacttype': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ContactType', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'fields': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['identities.ContactField']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'slug': ('django.db.models.fields.CharField', [], {'max_length': '256'})
+        },
+        'sales.lead': {
+            'Meta': {'ordering': "['contact']", 'object_name': 'Lead', '_ormbases': ['core.Object']},
+            'assigned': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'sales_lead_assigned'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'contact': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.Contact']"}),
+            'contact_method': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'products_interested': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['sales.Product']", 'null': 'True', 'blank': 'True'}),
+            'source': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['sales.SaleSource']", 'null': 'True', 'blank': 'True'}),
+            'status': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['sales.SaleStatus']"})
+        },
+        'sales.opportunity': {
+            'Meta': {'ordering': "['-expected_date']", 'object_name': 'Opportunity', '_ormbases': ['core.Object']},
+            'amount': ('django.db.models.fields.DecimalField', [], {'max_digits': '20', 'decimal_places': '2'}),
+            'amount_currency': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Currency']"}),
+            'amount_display': ('django.db.models.fields.DecimalField', [], {'max_digits': '20', 'decimal_places': '2'}),
+            'assigned': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'sales_opportunity_assigned'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'closed_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'contact': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.Contact']"}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'expected_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'lead': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['sales.Lead']", 'null': 'True', 'blank': 'True'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'probability': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '3', 'decimal_places': '0', 'blank': 'True'}),
+            'products_interested': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['sales.Product']", 'symmetrical': 'False'}),
+            'source': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['sales.SaleSource']", 'null': 'True', 'blank': 'True'}),
+            'status': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['sales.SaleStatus']"})
+        },
+        'sales.orderedproduct': {
+            'Meta': {'ordering': "['product']", 'object_name': 'OrderedProduct', '_ormbases': ['core.Object']},
+            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'discount': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '4', 'decimal_places': '2'}),
+            'fulfilled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'order': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['sales.SaleOrder']"}),
+            'product': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['sales.Product']"}),
+            'quantity': ('django.db.models.fields.DecimalField', [], {'default': '1', 'max_digits': '4', 'decimal_places': '2'}),
+            'rate': ('django.db.models.fields.DecimalField', [], {'max_digits': '20', 'decimal_places': '2'}),
+            'rate_display': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '20', 'decimal_places': '2'}),
+            'subscription': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['sales.Subscription']", 'null': 'True', 'blank': 'True'}),
+            'tax': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Tax']", 'null': 'True', 'blank': 'True'})
+        },
+        'sales.product': {
+            'Meta': {'ordering': "['code']", 'object_name': 'Product', '_ormbases': ['core.Object']},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'buy_price': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '20', 'decimal_places': '2'}),
+            'code': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['sales.Product']"}),
+            'product_type': ('django.db.models.fields.CharField', [], {'default': "'good'", 'max_length': '32'}),
+            'runout_action': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'sell_price': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '20', 'decimal_places': '2'}),
+            'stock_quantity': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'supplier': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.Contact']", 'null': 'True', 'blank': 'True'}),
+            'supplier_code': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'})
+        },
+        'sales.saleorder': {
+            'Meta': {'ordering': "['-datetime']", 'object_name': 'SaleOrder', '_ormbases': ['core.Object']},
+            'assigned': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'sales_saleorder_assigned'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'client': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.Contact']", 'null': 'True', 'blank': 'True'}),
+            'currency': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Currency']"}),
+            'datetime': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'opportunity': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['sales.Opportunity']", 'null': 'True', 'blank': 'True'}),
+            'payment': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['finance.Transaction']", 'null': 'True', 'blank': 'True'}),
+            'reference': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'source': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['sales.SaleSource']"}),
+            'status': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['sales.SaleStatus']"}),
+            'total': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '20', 'decimal_places': '2'}),
+            'total_display': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '20', 'decimal_places': '2'})
+        },
+        'sales.salesource': {
+            'Meta': {'ordering': "('-active', 'name')", 'object_name': 'SaleSource', '_ormbases': ['core.Object']},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'sales.salestatus': {
+            'Meta': {'ordering': "('hidden', '-active', 'name')", 'object_name': 'SaleStatus', '_ormbases': ['core.Object']},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'hidden': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'use_leads': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'use_opportunities': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'use_sales': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'sales.subscription': {
+            'Meta': {'ordering': "['expiry']", 'object_name': 'Subscription', '_ormbases': ['core.Object']},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'client': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.Contact']", 'null': 'True', 'blank': 'True'}),
+            'cycle_end': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'cycle_period': ('django.db.models.fields.CharField', [], {'default': "'month'", 'max_length': '32'}),
+            'details': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'expiry': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'product': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['sales.Product']", 'null': 'True', 'blank': 'True'}),
+            'start': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime.now'})
+        }
+    }
+
+    complete_apps = ['sales']
diff --git a/data/treeio/treeio/treeio/sales/south_migrations/0003_treeiocurrency.py b/data/treeio/treeio/treeio/sales/south_migrations/0003_treeiocurrency.py
new file mode 100644
index 0000000..7cd1a72
--- /dev/null
+++ b/data/treeio/treeio/treeio/sales/south_migrations/0003_treeiocurrency.py
@@ -0,0 +1,339 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import DataMigration
+from django.db import models
+from treeio.finance.models import Currency
+from treeio.sales.models import SaleOrder, Opportunity, OrderedProduct
+
+
+class Migration(DataMigration):
+
+    def forwards(self, orm):
+        "Add currencies to financial items"
+        try:
+            currency = Currency.objects.get(is_default=True)
+        except:
+            currency = Currency.objects.create()
+            currency.code = "USD"
+            currency.name = "USD  United States of America, Dollars"
+            currency.symbol = u"$"
+            currency.is_default = True
+            currency.save()
+
+        for obj in SaleOrder.objects.all():
+            obj.currency = currency
+            obj.save()
+
+        for obj in Opportunity.objects.all():
+            obj.amount_currency = currency
+            obj.amount_display = obj.amount
+            obj.save()
+
+        for obj in OrderedProduct.objects.all():
+            obj.rate = obj.product.sell_price
+            obj.rate_display = obj.rate
+            obj.save()
+
+        for obj in SaleOrder.objects.all():
+            obj.update_total()
+
+    def backwards(self, orm):
+        raise RuntimeError("Cannot reverse this migration.")
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'core.accessentity': {
+            'Meta': {'object_name': 'AccessEntity'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        },
+        'core.comment': {
+            'Meta': {'object_name': 'Comment'},
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'}),
+            'body': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"})
+        },
+        'core.group': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Group'},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['core.Group']"})
+        },
+        'core.object': {
+            'Meta': {'object_name': 'Object'},
+            'comments': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.Comment']"}),
+            'creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'objects_created'", 'null': 'True', 'to': "orm['core.User']"}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'full_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_full_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'links': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'links_rel_+'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'nuvius_resource': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'object_name': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'object_type': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'read_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_read_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'subscribers': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'subscriptions'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Tag']", 'null': 'True', 'blank': 'True'}),
+            'trash': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+        },
+        'core.tag': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Tag'},
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'})
+        },
+        'core.user': {
+            'Meta': {'ordering': "['name']", 'object_name': 'User'},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'default_group': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'default_user_set'", 'null': 'True', 'to': "orm['core.AccessEntity']"}),
+            'disabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_access': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'other_groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'finance.account': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Account', '_ormbases': ['core.Object']},
+            'balance': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '20', 'decimal_places': '2'}),
+            'balance_currency': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Currency']"}),
+            'balance_display': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '20', 'decimal_places': '2'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.Contact']"})
+        },
+        'finance.category': {
+            'Meta': {'object_name': 'Category', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'finance.currency': {
+            'Meta': {'object_name': 'Currency', '_ormbases': ['core.Object']},
+            'code': ('django.db.models.fields.CharField', [], {'max_length': '3'}),
+            'factor': ('django.db.models.fields.DecimalField', [], {'default': '1', 'max_digits': '10', 'decimal_places': '4'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_default': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'symbol': ('django.db.models.fields.CharField', [], {'max_length': '1', 'null': 'True', 'blank': 'True'})
+        },
+        'finance.liability': {
+            'Meta': {'ordering': "['-due_date']", 'object_name': 'Liability', '_ormbases': ['core.Object']},
+            'account': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Account']"}),
+            'category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Category']", 'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'due_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'source': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'finance_liability_source'", 'to': "orm['identities.Contact']"}),
+            'target': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'finance_liability_target'", 'to': "orm['identities.Contact']"}),
+            'value': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '20', 'decimal_places': '2'}),
+            'value_currency': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Currency']"}),
+            'value_display': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '20', 'decimal_places': '2'})
+        },
+        'finance.tax': {
+            'Meta': {'object_name': 'Tax', '_ormbases': ['core.Object']},
+            'compound': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'rate': ('django.db.models.fields.DecimalField', [], {'max_digits': '4', 'decimal_places': '2'})
+        },
+        'finance.transaction': {
+            'Meta': {'ordering': "['-datetime']", 'object_name': 'Transaction', '_ormbases': ['core.Object']},
+            'account': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Account']"}),
+            'category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Category']", 'null': 'True', 'blank': 'True'}),
+            'datetime': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'details': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'liability': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Liability']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'source': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'finance_transaction_source'", 'to': "orm['identities.Contact']"}),
+            'target': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'finance_transaction_target'", 'to': "orm['identities.Contact']"}),
+            'value': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '20', 'decimal_places': '2'}),
+            'value_currency': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Currency']"}),
+            'value_display': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '20', 'decimal_places': '2'})
+        },
+        'identities.contact': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Contact', '_ormbases': ['core.Object']},
+            'contact_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.ContactType']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['identities.Contact']"}),
+            'related_group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'related_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.AccessEntity']", 'null': 'True', 'blank': 'True'})
+        },
+        'identities.contactfield': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ContactField', '_ormbases': ['core.Object']},
+            'allowed_values': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'field_type': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'required': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'identities.contacttype': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ContactType', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'fields': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['identities.ContactField']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'slug': ('django.db.models.fields.CharField', [], {'max_length': '256'})
+        },
+        'sales.lead': {
+            'Meta': {'ordering': "['contact']", 'object_name': 'Lead', '_ormbases': ['core.Object']},
+            'assigned': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'sales_lead_assigned'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'contact': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.Contact']"}),
+            'contact_method': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'products_interested': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['sales.Product']", 'null': 'True', 'blank': 'True'}),
+            'source': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['sales.SaleSource']", 'null': 'True', 'blank': 'True'}),
+            'status': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['sales.SaleStatus']"})
+        },
+        'sales.opportunity': {
+            'Meta': {'ordering': "['-expected_date']", 'object_name': 'Opportunity', '_ormbases': ['core.Object']},
+            'amount': ('django.db.models.fields.DecimalField', [], {'max_digits': '20', 'decimal_places': '2'}),
+            'amount_currency': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Currency']"}),
+            'amount_display': ('django.db.models.fields.DecimalField', [], {'max_digits': '20', 'decimal_places': '2'}),
+            'assigned': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'sales_opportunity_assigned'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'closed_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'contact': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.Contact']"}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'expected_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'lead': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['sales.Lead']", 'null': 'True', 'blank': 'True'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'probability': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '3', 'decimal_places': '0', 'blank': 'True'}),
+            'products_interested': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['sales.Product']", 'symmetrical': 'False'}),
+            'source': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['sales.SaleSource']", 'null': 'True', 'blank': 'True'}),
+            'status': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['sales.SaleStatus']"})
+        },
+        'sales.orderedproduct': {
+            'Meta': {'ordering': "['product']", 'object_name': 'OrderedProduct', '_ormbases': ['core.Object']},
+            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'discount': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '4', 'decimal_places': '2'}),
+            'fulfilled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'order': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['sales.SaleOrder']"}),
+            'product': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['sales.Product']"}),
+            'quantity': ('django.db.models.fields.DecimalField', [], {'default': '1', 'max_digits': '4', 'decimal_places': '2'}),
+            'rate': ('django.db.models.fields.DecimalField', [], {'max_digits': '20', 'decimal_places': '2'}),
+            'rate_display': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '20', 'decimal_places': '2'}),
+            'subscription': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['sales.Subscription']", 'null': 'True', 'blank': 'True'}),
+            'tax': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Tax']", 'null': 'True', 'blank': 'True'})
+        },
+        'sales.product': {
+            'Meta': {'ordering': "['code']", 'object_name': 'Product', '_ormbases': ['core.Object']},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'buy_price': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '20', 'decimal_places': '2'}),
+            'code': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['sales.Product']"}),
+            'product_type': ('django.db.models.fields.CharField', [], {'default': "'good'", 'max_length': '32'}),
+            'runout_action': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'sell_price': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '20', 'decimal_places': '2'}),
+            'stock_quantity': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'supplier': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.Contact']", 'null': 'True', 'blank': 'True'}),
+            'supplier_code': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'})
+        },
+        'sales.saleorder': {
+            'Meta': {'ordering': "['-datetime']", 'object_name': 'SaleOrder', '_ormbases': ['core.Object']},
+            'assigned': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'sales_saleorder_assigned'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'client': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.Contact']", 'null': 'True', 'blank': 'True'}),
+            'currency': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Currency']"}),
+            'datetime': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'opportunity': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['sales.Opportunity']", 'null': 'True', 'blank': 'True'}),
+            'payment': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['finance.Transaction']", 'null': 'True', 'blank': 'True'}),
+            'reference': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'source': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['sales.SaleSource']"}),
+            'status': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['sales.SaleStatus']"}),
+            'total': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '20', 'decimal_places': '2'}),
+            'total_display': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '20', 'decimal_places': '2'})
+        },
+        'sales.salesource': {
+            'Meta': {'ordering': "('-active', 'name')", 'object_name': 'SaleSource', '_ormbases': ['core.Object']},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'sales.salestatus': {
+            'Meta': {'ordering': "('hidden', '-active', 'name')", 'object_name': 'SaleStatus', '_ormbases': ['core.Object']},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'hidden': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'use_leads': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'use_opportunities': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'use_sales': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'sales.subscription': {
+            'Meta': {'ordering': "['expiry']", 'object_name': 'Subscription', '_ormbases': ['core.Object']},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'client': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.Contact']", 'null': 'True', 'blank': 'True'}),
+            'cycle_end': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'cycle_period': ('django.db.models.fields.CharField', [], {'default': "'month'", 'max_length': '32'}),
+            'details': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'expiry': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'product': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['sales.Product']", 'null': 'True', 'blank': 'True'}),
+            'start': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime.now'})
+        }
+    }
+
+    complete_apps = ['sales']
diff --git a/data/treeio/treeio/treeio/sales/south_migrations/0004_auto__chg_field_orderedproduct_quantity.py b/data/treeio/treeio/treeio/sales/south_migrations/0004_auto__chg_field_orderedproduct_quantity.py
new file mode 100644
index 0000000..4c972b3
--- /dev/null
+++ b/data/treeio/treeio/treeio/sales/south_migrations/0004_auto__chg_field_orderedproduct_quantity.py
@@ -0,0 +1,314 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Changing field 'OrderedProduct.quantity'
+        db.alter_column('sales_orderedproduct', 'quantity', self.gf(
+            'django.db.models.fields.DecimalField')(max_digits=30, decimal_places=2))
+
+    def backwards(self, orm):
+
+        # Changing field 'OrderedProduct.quantity'
+        db.alter_column('sales_orderedproduct', 'quantity', self.gf(
+            'django.db.models.fields.DecimalField')(max_digits=4, decimal_places=2))
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'core.accessentity': {
+            'Meta': {'object_name': 'AccessEntity'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        },
+        'core.comment': {
+            'Meta': {'object_name': 'Comment'},
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'}),
+            'body': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"})
+        },
+        'core.group': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Group', '_ormbases': ['core.AccessEntity']},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True', 'primary_key': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['core.Group']"})
+        },
+        'core.object': {
+            'Meta': {'object_name': 'Object'},
+            'comments': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.Comment']"}),
+            'creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'objects_created'", 'null': 'True', 'to': "orm['core.User']"}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'full_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_full_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'links': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'links_rel_+'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'nuvius_resource': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'object_name': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'object_type': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'read_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_read_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'subscribers': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'subscriptions'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Tag']", 'null': 'True', 'blank': 'True'}),
+            'trash': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'core.tag': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Tag'},
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'})
+        },
+        'core.user': {
+            'Meta': {'ordering': "['name']", 'object_name': 'User', '_ormbases': ['core.AccessEntity']},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True', 'primary_key': 'True'}),
+            'default_group': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'default_user_set'", 'null': 'True', 'to': "orm['core.Group']"}),
+            'disabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_access': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'other_groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'finance.account': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Account', '_ormbases': ['core.Object']},
+            'balance': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '20', 'decimal_places': '2'}),
+            'balance_currency': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Currency']"}),
+            'balance_display': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '20', 'decimal_places': '2'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.Contact']"})
+        },
+        'finance.category': {
+            'Meta': {'object_name': 'Category', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'finance.currency': {
+            'Meta': {'object_name': 'Currency', '_ormbases': ['core.Object']},
+            'code': ('django.db.models.fields.CharField', [], {'max_length': '3'}),
+            'factor': ('django.db.models.fields.DecimalField', [], {'default': '1', 'max_digits': '10', 'decimal_places': '4'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_default': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'symbol': ('django.db.models.fields.CharField', [], {'max_length': '1', 'null': 'True', 'blank': 'True'})
+        },
+        'finance.liability': {
+            'Meta': {'ordering': "['-due_date']", 'object_name': 'Liability', '_ormbases': ['core.Object']},
+            'account': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Account']"}),
+            'category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Category']", 'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'due_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'source': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'finance_liability_source'", 'to': "orm['identities.Contact']"}),
+            'target': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'finance_liability_target'", 'to': "orm['identities.Contact']"}),
+            'value': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '20', 'decimal_places': '2'}),
+            'value_currency': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Currency']"}),
+            'value_display': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '20', 'decimal_places': '2'})
+        },
+        'finance.tax': {
+            'Meta': {'object_name': 'Tax', '_ormbases': ['core.Object']},
+            'compound': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'rate': ('django.db.models.fields.DecimalField', [], {'max_digits': '4', 'decimal_places': '2'})
+        },
+        'finance.transaction': {
+            'Meta': {'ordering': "['-datetime']", 'object_name': 'Transaction', '_ormbases': ['core.Object']},
+            'account': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Account']"}),
+            'category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Category']", 'null': 'True', 'blank': 'True'}),
+            'datetime': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'details': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'liability': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Liability']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'source': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'finance_transaction_source'", 'to': "orm['identities.Contact']"}),
+            'target': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'finance_transaction_target'", 'to': "orm['identities.Contact']"}),
+            'value': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '20', 'decimal_places': '2'}),
+            'value_currency': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Currency']"}),
+            'value_display': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '20', 'decimal_places': '2'})
+        },
+        'identities.contact': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Contact', '_ormbases': ['core.Object']},
+            'contact_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.ContactType']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['identities.Contact']"}),
+            'related_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.AccessEntity']", 'null': 'True', 'blank': 'True'})
+        },
+        'identities.contactfield': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ContactField', '_ormbases': ['core.Object']},
+            'allowed_values': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'field_type': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'required': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'identities.contacttype': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ContactType', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'fields': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['identities.ContactField']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'slug': ('django.db.models.fields.CharField', [], {'max_length': '256'})
+        },
+        'sales.lead': {
+            'Meta': {'ordering': "['contact']", 'object_name': 'Lead', '_ormbases': ['core.Object']},
+            'assigned': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'sales_lead_assigned'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'contact': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.Contact']"}),
+            'contact_method': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'products_interested': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['sales.Product']", 'null': 'True', 'blank': 'True'}),
+            'source': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['sales.SaleSource']", 'null': 'True', 'blank': 'True'}),
+            'status': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['sales.SaleStatus']"})
+        },
+        'sales.opportunity': {
+            'Meta': {'ordering': "['-expected_date']", 'object_name': 'Opportunity', '_ormbases': ['core.Object']},
+            'amount': ('django.db.models.fields.DecimalField', [], {'max_digits': '20', 'decimal_places': '2'}),
+            'amount_currency': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Currency']"}),
+            'amount_display': ('django.db.models.fields.DecimalField', [], {'max_digits': '20', 'decimal_places': '2'}),
+            'assigned': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'sales_opportunity_assigned'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'closed_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'contact': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.Contact']"}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'expected_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'lead': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['sales.Lead']", 'null': 'True', 'blank': 'True'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'probability': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '3', 'decimal_places': '0', 'blank': 'True'}),
+            'products_interested': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['sales.Product']", 'symmetrical': 'False'}),
+            'source': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['sales.SaleSource']", 'null': 'True', 'blank': 'True'}),
+            'status': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['sales.SaleStatus']"})
+        },
+        'sales.orderedproduct': {
+            'Meta': {'ordering': "['product']", 'object_name': 'OrderedProduct', '_ormbases': ['core.Object']},
+            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'discount': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '4', 'decimal_places': '2'}),
+            'fulfilled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'order': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['sales.SaleOrder']"}),
+            'product': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['sales.Product']"}),
+            'quantity': ('django.db.models.fields.DecimalField', [], {'default': '1', 'max_digits': '30', 'decimal_places': '2'}),
+            'rate': ('django.db.models.fields.DecimalField', [], {'max_digits': '20', 'decimal_places': '2'}),
+            'rate_display': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '20', 'decimal_places': '2'}),
+            'subscription': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['sales.Subscription']", 'null': 'True', 'blank': 'True'}),
+            'tax': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Tax']", 'null': 'True', 'blank': 'True'})
+        },
+        'sales.product': {
+            'Meta': {'ordering': "['code']", 'object_name': 'Product', '_ormbases': ['core.Object']},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'buy_price': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '20', 'decimal_places': '2'}),
+            'code': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['sales.Product']"}),
+            'product_type': ('django.db.models.fields.CharField', [], {'default': "'good'", 'max_length': '32'}),
+            'runout_action': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'sell_price': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '20', 'decimal_places': '2'}),
+            'stock_quantity': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'supplier': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.Contact']", 'null': 'True', 'blank': 'True'}),
+            'supplier_code': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'})
+        },
+        'sales.saleorder': {
+            'Meta': {'ordering': "['-datetime']", 'object_name': 'SaleOrder', '_ormbases': ['core.Object']},
+            'assigned': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'sales_saleorder_assigned'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'client': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.Contact']", 'null': 'True', 'blank': 'True'}),
+            'currency': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['finance.Currency']"}),
+            'datetime': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'opportunity': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['sales.Opportunity']", 'null': 'True', 'blank': 'True'}),
+            'payment': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['finance.Transaction']", 'null': 'True', 'blank': 'True'}),
+            'reference': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'source': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['sales.SaleSource']"}),
+            'status': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['sales.SaleStatus']"}),
+            'total': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '20', 'decimal_places': '2'}),
+            'total_display': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '20', 'decimal_places': '2'})
+        },
+        'sales.salesource': {
+            'Meta': {'ordering': "('-active', 'name')", 'object_name': 'SaleSource', '_ormbases': ['core.Object']},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'sales.salestatus': {
+            'Meta': {'ordering': "('hidden', '-active', 'name')", 'object_name': 'SaleStatus', '_ormbases': ['core.Object']},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'hidden': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'use_leads': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'use_opportunities': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'use_sales': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'sales.subscription': {
+            'Meta': {'ordering': "['expiry']", 'object_name': 'Subscription', '_ormbases': ['core.Object']},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'client': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.Contact']", 'null': 'True', 'blank': 'True'}),
+            'cycle_end': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'cycle_period': ('django.db.models.fields.CharField', [], {'default': "'month'", 'max_length': '32'}),
+            'details': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'expiry': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'product': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['sales.Product']", 'null': 'True', 'blank': 'True'}),
+            'start': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime.now'})
+        }
+    }
+
+    complete_apps = ['sales']
diff --git a/data/treeio/treeio/treeio/sales/views.py b/data/treeio/treeio/treeio/sales/views.py
new file mode 100644
index 0000000..2bec31b
--- /dev/null
+++ b/data/treeio/treeio/treeio/sales/views.py
@@ -0,0 +1,1604 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+"""
+Sales module views
+"""
+from django.shortcuts import get_object_or_404
+from django.template import RequestContext
+from django.db.models import Q
+from django.http import HttpResponseRedirect
+from django.core.urlresolvers import reverse
+from treeio.sales.models import Product, SaleOrder, SaleSource, Lead, Opportunity, \
+    SaleStatus, Subscription, OrderedProduct
+from treeio.sales.forms import SettingsForm, OrderForm, ProductForm, SaleStatusForm, UpdateRecordForm, \
+    LeadForm, OpportunityForm, OrderedProductForm, SubscriptionForm, \
+    OrderFilterForm, LeadFilterForm, OpportunityFilterForm, ProductFilterForm, \
+    MassActionForm, ProductMassActionForm, LeadMassActionForm, \
+    OpportunityMassActionForm, SaleSourceForm
+from treeio.core.rendering import render_to_response
+from treeio.core.models import Object, ModuleSetting, UpdateRecord
+from treeio.core.views import user_denied
+from treeio.core.decorators import treeio_login_required, handle_response_format, module_admin_required
+from treeio.identities.models import Contact
+from treeio.finance.models import Currency
+from treeio.finance.helpers import convert
+
+
+def _get_filter_query(args, model=SaleOrder):
+    "Compose a filter query based on filter form submission"
+    query = Q()
+
+    for arg in args:
+        if args[arg]:
+            if hasattr(model, arg) or arg == 'products_interested':
+                kwargs = {str(arg + '__id'): long(args[arg])}
+                query = query & Q(**kwargs)
+
+    return query
+
+
+def _process_mass_form(f):
+    "Pre-process request to handle mass action form for Orders"
+
+    def wrap(request, *args, **kwargs):
+        "Wrap"
+        if 'massform' in request.POST:
+            for key in request.POST:
+                if 'mass-order' in key:
+                    try:
+                        order = SaleOrder.objects.get(pk=request.POST[key])
+                        form = MassActionForm(
+                            request.user.profile, request.POST, instance=order)
+                        if form.is_valid() and request.user.profile.has_permission(order, mode='w'):
+                            form.save()
+                    except:
+                        pass
+
+        return f(request, *args, **kwargs)
+
+    wrap.__doc__ = f.__doc__
+    wrap.__name__ = f.__name__
+
+    return wrap
+
+
+def _process_mass_lead_form(f):
+    "Pre-process request to handle mass action form for Orders"
+
+    def wrap(request, *args, **kwargs):
+        "Wrap"
+        if 'massform' in request.POST:
+            for key in request.POST:
+                if 'mass-lead' in key:
+                    try:
+                        lead = Lead.objects.get(pk=request.POST[key])
+                        form = LeadMassActionForm(
+                            request.user.profile, request.POST, instance=lead)
+                        if form.is_valid() and request.user.profile.has_permission(lead, mode='w'):
+                            form.save()
+                    except:
+                        pass
+
+        return f(request, *args, **kwargs)
+
+    wrap.__doc__ = f.__doc__
+    wrap.__name__ = f.__name__
+
+    return wrap
+
+
+def _process_mass_opportunity_form(f):
+    "Pre-process request to handle mass action form for Orders"
+
+    def wrap(request, *args, **kwargs):
+        "Wrap"
+        if 'massform' in request.POST:
+            for key in request.POST:
+                if 'mass-opportunity' in key:
+                    try:
+                        opportunity = Opportunity.objects.get(
+                            pk=request.POST[key])
+                        form = OpportunityMassActionForm(request.user.profile,
+                                                         request.POST, instance=opportunity)
+                        if form.is_valid() and request.user.profile.has_permission(opportunity,
+                                                                                         mode='w'):
+                            form.save()
+                    except:
+                        pass
+
+        return f(request, *args, **kwargs)
+
+    wrap.__doc__ = f.__doc__
+    wrap.__name__ = f.__name__
+
+    return wrap
+
+
+def _do_update_record(profile, request, object):
+    "Get the Update Record Form"
+    if profile.has_permission(object, mode='x'):
+        if request.POST:
+            record = UpdateRecord()
+            record.object = object
+            record.record_type = 'manual'
+            form = UpdateRecordForm(request.POST, instance=record)
+            if form.is_valid():
+                record = form.save()
+                record.set_user_from_request(request)
+                record.save()
+                record.about.add(object)
+                object.set_last_updated()
+        else:
+            form = UpdateRecordForm()
+    else:
+        form = None
+    return form
+
+
+@treeio_login_required
+@handle_response_format
+@_process_mass_form
+def index(request, response_format='html'):
+    "Sales index page"
+
+    query = Q(status__hidden=False)
+    if request.GET:
+        if 'status' in request.GET and request.GET['status']:
+            query = _get_filter_query(request.GET)
+        else:
+            query = query & _get_filter_query(request.GET)
+    orders = Object.filter_by_request(
+        request, SaleOrder.objects.filter(query), mode="r")
+    filters = OrderFilterForm(request.user.profile, '', request.GET)
+    statuses = Object.filter_by_request(request, SaleStatus.objects, mode="r")
+
+    massform = MassActionForm(request.user.profile)
+
+    return render_to_response('sales/index',
+                              {'orders': orders,
+                               'filters': filters,
+                               'statuses': statuses,
+                               'massform': massform
+                               },
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+@_process_mass_form
+def index_assigned(request, response_format='html'):
+    "Orders assigned to current user"
+
+    query = Q(status__hidden=False, assigned=request.user.profile)
+    if request.GET:
+        if 'status' in request.GET and request.GET['status']:
+            query = _get_filter_query(request.GET)
+        else:
+            query = query & _get_filter_query(request.GET)
+
+    orders = Object.filter_by_request(
+        request, SaleOrder.objects.filter(query), mode="r")
+    filters = OrderFilterForm(
+        request.user.profile, 'assigned', request.GET)
+    statuses = Object.filter_by_request(request, SaleStatus.objects, mode="r")
+
+    massform = MassActionForm(request.user.profile)
+
+    return render_to_response('sales/index_assigned',
+                              {'orders': orders,
+                               'statuses': statuses,
+                               'massform': massform,
+                               'filters': filters},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+def index_status(request, response_format='html'):
+    "Index Status"
+    query = Q(status__hidden=False)
+    if request.GET:
+        if 'status' in request.GET and request.GET['status']:
+            query = _get_filter_query(request.GET)
+        else:
+            query = query & _get_filter_query(request.GET)
+
+    orders = Object.filter_by_request(
+        request, SaleOrder.objects.filter(query), mode="r")
+    statuses = Object.filter_by_request(request, SaleStatus.objects, mode="r")
+    filters = OrderFilterForm(request.user.profile, '', request.GET)
+
+    total = 0
+
+    for status in statuses:
+        status.count = 0
+        for order in orders:
+            if order.status == status:
+                if order.status.hidden is False:
+                    total += 1
+                    status.count += order.quantity
+
+    return render_to_response('sales/index_status',
+                              {'orders': orders,
+                               'statuses': statuses,
+                               'total': total,
+                               'filters': filters
+                               },
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+@_process_mass_form
+def index_open(request, response_format='html'):
+    "SaleOrders owned by current user"
+    try:
+        conf = ModuleSetting.get_for_module(
+            'treeio.sales', 'order_fulfil_status')[0]
+        fulfil_status = long(conf.value)
+        query = Q(status__hidden=False) & ~Q(status=fulfil_status)
+    except Exception:
+        query = Q(status__hidden=False)
+    if request.GET:
+        if 'status' in request.GET and request.GET['status']:
+            query = _get_filter_query(request.GET) & Q(user=request.user)
+        else:
+            query = query & _get_filter_query(request.GET)
+
+    orders = Object.filter_by_request(
+        request, SaleOrder.objects.filter(query), mode="r")
+    statuses = Object.filter_by_request(request, SaleStatus.objects)
+    filters = OrderFilterForm(request.user.profile, '', request.GET)
+
+    massform = MassActionForm(request.user.profile)
+
+    return render_to_response('sales/index_open',
+                              {'orders': orders,
+                               'statuses': statuses,
+                               'massform': massform,
+                               'filters': filters},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+def ordered_product_add(request, order_id=None, response_format='html'):
+    "Add new Ordered Product"
+
+    order = get_object_or_404(SaleOrder, pk=order_id)
+    if not request.user.profile.has_permission(order, mode='x'):
+        return user_denied("Sorry, you don't have access to this Sale Order")
+
+    if request.POST:
+        if 'cancel' not in request.POST:
+            ordered_product = OrderedProduct()
+            ordered_product.order = order
+            form = OrderedProductForm(
+                request.user.profile, order, request.POST, instance=ordered_product)
+            if form.is_valid():
+                ordered_product = form.save(commit=False)
+                convert(
+                    ordered_product, 'rate', currency=ordered_product.order.currency)
+                ordered_product.set_user_from_request(request)
+                ordered_product.order.update_total()
+                if 'add_another' in request.POST:
+                    return HttpResponseRedirect(reverse('sales_ordered_product_add', args=[order.id]))
+                return HttpResponseRedirect(reverse('sales_order_view', args=[order.id]))
+        else:
+            return HttpResponseRedirect(reverse('sales_order_view', args=[order.id]))
+    else:
+        form = OrderedProductForm(request.user.profile, order)
+
+    return render_to_response('sales/ordered_product_add',
+                              {'form': form,
+                               'order': order},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+def ordered_product_view(request, ordered_product_id, response_format='html'):
+    "Ordered product view"
+    ordered_product = get_object_or_404(OrderedProduct, pk=ordered_product_id)
+    if not request.user.profile.has_permission(ordered_product) \
+            and not request.user.profile.is_admin('treeio.sales'):
+        return user_denied(request, message="You don't have access to this Ordered Product")
+
+    return render_to_response('sales/ordered_product_view',
+                              {'ordered_product': ordered_product},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+def ordered_product_edit(request, ordered_product_id, response_format='html'):
+    "OrderedProduct edit"
+
+    ordered_product = get_object_or_404(OrderedProduct, pk=ordered_product_id)
+    if not request.user.profile.has_permission(ordered_product, mode='w') \
+            and not request.user.profile.is_admin('treeio.sales'):
+        return user_denied(request, "You don't have access to this OrderedProduct", response_format)
+
+    order = ordered_product.order
+    if request.POST:
+        if 'cancel' not in request.POST:
+            form = OrderedProductForm(
+                request.user.profile, order, request.POST, instance=ordered_product)
+            if form.is_valid():
+                ordered_product = form.save(commit=False)
+                convert(
+                    ordered_product, 'rate', currency=ordered_product.order.currency)
+                ordered_product.order.update_total()
+                return HttpResponseRedirect(reverse('sales_ordered_product_view', args=[ordered_product.id]))
+        else:
+            return HttpResponseRedirect(reverse('sales_ordered_product_view', args=[ordered_product.id]))
+    else:
+        form = OrderedProductForm(
+            request.user.profile, order, instance=ordered_product)
+
+    return render_to_response('sales/ordered_product_edit',
+                              {'form': form,
+                               'ordered_product': ordered_product,
+                               'order': order
+                               },
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+def ordered_product_delete(request, ordered_product_id, response_format='html'):
+    "OrderedProduct delete"
+
+    ordered_product = get_object_or_404(OrderedProduct, pk=ordered_product_id)
+    if not request.user.profile.has_permission(ordered_product, mode='w') \
+            and not request.user.profile.is_admin('treeio.sales'):
+        return user_denied(request, "You don't have access to this Sale Status", response_format)
+
+    if request.POST:
+        if 'delete' in request.POST:
+            order_id = ordered_product.order_id
+            if 'trash' in request.POST:
+                ordered_product.trash = True
+                ordered_product.save()
+            else:
+                ordered_product.delete()
+            ordered_product.order.update_total()
+            return HttpResponseRedirect(reverse('sales_order_view', args=[order_id]))
+        elif 'cancel' in request.POST:
+            return HttpResponseRedirect(reverse('sales_ordered_product_view', args=[ordered_product.id]))
+
+    order = ordered_product.order
+
+    return render_to_response('sales/ordered_product_delete',
+                              {'ordered_product': ordered_product,
+                               'order': order},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+def subscription_index(request, response_format='html'):
+    "Subscription index page"
+
+    query = Q(status__hidden=False)
+    if request.GET:
+        if 'status' in request.GET and request.GET['status']:
+            query = _get_filter_query(request.GET)
+        else:
+            query = query & _get_filter_query(request.GET)
+
+    subscriptions = Object.filter_by_request(
+        request, Subscription.objects.filter(query), mode="r")
+    filters = OrderFilterForm(request.user.profile, '', request.GET)
+    ordered_products = subscriptions.orderedproduct_set.all()
+    orders = ordered_products.order_set.all()
+    # orders = Object.filter_by_request(request, SaleOrder.objects, mode = "r")
+    statuses = Object.filter_by_request(request, SaleStatus.objects, mode="r")
+
+    return render_to_response('sales/index',
+                              {'orders': orders,
+                               'products': ordered_products,
+                               'filters': filters,
+                               'statuses': statuses
+                               },
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+def subscription_add(request, order_id=None, product_id=None, productset_id=None, response_format='html'):
+    "Product add"
+    if order_id:
+        order = get_object_or_404(SaleOrder, pk=order_id)
+    if product_id:
+        product = get_object_or_404(OrderedProduct, pk=product_id)
+    if productset_id:
+        productset = get_object_or_404(Product, pk=productset_id)
+
+    subscription = Subscription()
+    if order_id:
+        subscription.client = order.client
+    if product_id:
+        subscription.product = product.product
+    if productset_id:
+        subscription.product = productset
+
+    if request.POST:
+        if 'cancel' not in request.POST:
+            form = SubscriptionForm(
+                request.user.profile, request.POST, instance=subscription)
+            if form.is_valid():
+                subscription = form.save(commit=False)
+                subscription.renew()
+                subscription.save()
+                subscription.set_user_from_request(request)
+                if product_id:
+                    product.subscription = subscription
+                    product.save()
+                if order_id:
+                    return HttpResponseRedirect(reverse('sales_order_view', args=[order_id]))
+                else:
+                    return HttpResponseRedirect(reverse('sales_subscription_view', args=[subscription.id]))
+        else:
+            return HttpResponseRedirect(reverse('sales_product_index'))
+    else:
+        form = SubscriptionForm(
+            request.user.profile, instance=subscription)
+
+    return render_to_response('sales/subscription_add',
+                              {'form': form},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+def subscription_view(request, subscription_id, response_format='html'):
+    "Subscription view"
+
+    subscription = get_object_or_404(Subscription, pk=subscription_id)
+    if not request.user.profile.has_permission(subscription):
+        return user_denied(request, message="You don't have access to this Subscription")
+
+    query = Q(subscription=subscription)
+    if request.GET:
+        if 'status' in request.GET and request.GET['status']:
+            query = query & _get_filter_query(request.GET)
+        else:
+            query = query & Q(
+                status__hidden=False) & _get_filter_query(request.GET)
+    else:
+        query = query & Q(status__hidden=False)
+    ops = subscription.orderedproduct_set.all()
+    orders = []
+    for op in ops:
+        orders.append(op.order)
+
+    return render_to_response('sales/subscription_view',
+                              {'subscription': subscription,
+
+                               'orders': orders},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+def subscription_edit(request, subscription_id, response_format='html'):
+    "Subscription edit"
+
+    subscription = get_object_or_404(Subscription, pk=subscription_id)
+    if not request.user.profile.has_permission(subscription, mode='w') \
+            and not request.user.profile.is_admin('treeio.sales'):
+        return user_denied(request, "You don't have access to this Subscription", response_format)
+
+    if request.POST:
+        form = SubscriptionForm(
+            request.user.profile, request.POST, instance=subscription)
+    else:
+        form = SubscriptionForm(
+            request.user.profile, instance=subscription)
+    if form.is_valid():
+        subscription = form.save()
+        return HttpResponseRedirect(reverse('sales_subscription_view', args=[subscription.id]))
+
+    return render_to_response('sales/subscription_edit',
+                              {'form': form,
+                               'subscription': subscription,
+                               },
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+def subscription_delete(request, subscription_id, response_format='html'):
+    "Subscription delete"
+
+    subscription = get_object_or_404(Subscription, pk=subscription_id)
+    if not request.user.profile.has_permission(subscription, mode='w') \
+            and not request.user.profile.is_admin('treeio.sales'):
+        return user_denied(request, "You don't have access to this Sale Status", response_format)
+
+    if request.POST:
+        if 'delete' in request.POST:
+            if 'trash' in request.POST:
+                subscription.trash = True
+                subscription.save()
+            else:
+                subscription.delete()
+            return HttpResponseRedirect(reverse('sales_index'))
+        elif 'cancel' in request.POST:
+            return HttpResponseRedirect(reverse('sales_subscription_view', args=[subscription.id]))
+
+    return render_to_response('sales/subscription_delete',
+                              {'subscription': subscription,
+                               },
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+def product_index(request, response_format='html'):
+    "Product index page"
+
+    query = Q(status__hidden=False)
+    if request.GET:
+        if 'status' in request.GET and request.GET['status']:
+            query = _get_filter_query(request.GET)
+        else:
+            query = query & _get_filter_query(request.GET)
+
+    if 'massform' in request.POST:
+        for key in request.POST:
+            if 'mass-product' in key:
+                try:
+                    product = Product.objects.get(pk=request.POST[key])
+                    form = ProductMassActionForm(
+                        request.user.profile, request.POST, instance=product)
+                    if form.is_valid() and request.user.profile.has_permission(product, mode='w'):
+                        form.save()
+                except:
+                    pass
+
+    massform = ProductMassActionForm(request.user.profile)
+
+    query = Q(parent__isnull=True)
+    if request.GET:
+        query = query & _get_filter_query(request.GET, model=Product)
+
+    statuses = Object.filter_by_request(request, SaleStatus.objects, mode="r")
+    products = Object.filter_by_request(
+        request, Product.objects.filter(query), mode="r")
+    filters = ProductFilterForm(request.user.profile, '', request.GET)
+
+    return render_to_response('sales/product_index',
+                              {'products': products,
+                               'filters': filters,
+                               'massform': massform,
+                               'statuses': statuses
+                               },
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+@module_admin_required('treeio.sales')
+def product_add(request, parent_id=None, response_format='html'):
+    "Product add"
+
+    all_products = Object.filter_by_request(
+        request, Product.objects.filter(parent__isnull=True))
+
+    if request.POST:
+        if 'cancel' not in request.POST:
+            product = Product()
+            form = ProductForm(
+                request.user.profile, None, request.POST, instance=product)
+            if form.is_valid():
+                product = form.save()
+                product.set_user_from_request(request)
+                return HttpResponseRedirect(reverse('sales_product_view', args=[product.id]))
+        else:
+            return HttpResponseRedirect(reverse('sales_product_index'))
+    else:
+        form = ProductForm(request.user.profile, parent_id)
+
+    return render_to_response('sales/product_add',
+                              {'form': form,
+                               'products': all_products},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+def product_edit(request, product_id, response_format='html'):
+    "Product edit"
+
+    product = get_object_or_404(Product, pk=product_id)
+    if not request.user.profile.has_permission(product, mode='w') \
+            and not request.user.profile.is_admin('treeio.sales'):
+        return user_denied(request, "You don't have access to this Product", response_format)
+
+    if request.POST:
+        if 'cancel' not in request.POST:
+            form = ProductForm(
+                request.user.profile, None, request.POST, instance=product)
+            if form.is_valid():
+                product = form.save()
+                return HttpResponseRedirect(reverse('sales_product_view', args=[product.id]))
+        else:
+            return HttpResponseRedirect(reverse('sales_product_view', args=[product.id]))
+    else:
+        form = ProductForm(request.user.profile, None, instance=product)
+
+    all_products = Object.filter_by_request(
+        request, Product.objects.filter(parent__isnull=True))
+
+    return render_to_response('sales/product_edit',
+                              {'form': form,
+                               'product': product,
+                               'products': all_products},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+def product_view(request, product_id, response_format='html'):
+    "Product view"
+
+    product = get_object_or_404(Product, pk=product_id)
+    if not request.user.profile.has_permission(product) \
+            and not request.user.profile.is_admin('treeio.sales'):
+        return user_denied(request, message="You don't have access to this Product")
+
+    query = Q(product=product)
+    if request.GET:
+        if 'status' in request.GET and request.GET['status']:
+            query = query & _get_filter_query(request.GET)
+        else:
+            query = query & Q(
+                status__hidden=False) & _get_filter_query(request.GET)
+    else:
+        query = query & Q(status__hidden=False)
+
+    subproducts = Object.filter_by_request(
+        request, Product.objects.filter(parent=product))
+    subscriptions = product.subscription_set.all()
+
+    return render_to_response('sales/product_view',
+                              {'product': product,
+                               'subproducts': subproducts,
+                               'subscriptions': subscriptions,
+                               },
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+def product_delete(request, product_id, response_format='html'):
+    "Product delete"
+
+    product = get_object_or_404(Product, pk=product_id)
+    if not request.user.profile.has_permission(product, mode='w') \
+            and not request.user.profile.is_admin('treeio.sales'):
+        return user_denied(request, "You don't have access to this Sale Status", response_format)
+
+    if request.POST:
+        if 'delete' in request.POST:
+            if 'trash' in request.POST:
+                product.trash = True
+                product.save()
+            else:
+                product.delete()
+            return HttpResponseRedirect(reverse('sales_product_index'))
+        elif 'cancel' in request.POST:
+            return HttpResponseRedirect(reverse('sales_product_view', args=[product.id]))
+
+    all_products = Object.filter_by_request(
+        request, Product.objects.filter(parent__isnull=True))
+    statuses = Object.filter_by_request(request, SaleStatus.objects, mode="r")
+    subproducts = Object.filter_by_request(
+        request, Product.objects.filter(parent=product))
+
+    return render_to_response('sales/product_delete',
+                              {'product': product,
+                               'subproducts': subproducts,
+                               'products': all_products,
+                               'statuses': statuses},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+@_process_mass_lead_form
+def lead_index(request, response_format='html'):
+    "Lead index page"
+
+    query = Q(status__hidden=False)
+    if request.GET:
+        if 'status' in request.GET and request.GET['status']:
+            query = _get_filter_query(request.GET)
+        else:
+            query = query & _get_filter_query(request.GET)
+
+    filters = LeadFilterForm(request.user.profile, '', request.GET)
+
+    statuses = Object.filter_by_request(request, SaleStatus.objects, mode="r")
+    leads = Object.filter_by_request(
+        request, Lead.objects.filter(query), mode="r")
+
+    massform = LeadMassActionForm(request.user.profile)
+
+    return render_to_response('sales/lead_index',
+                              {'leads': leads,
+                               'filters': filters,
+                               'massform': massform,
+                               'statuses': statuses
+                               },
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+@_process_mass_lead_form
+def lead_index_assigned(request, response_format='html'):
+    "Leads owned by current user"
+
+    query = Q(status__hidden=False, assigned=request.user.profile)
+    if request.GET:
+        if 'status' in request.GET and request.GET['status']:
+            query = _get_filter_query(request.GET)
+        else:
+            query = query & _get_filter_query(request.GET)
+
+    statuses = Object.filter_by_request(request, SaleStatus.objects, mode="r")
+    leads = Object.filter_by_request(
+        request, Lead.objects.filter(query), mode="r")
+    filters = LeadFilterForm(request.user.profile, '', request.GET)
+
+    massform = LeadMassActionForm(request.user.profile)
+
+    return render_to_response('sales/lead_index_assigned',
+                              {'leads': leads,
+                               'filters': filters,
+                               'massform': massform,
+                               'statuses': statuses
+                               },
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+def lead_add(request, lead_id=None, response_format='html'):
+    "Lead add"
+
+    all_leads = Object.filter_by_request(request, Lead.objects)
+
+    if request.POST:
+        if 'cancel' not in request.POST:
+            lead = Lead()
+            form = LeadForm(
+                request.user.profile, request.POST, instance=lead)
+            if form.is_valid():
+                lead = form.save()
+                lead.set_user_from_request(request)
+                return HttpResponseRedirect(reverse('sales_lead_view', args=[lead.id]))
+        else:
+            return HttpResponseRedirect(reverse('sales_lead_index'))
+    else:
+        form = LeadForm(request.user.profile)
+
+    return render_to_response('sales/lead_add',
+                              {'form': form,
+                               'leads': all_leads},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+def lead_edit(request, lead_id, response_format='html'):
+    "Lead edit"
+
+    lead = get_object_or_404(Lead, pk=lead_id)
+    if not request.user.profile.has_permission(lead, mode='w') \
+            and not request.user.profile.is_admin('treeio.sales'):
+        return user_denied(request, "You don't have access to this Lead", response_format)
+
+    if request.POST:
+        form = LeadForm(
+            request.user.profile, request.POST, instance=lead)
+    else:
+        form = LeadForm(request.user.profile, instance=lead)
+    if form.is_valid():
+        lead = form.save()
+        return HttpResponseRedirect(reverse('sales_lead_view', args=[lead.id]))
+
+    return render_to_response('sales/lead_edit',
+                              {'form': form,
+                               'lead': lead,
+                               },
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+def lead_view(request, lead_id, response_format='html'):
+    "Queue view"
+    profile = request.user.profile
+    lead = get_object_or_404(Lead, pk=lead_id)
+
+    if not profile.has_permission(lead) \
+            and not profile.is_admin('treeio.sales'):
+        return user_denied(request, message="You don't have access to this Lead")
+
+    form = _do_update_record(profile, request, lead)
+    if form.is_valid():
+        record = form.save()
+        record.set_user_from_request(request)
+        lead = record.object
+
+    return render_to_response('sales/lead_view',
+                              {'lead': lead,
+                               'form': form},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+def lead_delete(request, lead_id, response_format='html'):
+    "Lead delete"
+
+    lead = get_object_or_404(Lead, pk=lead_id)
+    if not request.user.profile.has_permission(lead, mode='w') \
+            and not request.user.profile.is_admin('treeio.sales'):
+        return user_denied(request, "You don't have access to this Sale Status", response_format)
+
+    if request.POST:
+        if 'delete' in request.POST:
+            if 'trash' in request.POST:
+                lead.trash = True
+                lead.save()
+            else:
+                lead.delete()
+            return HttpResponseRedirect(reverse('sales_lead_index'))
+        elif 'cancel' in request.POST:
+            return HttpResponseRedirect(reverse('sales_lead_view', args=[lead.id]))
+
+    all_products = Object.filter_by_request(
+        request, Product.objects.filter(parent__isnull=True))
+    all_leads = Object.filter_by_request(request, Lead.objects)
+
+    return render_to_response('sales/lead_delete',
+                              {'lead': lead,
+                               'leads': all_leads,
+                               'products': all_products},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+@_process_mass_opportunity_form
+def opportunity_index(request, response_format='html'):
+    "Sales index page"
+
+    query = Q(status__hidden=False)
+    if request.GET:
+        if 'status' in request.GET and request.GET['status']:
+            query = _get_filter_query(request.GET)
+        else:
+            query = query & _get_filter_query(request.GET)
+
+    filters = OpportunityFilterForm(
+        request.user.profile, '', request.GET)
+
+    statuses = Object.filter_by_request(request, SaleStatus.objects, mode="r")
+    opportunities = Object.filter_by_request(
+        request, Opportunity.objects.filter(query), mode="r")
+
+    massform = OpportunityMassActionForm(request.user.profile)
+
+    return render_to_response('sales/opportunity_index',
+                              {'opportunities': opportunities,
+                               'filters': filters,
+                               'massform': massform,
+                               'statuses': statuses
+                               },
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+@_process_mass_opportunity_form
+def opportunity_index_assigned(request, response_format='html'):
+    "Opportunities owned by current user"
+
+    query = Q(status__hidden=False, assigned=request.user.profile)
+    if request.GET:
+        if 'status' in request.GET and request.GET['status']:
+            query = _get_filter_query(request.GET)
+        else:
+            query = query & _get_filter_query(request.GET)
+
+    statuses = Object.filter_by_request(request, SaleStatus.objects, mode="r")
+    opportunities = Object.filter_by_request(
+        request, Opportunity.objects.filter(query), mode="r")
+    filters = OpportunityFilterForm(
+        request.user.profile, '', request.GET)
+
+    massform = OpportunityMassActionForm(request.user.profile)
+
+    return render_to_response('sales/opportunity_index_assigned',
+                              {'opportunities': opportunities,
+                               'filters': filters,
+                               'massform': massform,
+                               'statuses': statuses
+                               },
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+def opportunity_add(request, lead_id=None, response_format='html'):
+    "Opportunity add"
+    lead = None
+    if lead_id:
+        lead = get_object_or_404(Lead, pk=lead_id)
+
+    if request.POST:
+        if 'cancel' not in request.POST:
+            form = OpportunityForm(
+                request.user.profile, lead, request.POST)
+            if form.is_valid():
+                opportunity = form.save(commit=False)
+                convert(opportunity, 'amount')
+                opportunity.set_user_from_request(request)
+                return HttpResponseRedirect(reverse('sales_opportunity_view', args=[opportunity.id]))
+        else:
+            return HttpResponseRedirect(reverse('sales_opportunity_index'))
+    else:
+        form = OpportunityForm(request.user.profile, lead)
+
+    return render_to_response('sales/opportunity_add',
+                              {'form': form},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+def opportunity_edit(request, opportunity_id, response_format='html'):
+    "Opportunity edit"
+
+    opportunity = get_object_or_404(Opportunity, pk=opportunity_id)
+    if not request.user.profile.has_permission(opportunity, mode='w') \
+            and not request.user.profile.is_admin('treeio.sales'):
+        return user_denied(request, "You don't have access to this Opportunity", response_format)
+
+    if request.POST:
+        if 'cancel' not in request.POST:
+            form = OpportunityForm(
+                request.user.profile, None, request.POST, instance=opportunity)
+            if form.is_valid():
+                opportunity = form.save()
+                convert(opportunity, 'amount')
+                return HttpResponseRedirect(reverse('sales_opportunity_view', args=[opportunity.id]))
+        else:
+            return HttpResponseRedirect(reverse('sales_opportunity_view', args=[opportunity.id]))
+    else:
+        form = OpportunityForm(
+            request.user.profile, None, instance=opportunity)
+
+    all_opportunities = Object.filter_by_request(request, Opportunity.objects)
+
+    return render_to_response('sales/opportunity_edit',
+                              {'form': form,
+                               'opportunity': opportunity,
+                               'opportunities': all_opportunities,
+                               },
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+def opportunity_view(request, opportunity_id, response_format='html'):
+    "Opportunity view"
+
+    profile = request.user.profile
+    opportunity = get_object_or_404(Opportunity, pk=opportunity_id)
+    if not profile.has_permission(opportunity) \
+            and not profile.is_admin('treeio.sales'):
+        return user_denied(request, message="You don't have access to this Opportunity")
+
+    form = _do_update_record(profile, request, opportunity)
+
+    return render_to_response('sales/opportunity_view',
+                              {'opportunity': opportunity,
+                               'record_form': form},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+def opportunity_delete(request, opportunity_id, response_format='html'):
+    "Opportunity delete"
+
+    opportunity = get_object_or_404(Opportunity, pk=opportunity_id)
+    if not request.user.profile.has_permission(opportunity, mode='w') \
+            and not request.user.profile.is_admin('treeio.sales'):
+        return user_denied(request, "You don't have access to this Sale Status", response_format)
+
+    if request.POST:
+        if 'delete' in request.POST:
+            if 'trash' in request.POST:
+                opportunity.trash = True
+                opportunity.save()
+            else:
+                opportunity.delete()
+            return HttpResponseRedirect(reverse('sales_opportunity_index'))
+        elif 'cancel' in request.POST:
+            return HttpResponseRedirect(reverse('sales_opportunity_view', args=[opportunity.id]))
+
+    all_opportunities = Object.filter_by_request(request, Opportunity.objects)
+
+    return render_to_response('sales/opportunity_delete',
+                              {'opportunity': opportunity,
+                               'opportunities': all_opportunities,
+                               },
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+def order_add(request, lead_id=None, opportunity_id=None, response_format='html'):
+    "Order add"
+
+    lead = None
+    opportunity = None
+    if lead_id:
+        lead = get_object_or_404(Lead, pk=lead_id)
+    if opportunity_id:
+        opportunity = get_object_or_404(Opportunity, pk=opportunity_id)
+
+    if request.POST:
+        if 'cancel' not in request.POST:
+            order = SaleOrder()
+            form = OrderForm(
+                request.user.profile, lead, opportunity, request.POST, instance=order)
+            if form.is_valid():
+                order = form.save()
+                order.set_user_from_request(request)
+                return HttpResponseRedirect(reverse('sales_order_view', args=[order.id]))
+        else:
+            return HttpResponseRedirect(reverse('sales'))
+    else:
+        form = OrderForm(request.user.profile, lead, opportunity)
+
+    all_products = Object.filter_by_request(
+        request, Product.objects.filter(parent__isnull=True))
+
+    return render_to_response('sales/order_add',
+                              {'form': form,
+                               'products': all_products},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+def order_edit(request, order_id, response_format='html'):
+    "SaleOrder edit"
+
+    order = get_object_or_404(SaleOrder, pk=order_id)
+    if not request.user.profile.has_permission(order, mode='w') \
+            and not request.user.profile.is_admin('treeio.sales'):
+        return user_denied(request, "You don't have access to this SaleOrder", response_format)
+
+    if request.POST:
+        if 'cancel' not in request.POST:
+            form = OrderForm(
+                request.user.profile, None, None, request.POST, instance=order)
+            if form.is_valid():
+                order = form.save()
+                return HttpResponseRedirect(reverse('sales_order_view', args=[order.id]))
+        else:
+            return HttpResponseRedirect(reverse('sales_order_view', args=[order.id]))
+    else:
+        form = OrderForm(
+            request.user.profile, None, None, instance=order)
+
+    all_orders = Object.filter_by_request(request, SaleOrder.objects)
+
+    return render_to_response('sales/order_edit',
+                              {'form': form,
+                               'order': order,
+                               'orders': all_orders,
+                               },
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+def order_view(request, order_id, response_format='html'):
+    "SaleOrder view"
+    profile = request.user.profile
+    order = get_object_or_404(SaleOrder, pk=order_id)
+
+    form = _do_update_record(profile, request, order)
+    if form.is_valid():
+        record = form.save()
+        record.set_user_from_request(request)
+        order = record.object
+
+    if not profile.has_permission(order) \
+            and not profile.is_admin('treeio.sales'):
+        return user_denied(request, message="You don't have access to this Sale")
+
+    ordered_products = order.orderedproduct_set.filter(trash=False)
+
+    return render_to_response('sales/order_view',
+                              {'order': order,
+                               'ordered_products': ordered_products,
+                               'record_form': form},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+def order_invoice_view(request, order_id, response_format='html'):
+    "Order view as Invoice"
+    order = get_object_or_404(SaleOrder, pk=order_id)
+    if not request.user.profile.has_permission(order) \
+            and not request.user.profile.is_admin('treeio.sales'):
+        return user_denied(request, message="You don't have access to this Sale")
+
+    ordered_products = order.orderedproduct_set.filter(trash=False)
+
+    # default company
+    try:
+        conf = ModuleSetting.get_for_module('treeio.finance', 'my_company')[0]
+        my_company = Contact.objects.get(pk=long(conf.value))
+
+    except:
+        my_company = None
+
+    return render_to_response('sales/order_invoice_view',
+                              {'order': order,
+                               'ordered_products': ordered_products,
+                               'my_company': my_company},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+def order_delete(request, order_id, response_format='html'):
+    "SaleOrder delete"
+
+    order = get_object_or_404(SaleOrder, pk=order_id)
+    if not request.user.profile.has_permission(order, mode='w') \
+            and not request.user.profile.is_admin('treeio.sales'):
+        return user_denied(request, "You don't have access to this Sale Status", response_format)
+
+    if request.POST:
+        if 'delete' in request.POST:
+            if 'trash' in request.POST:
+                order.trash = True
+                order.save()
+            else:
+                order.delete()
+            return HttpResponseRedirect(reverse('sales_index'))
+        elif 'cancel' in request.POST:
+            return HttpResponseRedirect(reverse('sales_order_view', args=[order.id]))
+
+    all_orders = Object.filter_by_request(request, SaleOrder.objects)
+
+    return render_to_response('sales/order_delete',
+                              {'order': order,
+                               'orders': all_orders,
+                               },
+                              context_instance=RequestContext(request), response_format=response_format)
+
+#
+# Settings
+#
+
+
+@treeio_login_required
+@handle_response_format
+def settings_view(request, response_format='html'):
+    "Settings"
+
+    if not request.user.profile.is_admin('treeio.sales'):
+        return user_denied(request, message="You don't have administrator access to the Sales module")
+
+    all_products = Object.filter_by_request(
+        request, Product.objects.filter(parent__isnull=True))
+    all_statuses = Object.filter_by_request(request, SaleStatus.objects)
+    all_sources = Object.filter_by_request(request, SaleSource.objects)
+
+    # default currency
+    try:
+        default_currency = Currency.objects.get(is_default=True)
+    except:
+        default_currency = None
+
+    # all currencies
+    currencies = Object.filter_by_request(
+        request, Currency.objects.filter(trash=False))
+
+    # default lead status
+    try:
+        conf = ModuleSetting.get_for_module(
+            'treeio.sales', 'default_lead_status')[0]
+        default_lead_status = SaleStatus.objects.get(pk=long(conf.value))
+    except:
+        default_lead_status = None
+
+    # default opportunity status
+    try:
+        conf = ModuleSetting.get_for_module(
+            'treeio.sales', 'default_opportunity_status')[0]
+        default_opportunity_status = SaleStatus.objects.get(
+            pk=long(conf.value))
+    except:
+        default_opportunity_status = None
+
+    # default order status
+    try:
+        conf = ModuleSetting.get_for_module(
+            'treeio.sales', 'default_order_status')[0]
+        default_order_status = SaleStatus.objects.get(pk=long(conf.value))
+    except:
+        default_order_status = None
+
+    # default order source
+    try:
+        conf = ModuleSetting.get_for_module(
+            'treeio.sales', 'default_order_source')[0]
+        default_order_source = SaleSource.objects.get(pk=long(conf.value))
+    except:
+        default_order_source = None
+
+    # order fulfilment status
+    try:
+        conf = ModuleSetting.get_for_module(
+            'treeio.sales', 'order_fulfil_status')[0]
+        order_fulfil_status = SaleStatus.objects.get(pk=long(conf.value))
+    except:
+        order_fulfil_status = None
+
+    # default product
+    try:
+        conf = ModuleSetting.get_for_module(
+            'treeio.sales', 'default_order_product')[0]
+        default_order_product = Product.objects.get(pk=long(conf.value))
+    except:
+        default_order_product = None
+
+    # check not trashed
+
+    if default_opportunity_status:
+        if default_opportunity_status.trash:
+            default_opportunity_status = None
+    if default_lead_status:
+        if default_lead_status.trash:
+            default_lead_status = None
+    if default_order_status:
+        if default_order_status.trash:
+            default_order_status = None
+    if default_order_source:
+        if default_order_source.trash:
+            default_order_source = None
+    if order_fulfil_status:
+        if order_fulfil_status.trash:
+            order_fulfil_status = None
+    if default_order_product:
+        if default_order_product.trash:
+            default_order_product = None
+
+    return render_to_response('sales/settings_view',
+                              {
+                                  'products': all_products,
+                                  'statuses': all_statuses,
+                                  'sources': all_sources,
+                                  'currencies': currencies,
+                                  'default_opportunity_status': default_opportunity_status,
+                                  'default_lead_status': default_lead_status,
+                                  'default_order_status': default_order_status,
+                                  'default_order_source': default_order_source,
+                                  'order_fulfil_status': order_fulfil_status,
+                                  'default_order_product': default_order_product,
+                                  'default_currency': default_currency,
+                              },
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+def settings_edit(request, response_format='html'):
+    "Settings"
+
+    if not request.user.profile.is_admin('treeio.sales'):
+        return user_denied(request, message="You don't have administrator access to the Sales module")
+
+    all_products = Object.filter_by_request(
+        request, Product.objects.filter(parent__isnull=True))
+
+    if request.POST:
+        if 'cancel' not in request.POST:
+            form = SettingsForm(request.user.profile, request.POST)
+            if form.is_valid():
+                form.save()
+                return HttpResponseRedirect(reverse('sales_settings_view'))
+        else:
+            return HttpResponseRedirect(reverse('sales_settings_view'))
+    else:
+        form = SettingsForm(request.user.profile)
+
+    return render_to_response('sales/settings_edit',
+                              {
+                                  'products': all_products,
+
+                                  'form': form,
+                              },
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+def status_add(request, response_format='html'):
+    "TicketStatus add"
+
+    if not request.user.profile.is_admin('treeio.sales'):
+        return user_denied(request, message="You don't have administrator access to the Sales module")
+
+    status = None
+    if request.POST:
+        if 'cancel' not in request.POST:
+            status = SaleStatus()
+            form = SaleStatusForm(
+                request.user.profile, request.POST, instance=status)
+            if form.is_valid():
+                status = form.save()
+                status.set_user_from_request(request)
+                return HttpResponseRedirect(reverse('sales_status_view', args=[status.id]))
+        else:
+            return HttpResponseRedirect(reverse('sales_settings_view'))
+    else:
+        form = SaleStatusForm(request.user.profile)
+
+    all_products = Object.filter_by_request(
+        request, Product.objects.filter(parent__isnull=True))
+
+    return render_to_response('sales/status_add',
+                              {'form': form,
+                               'status': status,
+                               'products': all_products,
+                               },
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+def status_view(request, status_id, response_format='html'):
+    "Tickets filtered by status"
+
+    status = get_object_or_404(SaleStatus, pk=status_id)
+    if not request.user.profile.has_permission(status) \
+            and not request.user.profile.is_admin('treeio.sales'):
+        return user_denied(request, message="You don't have access to this Sale Status")
+
+    query = Q(status=status)
+    if request.GET:
+        query = query & _get_filter_query(request.GET)
+    orders = Object.filter_by_request(request, SaleOrder.objects.filter(query))
+
+    return render_to_response('sales/status_view',
+                              {'status': status,
+                               'orders': orders},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+def status_edit(request, status_id, response_format='html'):
+    "SaleStatus edit"
+
+    status = get_object_or_404(SaleStatus, pk=status_id)
+    if not request.user.profile.has_permission(status, mode='w') \
+            and not request.user.profile.is_admin('treeio.sales'):
+        return user_denied(request, "You don't have access to this Sale Status", response_format)
+
+    if request.POST:
+        if 'cancel' not in request.POST:
+            form = SaleStatusForm(
+                request.user.profile, request.POST, instance=status)
+            if form.is_valid():
+                status = form.save()
+                return HttpResponseRedirect(reverse('sales_status_view', args=[status.id]))
+        else:
+            return HttpResponseRedirect(reverse('sales_status_view', args=[status.id]))
+    else:
+        form = SaleStatusForm(request.user.profile, instance=status)
+
+    return render_to_response('sales/status_edit',
+                              {'form': form,
+                               'status': status},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+def status_delete(request, status_id, response_format='html'):
+    "SaleStatus delete"
+
+    status = get_object_or_404(SaleStatus, pk=status_id)
+    if not request.user.profile.has_permission(status, mode='w') \
+            and not request.user.profile.is_admin('treeio.sales'):
+        return user_denied(request, "You don't have access to this Sale Status", response_format)
+
+    if request.POST:
+        if 'delete' in request.POST:
+            if 'trash' in request.POST:
+                status.trash = True
+                status.save()
+            else:
+                status.delete()
+            return HttpResponseRedirect(reverse('sales_settings_view'))
+        elif 'cancel' in request.POST:
+            return HttpResponseRedirect(reverse('sales_status_view', args=[status.id]))
+
+    all_products = Object.filter_by_request(
+        request, Product.objects.filter(parent__isnull=True))
+
+    return render_to_response('sales/status_delete',
+                              {'status': status,
+                               'products': all_products},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+def source_add(request, response_format='html'):
+    "TicketStatus add"
+
+    if not request.user.profile.is_admin('treeio.sales'):
+        return user_denied(request, message="You don't have administrator access to the Sales module")
+
+    if request.POST:
+        if 'cancel' not in request.POST:
+            source = SaleSource()
+            form = SaleSourceForm(
+                request.user.profile, request.POST, instance=source)
+            if form.is_valid():
+                source = form.save()
+                source.set_user_from_request(request)
+                return HttpResponseRedirect(reverse('sales_source_view', args=[source.id]))
+        else:
+            return HttpResponseRedirect(reverse('sales_settings_view'))
+    else:
+        form = SaleSourceForm(request.user.profile)
+
+    all_products = Object.filter_by_request(
+        request, Product.objects.filter(parent__isnull=True))
+    all_sources = Object.filter_by_request(request, SaleSource.objects)
+
+    return render_to_response('sales/source_add',
+                              {'form': form,
+                               'sources': all_sources,
+                               'products': all_products,
+                               },
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+def source_view(request, source_id, response_format='html'):
+    "Orders filtered by source"
+
+    source = get_object_or_404(SaleSource, pk=source_id)
+    if not request.user.profile.has_permission(source) \
+            and not request.user.profile.is_admin('treeio.sales'):
+        return user_denied(request, message="You don't have access to this Sale Status")
+
+    query = Q(source=source)
+    if request.GET:
+        query = query & _get_filter_query(request.GET)
+    orders = Object.filter_by_request(request, SaleOrder.objects.filter(query))
+
+    all_products = Object.filter_by_request(
+        request, Product.objects.filter(parent__isnull=True))
+    all_sources = Object.filter_by_request(request, SaleSource.objects)
+
+    return render_to_response('sales/source_view',
+                              {'source': source,
+                               'sources': all_sources,
+                               'products': all_products,
+                               'orders': orders},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+def source_edit(request, source_id, response_format='html'):
+    "SaleSource edit"
+
+    source = get_object_or_404(SaleSource, pk=source_id)
+    if not request.user.profile.has_permission(source, mode='w') \
+            and not request.user.profile.is_admin('treeio.sales'):
+        return user_denied(request, "You don't have access to this Sale Status", response_format)
+
+    if request.POST:
+        if 'cancel' not in request.POST:
+            form = SaleSourceForm(
+                request.user.profile, request.POST, instance=source)
+            if form.is_valid():
+                source = form.save()
+                return HttpResponseRedirect(reverse('sales_source_view', args=[source.id]))
+        else:
+            return HttpResponseRedirect(reverse('sales_source_view', args=[source.id]))
+    else:
+        form = SaleSourceForm(request.user.profile, instance=source)
+
+    all_products = Object.filter_by_request(
+        request, Product.objects.filter(parent__isnull=True))
+    all_sources = Object.filter_by_request(request, SaleSource.objects)
+
+    return render_to_response('sales/source_edit',
+                              {'form': form,
+                               'source': source,
+                               'sources': all_sources,
+                               'products': all_products},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+@handle_response_format
+def source_delete(request, source_id, response_format='html'):
+    "SaleSource delete"
+
+    source = get_object_or_404(SaleSource, pk=source_id)
+    if not request.user.profile.has_permission(source, mode='w') \
+            and not request.user.profile.is_admin('treeio.sales'):
+        return user_denied(request, "You don't have access to this Sale Status", response_format)
+
+    if request.POST:
+        if 'delete' in request.POST:
+            if 'trash' in request.POST:
+                source.trash = True
+                source.save()
+            else:
+                source.delete()
+            return HttpResponseRedirect(reverse('sales_settings_view'))
+        elif 'cancel' in request.POST:
+            return HttpResponseRedirect(reverse('sales_source_view', args=[source.id]))
+
+    all_products = Object.filter_by_request(
+        request, Product.objects.filter(parent__isnull=True))
+    all_sources = Object.filter_by_request(request, SaleSource.objects)
+
+    return render_to_response('sales/source_delete',
+                              {'source': source,
+                               'sources': all_sources,
+                               'products': all_products},
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+#
+# AJAX handlers
+
+
+@treeio_login_required
+def ajax_subscription_lookup(request, response_format='html'):
+    "Returns a list of matching tasks"
+
+    subscriptions = []
+    if request.GET and 'term' in request.GET:
+        subscriptions = Subscription.objects.filter(
+            Q(client__name__icontains=request.GET['term']) | Q(
+                product__name__icontains=request.GET['term']) | Q(
+                details__icontains=request.GET['term']))[:10]
+
+    return render_to_response('sales/ajax_subscription_lookup',
+                              {'subscriptions': subscriptions},
+                              context_instance=RequestContext(request),
+                              response_format=response_format)
+#
diff --git a/data/treeio/treeio/treeio/services/api/handlers.py b/data/treeio/treeio/treeio/services/api/handlers.py
new file mode 100644
index 0000000..4d39f1e
--- /dev/null
+++ b/data/treeio/treeio/treeio/services/api/handlers.py
@@ -0,0 +1,260 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+# -*- coding: utf-8 -*-
+
+from __future__ import absolute_import, with_statement
+
+__all__ = ['TicketStatusHandler', 'ServiceHandler',
+           'ServiceLevelAgreementHandler', 'ServiceAgentHandler',
+           'TicketQueueHandler', 'TicketRecordHandler', 'TicketHandler']
+
+from treeio.core.api.utils import rc
+from piston3.handler import BaseHandler
+from treeio.core.models import ModuleSetting
+from treeio.core.api.handlers import ObjectHandler
+from treeio.services.models import TicketStatus, Service, ServiceLevelAgreement, ServiceAgent, TicketQueue, Ticket, \
+    TicketRecord
+from treeio.services.forms import TicketForm, TicketStatusForm, TicketRecordForm, QueueForm, \
+    ServiceForm, ServiceLevelAgreementForm, AgentForm
+from treeio.services.views import _get_default_context
+
+
+class TicketStatusHandler(ObjectHandler):
+    "Entrypoint for TicketStatus model."
+    model = TicketStatus
+    form = TicketStatusForm
+
+    @classmethod
+    def resource_uri(cls, obj=None):
+        object_id = "id"
+        if obj is not None:
+            object_id = obj.id
+        return ('api_services_status', [object_id])
+
+    def check_create_permission(self, request, mode):
+        return request.user.profile.is_admin('treeio.services')
+
+
+class ServiceHandler(ObjectHandler):
+    "Entrypoint for Service model."
+    model = Service
+    form = ServiceForm
+
+    @classmethod
+    def resource_uri(cls, obj=None):
+        object_id = "id"
+        if obj is not None:
+            object_id = obj.id
+        return ('api_services', [object_id])
+
+    def check_create_permission(self, request, mode):
+        return request.user.profile.is_admin('treeio.services')
+
+    def check_instance_permission(self, request, inst, mode):
+        return request.user.profile.has_permission(inst, mode=mode) \
+               or request.user.profile.is_admin('treeio_services')
+
+
+class ServiceLevelAgreementHandler(ObjectHandler):
+    "Entrypoint for ServiceLevelAgreement model."
+    model = ServiceLevelAgreement
+    form = ServiceLevelAgreementForm
+
+    @classmethod
+    def resource_uri(cls, obj=None):
+        object_id = "id"
+        if obj is not None:
+            object_id = obj.id
+        return ('api_services_sla', [object_id])
+
+    def check_create_permission(self, request, mode):
+        return request.user.profile.is_admin('treeio.services')
+
+
+class ServiceAgentHandler(ObjectHandler):
+    "Entrypoint for ServiceAgent model."
+    model = ServiceAgent
+    form = AgentForm
+
+    @classmethod
+    def resource_uri(cls, obj=None):
+        object_id = "id"
+        if obj is not None:
+            object_id = obj.id
+        return ('api_services_agents', [object_id])
+
+    def check_create_permission(self, request, mode):
+        return request.user.profile.is_admin('treeio.services')
+
+
+class TicketQueueHandler(ObjectHandler):
+    "Entrypoint for TicketQueue model."
+    model = TicketQueue
+    form = QueueForm
+
+    @classmethod
+    def resource_uri(cls, obj=None):
+        object_id = "id"
+        if obj is not None:
+            object_id = obj.id
+        return ('api_services_queues', [object_id])
+
+    def check_create_permission(self, request, mode):
+        return request.user.profile.is_admin('treeio.services')
+
+
+class TicketRecordHandler(BaseHandler):
+    "Entrypoint for TicketRecord model."
+    model = TicketRecord
+    allowed_methods = ('GET', 'POST')
+    fields = ('body', 'record_type', 'author', 'comments')
+
+    @classmethod
+    def resource_uri(cls, obj=None):
+        object_id = "id"
+        if obj is not None:
+            object_id = obj.id
+        return ('api_services_ticket_records', [object_id])
+
+    @staticmethod
+    def get_ticket(request, kwargs):
+        if 'ticket_id' not in kwargs:
+            return rc.BAD_REQUEST
+        try:
+            ticket = Ticket.objects.get(pk=kwargs['ticket_id'])
+        except Ticket.DoesNotExist:
+            return rc.NOT_FOUND
+
+        if not request.user.profile.has_permission(ticket):
+            return rc.FORBIDDEN
+        return ticket
+
+    def read(self, request, *args, **kwargs):
+        ticket = self.get_ticket(request, kwargs)
+
+        if isinstance(ticket, Ticket):
+            return ticket.updates.all().order_by('date_created')
+        else:
+            return ticket
+
+    def create(self, request, *args, **kwargs):
+        ticket = self.get_ticket(request, kwargs)
+        if isinstance(ticket, Ticket):
+            profile = request.user.profile
+            if profile.has_permission(ticket, mode='x'):
+                context = _get_default_context(request)
+                agent = context['agent']
+
+                record = TicketRecord(sender=profile.get_contact())
+                record.record_type = 'manual'
+                if ticket.message:
+                    record.message = ticket.message
+                form = TicketRecordForm(
+                    agent, ticket, request.data, instance=record)
+                if form.is_valid():
+                    record = form.save()
+                    record.save()
+                    record.set_user_from_request(request)
+                    record.about.add(ticket)
+                    ticket.set_last_updated()
+                    return record
+                else:
+                    self.status = 400
+                    return form.errors
+            else:
+                return rc.FORBIDDEN
+        else:
+            return ticket
+
+
+class TicketHandler(ObjectHandler):
+    "Entrypoint for Ticket model."
+    model = Ticket
+    form = TicketForm
+
+    @classmethod
+    def resource_uri(cls, obj=None):
+        object_id = "id"
+        if obj is not None:
+            object_id = obj.id
+        return ('api_services_tickets', [object_id])
+
+    def check_create_permission(self, request, mode):
+        request.context = _get_default_context(request)
+        request.agent = request.context['agent']
+        request.profile = request.user.profile
+
+        request.queue = None
+        if 'queue_id' in request.GET:
+            try:
+                request.queue = TicketQueue.objects.get(
+                    pk=request.GET['queue_id'])
+            except self.model.DoesNotExist:
+                return False
+            if not request.user.profile.has_permission(request.queue, mode='x'):
+                request.queue = None
+        return True
+
+    def check_instance_permission(self, request, inst, mode):
+        context = _get_default_context(request)
+        request.agent = context['agent']
+        request.queue = None
+        return request.user.profile.has_permission(inst, mode=mode)
+
+    def flatten_dict(self, request):
+        dct = super(TicketHandler, self).flatten_dict(request)
+        dct['agent'] = request.agent
+        dct['queue'] = request.queue
+        return dct
+
+    def create_instance(self, request, *args, **kwargs):
+        ticket = Ticket(creator=request.user.profile)
+        if not request.agent:
+            if request.queue:
+                ticket.queue = request.queue
+                if request.queue.default_ticket_status:
+                    ticket.status = request.queue.default_ticket_status
+                else:
+                    try:
+                        conf = ModuleSetting.get_for_module(
+                            'treeio.services', 'default_ticket_status')[0]
+                        ticket.status = TicketStatus.objects.get(
+                            pk=long(conf.value))
+                    except:
+                        if 'statuses' in request.context:
+                            try:
+                                ticket.status = request.context['statuses'][0]
+                            except:
+                                pass
+                ticket.priority = request.queue.default_ticket_priority
+                ticket.service = request.queue.default_service
+            else:
+                try:
+                    conf = ModuleSetting.get_for_module(
+                        'treeio.services', 'default_ticket_status')[0]
+                    ticket.status = TicketStatus.objects.get(
+                        pk=long(conf.value))
+                except:
+                    if 'statuses' in request.context:
+                        try:
+                            ticket.status = request.context['statuses'][0]
+                        except:
+                            pass
+                try:
+                    conf = ModuleSetting.get_for_module(
+                        'treeio.services', 'default_ticket_queue')[0]
+                    ticket.queue = TicketQueue.objects.get(pk=long(conf.value))
+                except:
+                    if 'queues' in request.context:
+                        try:
+                            ticket.queue = request.context['queues'][0]
+                        except:
+                            pass
+            try:
+                ticket.caller = request.user.profile.get_contact()
+            except:
+                pass
+        return ticket
diff --git a/data/treeio/treeio/treeio/services/forms.py b/data/treeio/treeio/treeio/services/forms.py
new file mode 100644
index 0000000..aa05373
--- /dev/null
+++ b/data/treeio/treeio/treeio/services/forms.py
@@ -0,0 +1,611 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+"""
+Services module forms
+"""
+from django import forms
+from django.db.models import Q
+from django.core.urlresolvers import reverse
+from django.utils.translation import ugettext as _
+from treeio.core.conf import settings
+from treeio.identities.models import Contact
+from treeio.core.decorators import preprocess_form
+from treeio.core.models import Object, ModuleSetting
+from treeio.core.rendering import get_template_source
+from treeio.messaging.models import Message
+from treeio.messaging.emails import EmailMessage
+from treeio.services.models import Ticket, TicketRecord, ServiceAgent, TicketStatus, Service
+from treeio.services.models import ServiceLevelAgreement, TicketQueue
+
+preprocess_form()
+
+
+class SettingsForm(forms.Form):
+    """ Administration settings form """
+
+    default_ticket_status = forms.ModelChoiceField(
+        label='Default Ticket Status', queryset=[])
+    default_ticket_queue = forms.ModelChoiceField(
+        label='Default Queue', queryset=[])
+    send_email_to_caller = forms.ChoiceField(label="Notify Caller By E-mail", choices=((True, _('Yes')),
+                                                                                       (False, _('No'))),
+                                             required=False)
+    send_email_template = forms.CharField(
+        label="E-mail Template", widget=forms.Textarea, required=False)
+
+    def __init__(self, user, *args, **kwargs):
+        "Sets choices and initial value"
+        super(SettingsForm, self).__init__(*args, **kwargs)
+
+        # Translate
+        self.fields['default_ticket_status'].label = _('Default Ticket Status')
+        self.fields['default_ticket_queue'].label = _('Default Queue')
+        self.fields['send_email_to_caller'].label = _(
+            "Notify Caller By E-mail")
+        self.fields['send_email_template'].label = _("E-mail Template")
+
+        self.fields['default_ticket_status'].queryset = Object.filter_permitted(
+            user, TicketStatus.objects, mode='x')
+        self.fields['default_ticket_queue'].queryset = Object.filter_permitted(
+            user, TicketQueue.objects, mode='x')
+
+        try:
+            conf = ModuleSetting.get_for_module(
+                'treeio.services', 'default_ticket_status')[0]
+            default_ticket_status = TicketStatus.objects.get(
+                pk=long(conf.value))
+            self.fields[
+                'default_ticket_status'].initial = default_ticket_status.id
+        except Exception:
+            pass
+
+        try:
+            conf = ModuleSetting.get_for_module(
+                'treeio.services', 'default_ticket_queue')[0]
+            default_ticket_queue = TicketQueue.objects.get(pk=long(conf.value))
+            self.fields[
+                'default_ticket_queue'].initial = default_ticket_queue.id
+        except Exception:
+            pass
+
+        try:
+            conf = ModuleSetting.get_for_module(
+                'treeio.services', 'send_email_to_caller')[0]
+            self.fields['send_email_to_caller'].initial = conf.value
+        except:
+            self.fields[
+                'send_email_to_caller'].initial = settings.HARDTREE_SEND_EMAIL_TO_CALLER
+
+        # notification template
+        try:
+            conf = ModuleSetting.get_for_module(
+                'treeio.services', 'send_email_template')[0]
+            self.fields['send_email_template'].initial = conf.value
+        except Exception:
+            self.fields['send_email_template'].initial = get_template_source(
+                'services/emails/notify_caller.html')
+
+    def save(self):
+        "Form processor"
+        try:
+            ModuleSetting.set_for_module('default_ticket_status',
+                                         self.cleaned_data[
+                                             'default_ticket_status'].id,
+                                         'treeio.services')
+            ModuleSetting.set_for_module('default_ticket_queue',
+                                         self.cleaned_data[
+                                             'default_ticket_queue'].id,
+                                         'treeio.services')
+            ModuleSetting.set_for_module('send_email_to_caller',
+                                         self.cleaned_data[
+                                             'send_email_to_caller'],
+                                         'treeio.services')
+            ModuleSetting.set_for_module('send_email_template',
+                                         self.cleaned_data[
+                                             'send_email_template'],
+                                         'treeio.services')
+            return True
+
+        except Exception:
+            return False
+
+
+class MassActionForm(forms.Form):
+    """ Mass action form for Tickets """
+
+    status = forms.ModelChoiceField(queryset=[], required=False)
+    service = forms.ModelChoiceField(queryset=[], required=False)
+    queue = forms.ModelChoiceField(queryset=[], required=False)
+    delete = forms.ChoiceField(label=_("Delete"), choices=(('', '-----'), ('delete', _('Delete Completely')),
+                                                           ('trash', _('Move to Trash'))), required=False)
+    instance = None
+
+    def __init__(self, user, *args, **kwargs):
+        "Sets allowed values"
+        if 'instance' in kwargs:
+            self.instance = kwargs['instance']
+            del kwargs['instance']
+
+        super(MassActionForm, self).__init__(*args, **kwargs)
+
+        self.fields['status'].queryset = Object.filter_permitted(
+            user, TicketStatus.objects, mode='x')
+        self.fields['status'].label = _("Status")
+        self.fields['service'].queryset = Object.filter_permitted(
+            user, Service.objects, mode='x')
+        self.fields['service'].label = _("Service")
+        self.fields['queue'].queryset = Object.filter_permitted(
+            user, TicketQueue.objects, mode='x')
+        self.fields['queue'].label = _("Queue")
+        self.fields['delete'] = forms.ChoiceField(label=_("Delete"), choices=(('', '-----'),
+                                                                              ('delete', _(
+                                                                                  'Delete Completely')),
+                                                                              ('trash', _('Move to Trash'))),
+                                                  required=False)
+
+    def save(self, *args, **kwargs):
+        "Process form"
+        if self.instance:
+            if self.is_valid():
+                if self.cleaned_data['service']:
+                    self.instance.service = self.cleaned_data['service']
+                if self.cleaned_data['status']:
+                    self.instance.status = self.cleaned_data['status']
+                if self.cleaned_data['queue']:
+                    self.instance.queue = self.cleaned_data['queue']
+                self.instance.save()
+                if self.cleaned_data['delete']:
+                    if self.cleaned_data['delete'] == 'delete':
+                        self.instance.delete()
+                    if self.cleaned_data['delete'] == 'trash':
+                        self.instance.trash = True
+                        self.instance.save()
+
+
+class TicketForm(forms.ModelForm):
+    """ Ticket form """
+    name = forms.CharField(
+        label='Title', widget=forms.TextInput(attrs={'size': '50'}))
+
+    def __init__(self, user, queue, agent, *args, **kwargs):
+        "Sets allowed values"
+        super(TicketForm, self).__init__(*args, **kwargs)
+
+        # Filter allowed selections for TicketForm
+        self.fields['reference'].required = False
+        self.fields['reference'].label = _("Reference")
+        self.fields['caller'].queryset = Object.filter_permitted(
+            user, Contact.objects)
+        self.fields['caller'].widget.attrs.update({'class': 'autocomplete',
+                                                   'callback': reverse('identities_ajax_contact_lookup')})
+        self.fields['caller'].widget.attrs.update(
+            {'popuplink': reverse('identities_contact_add')})
+        self.fields['caller'].label = _("Caller")
+
+        self.fields['assigned'].queryset = Object.filter_permitted(
+            user, ServiceAgent.objects, mode='x')
+        self.fields['assigned'].label = _("Assigned to")
+        self.fields['assigned'].help_text = ""
+        self.fields['assigned'].widget.attrs.update({'class': 'multicomplete',
+                                                     'callback': reverse('services_ajax_agent_lookup')})
+        self.fields['assigned'].widget.attrs.update(
+            {'popuplink': reverse('services_agent_add')})
+
+        self.fields['status'].queryset = Object.filter_permitted(
+            user, TicketStatus.objects, mode='x')
+        self.fields['status'].label = _("Status")
+        self.fields['service'].queryset = Object.filter_permitted(
+            user, Service.objects, mode='x')
+        self.fields['service'].label = _("Service")
+        self.fields['queue'].queryset = Object.filter_permitted(
+            user, TicketQueue.objects, mode='x')
+        self.fields['queue'].label = _("Queue")
+        self.fields['sla'].queryset = Object.filter_permitted(
+            user, ServiceLevelAgreement.objects, mode='x')
+        self.fields['sla'].label = _("Service Level Agreement")
+
+        self.fields['resolution'].label = _("Resolution")
+
+        # Set default values if not editing
+        if 'instance' not in kwargs:
+            try:
+                self.fields['caller'].initial = user.get_contact().id
+            except Exception:
+                pass
+
+            if queue:
+                self.fields['queue'].initial = queue.id
+                if queue.default_ticket_status and queue.default_ticket_status in self.fields['status'].queryset:
+                    self.fields[
+                        'status'].initial = queue.default_ticket_status_id
+                else:
+                    try:
+                        conf = ModuleSetting.get_for_module(
+                            'treeio.services', 'default_ticket_status')[0]
+                        self.fields['status'].initial = long(conf.value)
+                    except:
+                        pass
+
+                if queue.default_ticket_priority:
+                    self.fields[
+                        'priority'].initial = queue.default_ticket_priority
+                if queue.default_service:
+                    self.fields['service'].initial = queue.default_service_id
+                    try:
+                        default_sla = ServiceLevelAgreement.objects.get(
+                            service=queue.default_service, default=True)
+                        if default_sla:
+                            self.fields['sla'].initial = default_sla.id
+                    except:
+                        pass
+            else:
+                try:
+                    conf = ModuleSetting.get_for_module(
+                        'treeio.services', 'default_ticket_status')[0]
+                    self.fields['status'].initial = long(conf.value)
+                except:
+                    pass
+                try:
+                    conf = ModuleSetting.get_for_module(
+                        'treeio.services', 'default_ticket_queue')[0]
+                    self.fields['queue'].initial = long(conf.value)
+                except:
+                    pass
+
+        self.fields['name'].label = _("Name")
+        self.fields['name'].widget.attrs.update({'class': 'duplicates',
+                                                 'callback': reverse('services_ajax_ticket_lookup')})
+        self.fields['priority'].label = _("Priority")
+        self.fields['priority'].choices = ((5, _('Highest')), (
+            4, _('High')), (3, _('Normal')), (2, _('Low')), (1, _('Lowest')))
+        self.fields['urgency'].label = _("Urgency")
+        self.fields['urgency'].choices = ((5, _('Highest')), (
+            4, _('High')), (3, _('Normal')), (2, _('Low')), (1, _('Lowest')))
+        self.fields['details'].label = _("Details")
+
+        if not agent:
+            del self.fields['caller']
+            del self.fields['reference']
+            del self.fields['priority']
+            del self.fields['status']
+            del self.fields['queue']
+            del self.fields['sla']
+            del self.fields['assigned']
+            del self.fields['resolution']
+
+    class Meta:
+
+        "Ticket specified as model"
+        model = Ticket
+        fields = ('name', 'reference', 'caller', 'assigned', 'urgency', 'priority',
+                  'status', 'service', 'sla', 'queue', 'details', 'resolution')
+
+
+class TicketStatusForm(forms.ModelForm):
+    """ TicketStatus form """
+    name = forms.CharField(widget=forms.TextInput(attrs={'size': '30'}))
+
+    def __init__(self, user, *args, **kwargs):
+        "Sets allowed values"
+        super(TicketStatusForm, self).__init__(*args, **kwargs)
+
+    class Meta:
+        "TicketStatus specified as model"
+        model = TicketStatus
+        fields = ('name', 'active', 'hidden', 'details')
+
+
+class TicketRecordForm(forms.ModelForm):
+    """ TicketRecord form """
+
+    def __init__(self, agent, ticket, *args, **kwargs):
+        super(TicketRecordForm, self).__init__(*args, **kwargs)
+
+        self.ticket = ticket
+
+        self.fields['body'].label = _("body")
+        self.fields['body'].required = True
+        self.fields['notify'].label = _("Notify caller")
+        self.fields['resolution'] = forms.BooleanField(
+            label=_("Set as Resolution"), required=False)
+
+        if not agent:
+            del self.fields['notify']
+            del self.fields['resolution']
+
+    def save(self, *args, **kwargs):
+        "Set Resolution if selected"
+        instance = super(TicketRecordForm, self).save(*args, **kwargs)
+        ticket = self.ticket
+        if 'resolution' in self.cleaned_data and self.cleaned_data['resolution']:
+            ticket.resolution = self.cleaned_data['body']
+            ticket.save()
+
+        # Send update if notify clicked
+        if 'notify' in self.cleaned_data and self.cleaned_data['notify'] and ticket.caller:
+            toaddr = ticket.caller.get_email()
+            if ticket.message or toaddr:
+                reply = Message()
+                reply.author = instance.sender
+                reply.body = instance.body
+                reply.auto_notify = False
+                if ticket.message:
+                    reply.stream = ticket.message.stream
+                    reply.reply_to = ticket.message
+                else:
+                    reply.stream = ticket.queue.message_stream if ticket.queue else None
+                    reply.title = "[#%s] %s" % (ticket.reference, ticket.name)
+                reply.save()
+                if not ticket.message:
+                    ticket.message = reply
+                reply.recipients.add(ticket.caller)
+                email = EmailMessage(reply)
+                email.send_email()
+
+        return instance
+
+    class Meta:
+
+        "TicketRecord specified as model"
+        model = TicketRecord
+        fields = ['body', 'notify']
+
+
+class QueueForm(forms.ModelForm):
+    """ Queue form """
+    name = forms.CharField(widget=forms.TextInput(attrs={'size': '50'}))
+
+    def __init__(self, user, *args, **kwargs):
+        "Sets allowed values"
+        super(QueueForm, self).__init__(*args, **kwargs)
+
+        manager = TicketQueue.objects
+        if 'instance' in kwargs:
+            instance = kwargs['instance']
+            manager = manager.exclude(Q(parent=instance) & Q(pk=instance.id))
+        self.fields['parent'].queryset = Object.filter_permitted(
+            user, manager, mode='x')
+
+        self.fields['default_service'].queryset = Object.filter_permitted(
+            user, Service.objects, mode='x')
+
+        self.fields['waiting_time'].help_text = "seconds"
+
+        self.fields['name'].label = _("Name")
+        self.fields['active'].label = _("Active")
+        self.fields['parent'].label = _("Parent")
+        self.fields['default_ticket_status'].label = _("Default ticket status")
+        self.fields['default_ticket_priority'].label = _(
+            "Default ticket priority")
+        self.fields['default_service'].label = _("Default service")
+        self.fields['waiting_time'].label = _("Waiting time")
+        self.fields['next_queue'].queryset = Object.filter_permitted(
+            user, TicketQueue.objects, mode='x')
+        self.fields['next_queue'].label = _("Next queue")
+        self.fields['ticket_code'].label = _("Ticket code")
+        self.fields['message_stream'].label = _("Message stream")
+        self.fields['message_stream'].widget.attrs.update(
+            {'popuplink': reverse('messaging_stream_add')})
+        self.fields['details'].label = _("Details")
+
+    class Meta:
+        "TicketQueue specified as model"
+        model = TicketQueue
+        fields = ('name', 'active', 'parent', 'default_ticket_status',
+                  'default_ticket_priority', 'default_service', 'waiting_time',
+                  'next_queue', 'ticket_code', 'message_stream', 'details')
+
+
+class ServiceForm(forms.ModelForm):
+    """ Service form """
+    name = forms.CharField(widget=forms.TextInput(attrs={'size': '50'}))
+
+    def __init__(self, user, *args, **kwargs):
+        "Sets allowed values"
+        super(ServiceForm, self).__init__(*args, **kwargs)
+
+        manager = Service.objects
+        if 'instance' in kwargs:
+            instance = kwargs['instance']
+            manager = manager.exclude(Q(parent=instance) & Q(pk=instance.id))
+        self.fields['parent'].queryset = Object.filter_permitted(
+            user, manager, mode='x')
+
+        self.fields['name'].label = _("Name")
+        self.fields['parent'].label = _("Parent")
+        self.fields['details'].label = _("Details")
+
+    class Meta:
+        "Service specified as model"
+        model = Service
+        fields = ('name', 'parent', 'details')
+
+
+class ServiceLevelAgreementForm(forms.ModelForm):
+    """ ServiceLevelAgreement form """
+    name = forms.CharField(widget=forms.TextInput(attrs={'size': '50'}))
+
+    def __init__(self, user, *args, **kwargs):
+        "Sets allowed values"
+        super(ServiceLevelAgreementForm, self).__init__(*args, **kwargs)
+
+        self.fields['name'].label = _("Name")
+
+        self.fields['response_time'].help_text = 'minutes'
+        self.fields['response_time'].widget.attrs.update({'size': 10})
+        self.fields['response_time'].label = _("Response time")
+
+        self.fields['uptime_rate'].help_text = 'percent'
+        self.fields['uptime_rate'].widget.attrs.update({'size': 5})
+        self.fields['uptime_rate'].label = _("Uptime rate")
+
+        self.fields['service'].queryset = Object.filter_permitted(
+            user, Service.objects, mode='x')
+        self.fields['service'].label = _("Service")
+
+        self.fields['client'].queryset = Object.filter_permitted(
+            user, Contact.objects, mode='x')
+        self.fields['client'].widget.attrs.update({'class': 'autocomplete',
+                                                   'callback': reverse('identities_ajax_contact_lookup')})
+        self.fields['client'].widget.attrs.update(
+            {'popuplink': reverse('identities_contact_add')})
+        self.fields['client'].label = _("Client")
+
+        self.fields['provider'].queryset = Object.filter_permitted(
+            user, Contact.objects, mode='x')
+        self.fields['provider'].widget.attrs.update({'class': 'autocomplete',
+                                                     'callback': reverse('identities_ajax_contact_lookup')})
+        self.fields['provider'].widget.attrs.update(
+            {'popuplink': reverse('identities_contact_add')})
+        self.fields['provider'].label = _("Provider")
+
+        self.fields['available_from'].initial = "09:00"
+        self.fields['available_from'].widget.attrs.update({'size': 10})
+        self.fields['available_from'].label = _("Available from")
+        self.fields['available_to'].initial = "18:00"
+        self.fields['available_to'].widget.attrs.update({'size': 10})
+        self.fields['available_to'].label = _("Available to")
+
+        contact = user.default_group.get_contact()
+        if contact:
+            self.fields['provider'].initial = contact.id
+
+    class Meta:
+        "ServiceLevelAgreement specified as model"
+        model = ServiceLevelAgreement
+        fields = ('name', 'service', 'client', 'provider', 'response_time', 'uptime_rate', 'available_from',
+                  'available_to')
+
+
+class AgentForm(forms.ModelForm):
+    """ Agent form """
+
+    def __init__(self, user, *args, **kwargs):
+        "Sets allowed values"
+        super(AgentForm, self).__init__(*args, **kwargs)
+
+        self.fields['related_user'].label = _("Related user")
+        self.fields['related_user'].widget.attrs.update({'class': 'autocomplete',
+                                                         'callback': reverse('identities_ajax_user_lookup')})
+        self.fields['active'].label = _("Active")
+        self.fields['occupied'].label = _("Occupied")
+        self.fields['available_from'].label = _("Available from")
+        self.fields['available_to'].label = _("Available to")
+
+    class Meta:
+        "Agent specified as model"
+        model = ServiceAgent
+        fields = ('related_user', 'active', 'occupied',
+                  'available_from', 'available_to')
+
+
+class FilterForm(forms.ModelForm):
+    """ Ticket Filters definition """
+
+    def __init__(self, user, skip=None, *args, **kwargs):
+        "Sets allowed values"
+        if skip is None:
+            skip = []
+        super(FilterForm, self).__init__(*args, **kwargs)
+
+        if 'caller' in skip:
+            del self.fields['caller']
+        else:
+            self.fields['caller'].queryset = Object.filter_permitted(
+                user, Contact.objects, mode='x')
+            self.fields['caller'].widget.attrs.update({'class': 'autocomplete',
+                                                       'callback': reverse('identities_ajax_contact_lookup')})
+            self.fields['caller'].label = _("Caller")
+
+        if 'status' in skip:
+            del self.fields['status']
+        else:
+            self.fields['status'].queryset = Object.filter_permitted(
+                user, TicketStatus.objects, mode='x')
+            self.fields['status'].label = _("Status")
+
+        self.fields['service'].queryset = Object.filter_permitted(
+            user, Service.objects, mode='x')
+        self.fields['service'].label = _("Service")
+
+        self.fields['sla'].queryset = Object.filter_permitted(
+            user, ServiceLevelAgreement.objects, mode='x')
+        self.fields['sla'].label = _("SLA")
+
+        if 'queue' in skip:
+            del self.fields['queue']
+        else:
+            self.fields['queue'].queryset = Object.filter_permitted(
+                user, TicketQueue.objects, mode='x')
+            self.fields['queue'].label = _("Queue")
+
+        if 'assigned' in skip:
+            del self.fields['assigned']
+        else:
+            self.fields['assigned'].queryset = Object.filter_permitted(
+                user, ServiceAgent.objects, mode='x')
+            self.fields['assigned'].widget.attrs.update({'class': 'multicomplete',
+                                                         'callback': reverse('services_ajax_agent_lookup')})
+            self.fields['assigned'].label = _("Assigned to")
+            self.fields['assigned'].help_text = ""
+
+    class Meta:
+
+        "Ticket specified as model"
+        model = Ticket
+        fields = ('caller', 'status', 'service', 'sla', 'queue', 'assigned')
+
+
+class SLAFilterForm(forms.ModelForm):
+    """ SLA Filters definition """
+
+    def __init__(self, user, skip=None, *args, **kwargs):
+        "Sets allowed values"
+        if skip is None:
+            skip = []
+        super(SLAFilterForm, self).__init__(*args, **kwargs)
+
+        self.fields['client'].queryset = Object.filter_permitted(
+            user, Contact.objects, mode='x')
+        self.fields['client'].required = False
+        self.fields['client'].widget.attrs.update({'class': 'autocomplete',
+                                                   'callback': reverse('identities_ajax_contact_lookup')})
+        self.fields['client'].label = _("Client")
+
+        self.fields['provider'].queryset = Object.filter_permitted(
+            user, Contact.objects, mode='x')
+        self.fields['provider'].required = False
+        self.fields['provider'].widget.attrs.update({'class': 'autocomplete',
+                                                     'callback': reverse('identities_ajax_contact_lookup')})
+        self.fields['provider'].label = _("Provider")
+
+        self.fields['service'].queryset = Object.filter_permitted(
+            user, Service.objects, mode='x')
+        self.fields['service'].required = False
+        self.fields['service'].label = _("Service")
+
+    class Meta:
+        "ServiceLevelAgreement specified as model"
+        model = ServiceLevelAgreement
+        fields = ('service', 'client', 'provider')
+
+
+class AgentFilterForm(forms.ModelForm):
+    """ Agent Filters definition """
+
+    def __init__(self, user, skip=None, *args, **kwargs):
+        "Sets allowed values"
+        if skip is None:
+            skip = []
+        super(AgentFilterForm, self).__init__(*args, **kwargs)
+
+        self.fields['related_user'].required = True
+        self.fields['related_user'].label = _("Related user")
+
+    class Meta:
+        "ServiceAgent specified as model"
+        model = ServiceAgent
+        fields = ['related_user']
diff --git a/data/treeio/treeio/treeio/services/identities.py b/data/treeio/treeio/treeio/services/identities.py
new file mode 100644
index 0000000..5301daf
--- /dev/null
+++ b/data/treeio/treeio/treeio/services/identities.py
@@ -0,0 +1,67 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+"""
+Handle objects from this module relevant to a Contact or a User
+"""
+from treeio.core.models import Object
+from treeio.services.models import Ticket
+from treeio.services.templatetags.services import services_ticket_list
+
+CONTACT_OBJECTS = {'ticket_set': {'label': 'Tickets',
+                                  'objects': [],
+                                  'templatetag': services_ticket_list},
+                   'client_sla': {'label': 'Service Level Agreements',
+                                  'objects': [],
+                                  'templatetag': None}, 'provider_sla': {'label': 'Provided SLAs',
+                                                                         'objects': [],
+                                                                         'templatetag': None}}
+
+USER_OBJECTS = {'serviceagent_set': {'label': 'Assigned Tickets',
+                                     'objects': [],
+                                     'templatetag': services_ticket_list}}
+
+
+def get_contact_objects(current_user, contact):
+    """
+    Returns a dictionary with keys specified as contact attributes
+    and values as dictionaries with labels and set of relevant objects.
+    """
+
+    objects = dict(CONTACT_OBJECTS)
+
+    for key in objects:
+        if hasattr(contact, key):
+            manager = getattr(contact, key)
+            try:
+                manager = manager.filter(status__hidden=False)
+            except:
+                pass
+            objects[key]['objects'] = Object.filter_permitted(
+                current_user, manager)
+
+    return objects
+
+
+def get_user_objects(current_user, user):
+    """
+    Returns a dictionary with keys specified as contact attributes
+    and values as dictionaries with labels and set of relevant objects.
+    """
+
+    objects = dict(USER_OBJECTS)
+
+    for key in objects:
+        if hasattr(user, key):
+            if key == 'serviceagent_set':
+                manager = Ticket.objects.filter(assigned__related_user=user)
+            else:
+                manager = getattr(user, key)
+            if hasattr(manager, 'status'):
+                manager = manager.filter(status__hidden=False)
+            objects[key]['objects'] = Object.filter_permitted(
+                current_user, manager)
+
+    return objects
diff --git a/data/treeio/treeio/treeio/services/models.py b/data/treeio/treeio/treeio/services/models.py
new file mode 100644
index 0000000..af772c2
--- /dev/null
+++ b/data/treeio/treeio/treeio/services/models.py
@@ -0,0 +1,370 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+"""
+ServiceSupport module objects.
+
+Depends on: treeio.core, treeio.identities
+"""
+
+from django.core.urlresolvers import reverse
+from django.db.models import signals
+from django.db import models
+from django.utils.translation import ugettext as _
+from django.utils.html import strip_tags
+from treeio.core.conf import settings
+from treeio.identities.models import Contact
+from treeio.core.models import User, Object, ModuleSetting, UpdateRecord
+from treeio.core.mail import BaseEmail
+from treeio.core.rendering import render_to_string, render_string_template
+from treeio.messaging.models import Message, MessageStream
+
+
+class TicketStatus(Object):
+
+    "State information about a ticket"
+    name = models.CharField(max_length=256)
+    details = models.TextField(blank=True, null=True)
+    active = models.BooleanField(default=True)
+    hidden = models.BooleanField(default=False)
+
+    searchable = False
+
+    def __unicode__(self):
+        return self.name
+
+    def get_absolute_url(self):
+        "Returns absolute URL of the object"
+        return reverse('services_status_view', args=[self.id])
+
+    class Meta:
+
+        "TicketStatus"
+        ordering = ('hidden', '-active', 'name')
+
+
+class Service(Object):
+
+    "Technical service supported by a company"
+    name = models.CharField(max_length=256)
+    parent = models.ForeignKey(
+        'self', blank=True, null=True, related_name='child_set')
+    details = models.TextField(blank=True, null=True)
+
+    access_inherit = ('parent', '*module', '*user')
+
+    def __unicode__(self):
+        return self.name
+
+    def get_absolute_url(self):
+        "Returns absolute URL of the object"
+        try:
+            return reverse('services_service_view', args=[self.id])
+        except Exception:
+            return ""
+
+    class Meta:
+
+        "Service"
+        ordering = ['name']
+
+
+class ServiceLevelAgreement(Object):
+
+    "Formal terms for service support"
+    name = models.CharField(max_length=256)
+    service = models.ForeignKey(Service)
+    default = models.BooleanField(default=False)
+    response_time = models.PositiveIntegerField(blank=True, null=True)
+    uptime_rate = models.FloatField(blank=True, null=True)
+    available_from = models.TimeField(blank=True, null=True)
+    available_to = models.TimeField(blank=True, null=True)
+    client = models.ForeignKey(
+        Contact, related_name="client_sla", blank=True, null=True)
+    provider = models.ForeignKey(Contact, related_name="provider_sla")
+
+    access_inherit = ('service', '*module', '*user')
+
+    class Meta:
+
+        "SLA"
+        ordering = ('name', 'client')
+
+    def __unicode__(self):
+        return self.name
+
+    def get_absolute_url(self):
+        "Returns absolute URL of the object"
+        try:
+            return reverse('services_sla_view', args=[self.id])
+        except Exception:
+            return ""
+
+
+class ServiceAgent(Object):
+
+    "User responsible for service support"
+    related_user = models.ForeignKey(User)
+    active = models.BooleanField(default=True)
+    occupied = models.BooleanField(default=False)
+    available_from = models.TimeField(blank=True, null=True)
+    available_to = models.TimeField(blank=True, null=True)
+
+    class Meta:
+
+        "ServiceAgent"
+        ordering = ('related_user', '-active', 'occupied')
+
+    def __unicode__(self):
+        return unicode(self.related_user)
+
+    def get_absolute_url(self):
+        "Returns absolute URL of the object"
+        try:
+            return reverse('services_agent_view', args=[self.id])
+        except Exception:
+            return ""
+
+
+class TicketQueue(Object):
+
+    "Queue for incoming tickets"
+    name = models.CharField(max_length=256)
+    active = models.BooleanField(default=True)
+    parent = models.ForeignKey(
+        'self', blank=True, null=True, related_name='child_set')
+    default_ticket_status = models.ForeignKey(
+        TicketStatus, blank=True, null=True, on_delete=models.SET_NULL)
+    default_ticket_priority = models.IntegerField(default=3,
+                                                  choices=((5, 'Highest'), (4, 'High'), (3, 'Normal'),
+                                                           (2, 'Low'), (1, 'Lowest')))
+    default_service = models.ForeignKey(
+        Service, blank=True, null=True, on_delete=models.SET_NULL)
+    waiting_time = models.PositiveIntegerField(blank=True, null=True)
+    next_queue = models.ForeignKey(
+        'self', blank=True, null=True, related_name='previous_set', on_delete=models.SET_NULL)
+    ticket_code = models.CharField(
+        max_length=8, blank=True, null=True, default='')
+    message_stream = models.ForeignKey(
+        MessageStream, blank=True, null=True, on_delete=models.SET_NULL)  # Messaging integration
+    details = models.TextField(blank=True, null=True)
+
+    class Meta:
+
+        "TicketQueue"
+        ordering = ('name', '-active', 'ticket_code')
+
+    def __unicode__(self):
+        return self.name
+
+    def get_absolute_url(self):
+        "Returns absolute URL of the object"
+        try:
+            return reverse('services_queue_view', args=[self.id])
+        except Exception:
+            return ""
+
+
+class Ticket(Object):
+
+    "Problem or support request ticket"
+    reference = models.CharField(max_length=256)
+    name = models.CharField(max_length=256)
+    caller = models.ForeignKey(
+        Contact, blank=True, null=True, on_delete=models.SET_NULL)
+    urgency = models.IntegerField(default=3,
+                                  choices=((5, _('Highest')), (4, _('High')), (3, _('Normal')), (2, _('Low')),
+                                           (1, _('Lowest'))))
+    priority = models.IntegerField(default=3,
+                                   choices=((5, _('Highest')), (4, _('High')), (3, _('Normal')), (2, _('Low')),
+                                            (1, _('Lowest'))))
+    status = models.ForeignKey(TicketStatus)
+    service = models.ForeignKey(
+        Service, blank=True, null=True, on_delete=models.SET_NULL)
+    sla = models.ForeignKey(
+        ServiceLevelAgreement, blank=True, null=True, on_delete=models.SET_NULL)
+    queue = models.ForeignKey(TicketQueue, blank=True, null=True)
+    assigned = models.ManyToManyField(ServiceAgent, blank=True, null=True)
+    message = models.ForeignKey(
+        Message, blank=True, null=True, on_delete=models.SET_NULL)  # Messaging integration
+    details = models.TextField(blank=True, null=True)
+    resolution = models.TextField(blank=True, null=True)
+
+    #access_inherit = ('queue', '*module', '*user')
+
+    class Meta:
+
+        "Ticket"
+        ordering = ('-priority', 'reference')
+
+    def __unicode__(self):
+        return self.name
+
+    def priority_human(self):
+        "Returns a Human-friendly priority name"
+        choices = ((5, _('Highest')), (4, _('High')), (
+            3, _('Normal')), (2, _('Low')), (1, _('Lowest')))
+        for choice in choices:
+            if choice[0] == self.priority:
+                return choice[1]
+
+    def urgency_human(self):
+        "Returns a Human-friendly urgency name"
+        choices = ((5, _('Highest')), (4, _('High')), (
+            3, _('Normal')), (2, _('Low')), (1, _('Lowest')))
+        for choice in choices:
+            if choice[0] == self.priority:
+                return choice[1]
+
+    def save(self, *args, **kwargs):
+        "Automatically set ticket reference and send message to caller"
+        super(Ticket, self).save(*args, **kwargs)
+
+        if not self.reference:
+            if self.queue:
+                self.reference = self.queue.ticket_code + str(self.id)
+            else:
+                self.reference = str(self.id)
+            self.save()
+
+    def get_absolute_url(self):
+        "Returns absolute URL of the object"
+        try:
+            return reverse('services_ticket_view', args=[self.id])
+        except Exception:
+            return ""
+
+
+class TicketRecord(UpdateRecord):
+
+    "Update for a Ticket"
+    # Messaging integration
+    message = models.ForeignKey(Message, blank=True, null=True)
+    notify = models.BooleanField(default=False, blank=True)
+
+
+"""
+Service Support signals
+"""
+
+
+def email_caller_on_new_ticket(sender, instance, created, **kwargs):
+    "When a new ticket is created send an email to the caller"
+    if created:
+        send_email_to_caller = False
+        try:
+            conf = ModuleSetting.get_for_module(
+                'treeio.services', 'send_email_to_caller')[0]
+            send_email_to_caller = conf.value
+        except:
+            send_email_to_caller = getattr(
+                settings, 'HARDTREE_SEND_EMAIL_TO_CALLER', True)
+
+        if send_email_to_caller:
+            # don't send email to yourself
+            creator_contact = None
+            if instance.creator:
+                creator_contact = instance.creator.get_contact()
+
+            if instance.caller and instance.caller != creator_contact:
+                if not instance.reference:
+                    if instance.queue:
+                        instance.reference = instance.queue.ticket_code + \
+                            str(instance.id)
+                    else:
+                        instance.reference = str(instance.id)
+                    instance.save()
+                subject = "[#%s] %s" % (instance.reference, instance.name)
+
+                # Construct context and render to html, body
+                context = {'ticket': instance}
+                try:
+                    conf = ModuleSetting.get_for_module(
+                        'treeio.services', 'send_email_template')[0]
+                    send_email_template = conf.value
+                    html = render_string_template(send_email_template, context)
+                except:
+                    html = render_to_string(
+                        'services/emails/notify_caller', context, response_format='html')
+                body = strip_tags(html)
+
+                if instance.queue and instance.queue.message_stream:
+                    stream = instance.queue.message_stream
+                    if stream.outgoing_server_name:
+                        try:
+                            caller_email = instance.caller.get_email()
+                            if caller_email:
+                                toaddr = caller_email
+                                ssl = False
+                                if stream.outgoing_server_type == 'SMTP-SSL':
+                                    ssl = True
+                                email = BaseEmail(stream.outgoing_server_name,
+                                                  stream.outgoing_server_username,
+                                                  stream.outgoing_password,
+                                                  stream.outgoing_email,
+                                                  toaddr, subject, body, html=html,
+                                                  ssl=ssl)
+                                email.process_email()
+                        except:
+                            pass
+
+signals.post_save.connect(email_caller_on_new_ticket, sender=Ticket)
+
+
+def create_ticket_from_message(sender, instance, created, **kwargs):
+    """
+    Get a signal from messaging.models
+    Check if (new) message's stream is also assigned to Ticket Queue
+    Create a new ticket from that message
+    Rename original message title
+    """
+
+    if created and getattr(instance, 'auto_notify', True):
+        if instance.reply_to:
+            tickets = instance.reply_to.ticket_set.all()
+            for ticket in tickets:
+                record = TicketRecord()
+                record.sender = instance.author
+                record.record_type = 'manual'
+                record.body = instance.body
+                record.save()
+                record.about.add(ticket)
+                ticket.set_last_updated()
+        else:
+            stream = instance.stream
+            queues = TicketQueue.objects.filter(message_stream=stream)
+            if stream and queues:
+                queue = queues[0]
+                ticket = Ticket()
+                try:
+                    conf = ModuleSetting.get_for_module(
+                        'treeio.services', 'default_ticket_status')[0]
+                    ticket.status = TicketStatus.objects.get(
+                        pk=long(conf.value))
+                except:
+                    statuses = TicketStatus.objects.all()
+                    ticket.status = statuses[0]
+                ticket.queue = queue
+                ticket.caller = instance.author
+                ticket.details = instance.body
+                ticket.message = instance
+                ticket.name = instance.title
+                ticket.auto_notify = False
+                ticket.save()
+                try:
+                    if stream.creator:
+                        ticket.set_user(stream.creator)
+                    elif queue.creator:
+                        ticket.set_user(queue.creator)
+                    else:
+                        ticket.copy_permissions(queue)
+                except:
+                    pass
+
+                # Rename original message title
+                instance.title = "[#" + ticket.reference + "] " + instance.title
+                instance.save()
+
+signals.post_save.connect(create_ticket_from_message, sender=Message)
diff --git a/data/treeio/treeio/treeio/services/south_migrations/0001_initial.py b/data/treeio/treeio/treeio/services/south_migrations/0001_initial.py
new file mode 100644
index 0000000..1034c0c
--- /dev/null
+++ b/data/treeio/treeio/treeio/services/south_migrations/0001_initial.py
@@ -0,0 +1,412 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Adding model 'TicketStatus'
+        db.create_table('services_ticketstatus', (
+            ('object_ptr', self.gf('django.db.models.fields.related.OneToOneField')(
+                to=orm['core.Object'], unique=True, primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')
+             (max_length=256)),
+            ('details', self.gf('django.db.models.fields.TextField')
+             (null=True, blank=True)),
+            ('active', self.gf('django.db.models.fields.BooleanField')
+             (default=True)),
+            ('hidden', self.gf('django.db.models.fields.BooleanField')
+             (default=False)),
+        ))
+        db.send_create_signal('services', ['TicketStatus'])
+
+        # Adding model 'Service'
+        db.create_table('services_service', (
+            ('object_ptr', self.gf('django.db.models.fields.related.OneToOneField')(
+                to=orm['core.Object'], unique=True, primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')
+             (max_length=256)),
+            ('parent', self.gf('django.db.models.fields.related.ForeignKey')(
+                blank=True, related_name='child_set', null=True, to=orm['services.Service'])),
+            ('details', self.gf('django.db.models.fields.TextField')
+             (null=True, blank=True)),
+        ))
+        db.send_create_signal('services', ['Service'])
+
+        # Adding model 'ServiceLevelAgreement'
+        db.create_table('services_servicelevelagreement', (
+            ('object_ptr', self.gf('django.db.models.fields.related.OneToOneField')(
+                to=orm['core.Object'], unique=True, primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')
+             (max_length=256)),
+            ('service', self.gf('django.db.models.fields.related.ForeignKey')
+             (to=orm['services.Service'])),
+            ('default', self.gf('django.db.models.fields.BooleanField')
+             (default=False)),
+            ('response_time', self.gf('django.db.models.fields.PositiveIntegerField')(
+                null=True, blank=True)),
+            ('uptime_rate', self.gf('django.db.models.fields.FloatField')
+             (null=True, blank=True)),
+            ('available_from', self.gf('django.db.models.fields.TimeField')
+             (null=True, blank=True)),
+            ('available_to', self.gf('django.db.models.fields.TimeField')
+             (null=True, blank=True)),
+            ('client', self.gf('django.db.models.fields.related.ForeignKey')(
+                blank=True, related_name='client_sla', null=True, to=orm['identities.Contact'])),
+            ('provider', self.gf('django.db.models.fields.related.ForeignKey')
+             (related_name='provider_sla', to=orm['identities.Contact'])),
+        ))
+        db.send_create_signal('services', ['ServiceLevelAgreement'])
+
+        # Adding model 'ServiceAgent'
+        db.create_table('services_serviceagent', (
+            ('object_ptr', self.gf('django.db.models.fields.related.OneToOneField')(
+                to=orm['core.Object'], unique=True, primary_key=True)),
+            ('related_user', self.gf('django.db.models.fields.related.ForeignKey')(
+                to=orm['core.User'])),
+            ('active', self.gf('django.db.models.fields.BooleanField')
+             (default=True)),
+            ('occupied', self.gf(
+                'django.db.models.fields.BooleanField')(default=False)),
+            ('available_from', self.gf('django.db.models.fields.TimeField')
+             (null=True, blank=True)),
+            ('available_to', self.gf('django.db.models.fields.TimeField')
+             (null=True, blank=True)),
+        ))
+        db.send_create_signal('services', ['ServiceAgent'])
+
+        # Adding model 'TicketQueue'
+        db.create_table('services_ticketqueue', (
+            ('object_ptr', self.gf('django.db.models.fields.related.OneToOneField')(
+                to=orm['core.Object'], unique=True, primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')
+             (max_length=256)),
+            ('active', self.gf('django.db.models.fields.BooleanField')
+             (default=True)),
+            ('parent', self.gf('django.db.models.fields.related.ForeignKey')(
+                blank=True, related_name='child_set', null=True, to=orm['services.TicketQueue'])),
+            ('default_ticket_status', self.gf('django.db.models.fields.related.ForeignKey')(
+                to=orm['services.TicketStatus'], null=True, blank=True)),
+            ('default_ticket_priority', self.gf(
+                'django.db.models.fields.IntegerField')(default=3)),
+            ('default_service', self.gf('django.db.models.fields.related.ForeignKey')(
+                to=orm['services.Service'], null=True, blank=True)),
+            ('waiting_time', self.gf('django.db.models.fields.PositiveIntegerField')(
+                null=True, blank=True)),
+            ('next_queue', self.gf('django.db.models.fields.related.ForeignKey')(
+                blank=True, related_name='previous_set', null=True, to=orm['services.TicketQueue'])),
+            ('ticket_code', self.gf('django.db.models.fields.CharField')
+             (default='', max_length=8, null=True, blank=True)),
+            ('message_stream', self.gf('django.db.models.fields.related.ForeignKey')(
+                to=orm['messaging.MessageStream'], null=True, blank=True)),
+            ('details', self.gf('django.db.models.fields.TextField')
+             (null=True, blank=True)),
+        ))
+        db.send_create_signal('services', ['TicketQueue'])
+
+        # Adding model 'Ticket'
+        db.create_table('services_ticket', (
+            ('object_ptr', self.gf('django.db.models.fields.related.OneToOneField')(
+                to=orm['core.Object'], unique=True, primary_key=True)),
+            ('reference', self.gf(
+                'django.db.models.fields.CharField')(max_length=256)),
+            ('name', self.gf('django.db.models.fields.CharField')
+             (max_length=256)),
+            ('caller', self.gf('django.db.models.fields.related.ForeignKey')
+             (to=orm['identities.Contact'], null=True, blank=True)),
+            ('urgency', self.gf(
+                'django.db.models.fields.IntegerField')(default=3)),
+            ('priority', self.gf(
+                'django.db.models.fields.IntegerField')(default=3)),
+            ('status', self.gf('django.db.models.fields.related.ForeignKey')
+             (to=orm['services.TicketStatus'])),
+            ('service', self.gf('django.db.models.fields.related.ForeignKey')
+             (to=orm['services.Service'], null=True, blank=True)),
+            ('sla', self.gf('django.db.models.fields.related.ForeignKey')(
+                to=orm['services.ServiceLevelAgreement'], null=True, blank=True)),
+            ('queue', self.gf('django.db.models.fields.related.ForeignKey')
+             (to=orm['services.TicketQueue'], null=True, blank=True)),
+            ('message', self.gf('django.db.models.fields.related.ForeignKey')
+             (to=orm['messaging.Message'], null=True, blank=True)),
+            ('details', self.gf('django.db.models.fields.TextField')
+             (null=True, blank=True)),
+            ('resolution', self.gf('django.db.models.fields.TextField')
+             (null=True, blank=True)),
+        ))
+        db.send_create_signal('services', ['Ticket'])
+
+        # Adding M2M table for field assigned on 'Ticket'
+        db.create_table('services_ticket_assigned', (
+            ('id', models.AutoField(
+                verbose_name='ID', primary_key=True, auto_created=True)),
+            ('ticket', models.ForeignKey(orm['services.ticket'], null=False)),
+            ('serviceagent', models.ForeignKey(
+                orm['services.serviceagent'], null=False))
+        ))
+        db.create_unique(
+            'services_ticket_assigned', ['ticket_id', 'serviceagent_id'])
+
+        # Adding model 'TicketRecord'
+        db.create_table('services_ticketrecord', (
+            ('object_ptr', self.gf('django.db.models.fields.related.OneToOneField')(
+                to=orm['core.Object'], unique=True, primary_key=True)),
+            ('ticket', self.gf('django.db.models.fields.related.ForeignKey')
+             (to=orm['services.Ticket'])),
+            ('record_type', self.gf(
+                'django.db.models.fields.CharField')(max_length=256)),
+            ('message', self.gf('django.db.models.fields.related.ForeignKey')
+             (to=orm['messaging.Message'], null=True, blank=True)),
+            ('details', self.gf('django.db.models.fields.TextField')()),
+            ('notify', self.gf('django.db.models.fields.BooleanField')
+             (default=False)),
+        ))
+        db.send_create_signal('services', ['TicketRecord'])
+
+    def backwards(self, orm):
+
+        # Deleting model 'TicketStatus'
+        db.delete_table('services_ticketstatus')
+
+        # Deleting model 'Service'
+        db.delete_table('services_service')
+
+        # Deleting model 'ServiceLevelAgreement'
+        db.delete_table('services_servicelevelagreement')
+
+        # Deleting model 'ServiceAgent'
+        db.delete_table('services_serviceagent')
+
+        # Deleting model 'TicketQueue'
+        db.delete_table('services_ticketqueue')
+
+        # Deleting model 'Ticket'
+        db.delete_table('services_ticket')
+
+        # Removing M2M table for field assigned on 'Ticket'
+        db.delete_table('services_ticket_assigned')
+
+        # Deleting model 'TicketRecord'
+        db.delete_table('services_ticketrecord')
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'core.group': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Group'},
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['core.Group']"})
+        },
+        'core.object': {
+            'Meta': {'object_name': 'Object'},
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'everybody_execute': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'everybody_read': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'everybody_write': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Group']"}),
+            'group_execute': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'group_read': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'group_write': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'links': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'links_rel_+'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'nuvius_resource': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'object_name': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'object_type': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'subscribers': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'subscriptions'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'trash': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']"}),
+            'user_execute': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'user_read': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'user_write': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'core.user': {
+            'Meta': {'ordering': "['name']", 'object_name': 'User'},
+            'default_group': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'default_user_set'", 'null': 'True', 'to': "orm['core.Group']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'other_groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'identities.contact': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Contact', '_ormbases': ['core.Object']},
+            'contact_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.ContactType']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['identities.Contact']"}),
+            'related_group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'related_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'})
+        },
+        'identities.contactfield': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ContactField', '_ormbases': ['core.Object']},
+            'allowed_values': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'field_type': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'required': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'identities.contacttype': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ContactType', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'fields': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['identities.ContactField']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'slug': ('django.db.models.fields.CharField', [], {'max_length': '256'})
+        },
+        'messaging.emailbox': {
+            'Meta': {'ordering': "['last_updated']", 'object_name': 'EmailBox', '_ormbases': ['core.Object']},
+            'email_name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'email_type': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'last_checked': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'server_name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'server_password': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'server_type': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'server_username': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        },
+        'messaging.message': {
+            'Meta': {'ordering': "['-date_created']", 'object_name': 'Message', '_ormbases': ['core.Object']},
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.Contact']"}),
+            'body': ('django.db.models.fields.TextField', [], {}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'read_by': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'read_by_user'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'reply_to': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['messaging.Message']"}),
+            'stream': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'stream'", 'to': "orm['messaging.MessageStream']"}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'})
+        },
+        'messaging.messagestream': {
+            'Meta': {'ordering': "['name']", 'object_name': 'MessageStream', '_ormbases': ['core.Object']},
+            'email_incoming': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'incoming'", 'null': 'True', 'to': "orm['messaging.EmailBox']"}),
+            'email_outgoing': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'outgoing'", 'null': 'True', 'to': "orm['messaging.EmailBox']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'services.service': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Service', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['services.Service']"})
+        },
+        'services.serviceagent': {
+            'Meta': {'ordering': "('related_user', '-active', 'occupied')", 'object_name': 'ServiceAgent', '_ormbases': ['core.Object']},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'available_from': ('django.db.models.fields.TimeField', [], {'null': 'True', 'blank': 'True'}),
+            'available_to': ('django.db.models.fields.TimeField', [], {'null': 'True', 'blank': 'True'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'occupied': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'related_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']"})
+        },
+        'services.servicelevelagreement': {
+            'Meta': {'ordering': "('name', 'client')", 'object_name': 'ServiceLevelAgreement', '_ormbases': ['core.Object']},
+            'available_from': ('django.db.models.fields.TimeField', [], {'null': 'True', 'blank': 'True'}),
+            'available_to': ('django.db.models.fields.TimeField', [], {'null': 'True', 'blank': 'True'}),
+            'client': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'client_sla'", 'null': 'True', 'to': "orm['identities.Contact']"}),
+            'default': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'provider': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'provider_sla'", 'to': "orm['identities.Contact']"}),
+            'response_time': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.Service']"}),
+            'uptime_rate': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'})
+        },
+        'services.ticket': {
+            'Meta': {'ordering': "('-priority', 'reference')", 'object_name': 'Ticket', '_ormbases': ['core.Object']},
+            'assigned': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['services.ServiceAgent']", 'null': 'True', 'blank': 'True'}),
+            'caller': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.Contact']", 'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'message': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['messaging.Message']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'priority': ('django.db.models.fields.IntegerField', [], {'default': '3'}),
+            'queue': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.TicketQueue']", 'null': 'True', 'blank': 'True'}),
+            'reference': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'resolution': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.Service']", 'null': 'True', 'blank': 'True'}),
+            'sla': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.ServiceLevelAgreement']", 'null': 'True', 'blank': 'True'}),
+            'status': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.TicketStatus']"}),
+            'urgency': ('django.db.models.fields.IntegerField', [], {'default': '3'})
+        },
+        'services.ticketqueue': {
+            'Meta': {'ordering': "('name', '-active', 'ticket_code')", 'object_name': 'TicketQueue', '_ormbases': ['core.Object']},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'default_service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.Service']", 'null': 'True', 'blank': 'True'}),
+            'default_ticket_priority': ('django.db.models.fields.IntegerField', [], {'default': '3'}),
+            'default_ticket_status': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.TicketStatus']", 'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'message_stream': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['messaging.MessageStream']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'next_queue': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'previous_set'", 'null': 'True', 'to': "orm['services.TicketQueue']"}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['services.TicketQueue']"}),
+            'ticket_code': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '8', 'null': 'True', 'blank': 'True'}),
+            'waiting_time': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'})
+        },
+        'services.ticketrecord': {
+            'Meta': {'ordering': "['ticket']", 'object_name': 'TicketRecord', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {}),
+            'message': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['messaging.Message']", 'null': 'True', 'blank': 'True'}),
+            'notify': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'record_type': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'ticket': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.Ticket']"})
+        },
+        'services.ticketstatus': {
+            'Meta': {'ordering': "('hidden', '-active', 'name')", 'object_name': 'TicketStatus', '_ormbases': ['core.Object']},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'hidden': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'})
+        }
+    }
+
+    complete_apps = ['services']
diff --git a/data/treeio/treeio/treeio/services/south_migrations/0002_auto__add_field_ticketrecord_updaterecord_ptr.py b/data/treeio/treeio/treeio/services/south_migrations/0002_auto__add_field_ticketrecord_updaterecord_ptr.py
new file mode 100644
index 0000000..cd74433
--- /dev/null
+++ b/data/treeio/treeio/treeio/services/south_migrations/0002_auto__add_field_ticketrecord_updaterecord_ptr.py
@@ -0,0 +1,305 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Adding field 'TicketRecord.updaterecord_ptr'
+        db.add_column('services_ticketrecord', 'updaterecord_ptr', self.gf('django.db.models.fields.related.OneToOneField')(
+            to=orm['core.UpdateRecord'], unique=True, null=True, blank=True), keep_default=False)
+
+    def backwards(self, orm):
+
+        # Deleting field 'TicketRecord.updaterecord_ptr'
+        db.delete_column('services_ticketrecord', 'updaterecord_ptr_id')
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'core.accessentity': {
+            'Meta': {'object_name': 'AccessEntity'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        },
+        'core.comment': {
+            'Meta': {'object_name': 'Comment'},
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'}),
+            'body': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"})
+        },
+        'core.group': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Group'},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['core.Group']"})
+        },
+        'core.object': {
+            'Meta': {'object_name': 'Object'},
+            'comments': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.Comment']"}),
+            'creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'objects_created'", 'null': 'True', 'to': "orm['core.User']"}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'full_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_full_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'links': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'links_rel_+'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'nuvius_resource': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'object_name': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'object_type': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'read_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_read_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'subscribers': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'subscriptions'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Tag']", 'null': 'True', 'blank': 'True'}),
+            'trash': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'})
+        },
+        'core.tag': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Tag'},
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'})
+        },
+        'core.updaterecord': {
+            'Meta': {'ordering': "['-date_created']", 'object_name': 'UpdateRecord'},
+            'about': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'updates'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.Object']"}),
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'sent_updates'", 'null': 'True', 'to': "orm['core.User']"}),
+            'body': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
+            'comments': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_on_updates'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.Comment']"}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'updates_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'format_message': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'format_strings': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'updates_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'recipients': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'received_updates'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'record_type': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
+            'score': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'sender': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'sent_updates'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'url': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'})
+        },
+        'core.user': {
+            'Meta': {'ordering': "['name']", 'object_name': 'User'},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'default_group': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'default_user_set'", 'null': 'True', 'to': "orm['core.AccessEntity']"}),
+            'disabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_access': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'other_groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'identities.contact': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Contact', '_ormbases': ['core.Object']},
+            'contact_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.ContactType']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['identities.Contact']"}),
+            'related_group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'related_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.AccessEntity']", 'null': 'True', 'blank': 'True'})
+        },
+        'identities.contactfield': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ContactField', '_ormbases': ['core.Object']},
+            'allowed_values': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'field_type': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'required': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'identities.contacttype': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ContactType', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'fields': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['identities.ContactField']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'slug': ('django.db.models.fields.CharField', [], {'max_length': '256'})
+        },
+        'messaging.emailbox': {
+            'Meta': {'ordering': "['last_updated']", 'object_name': 'EmailBox', '_ormbases': ['core.Object']},
+            'email_name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'email_type': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'last_checked': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'server_name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'server_password': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'server_type': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'server_username': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        },
+        'messaging.mailinglist': {
+            'Meta': {'ordering': "['-date_created']", 'object_name': 'MailingList', '_ormbases': ['core.Object']},
+            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'from_contact': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'from_contact_set'", 'to': "orm['identities.Contact']"}),
+            'members': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'members_set'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['identities.Contact']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'opt_in': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['messaging.Template']", 'null': 'True', 'blank': 'True'})
+        },
+        'messaging.message': {
+            'Meta': {'ordering': "['-date_created']", 'object_name': 'Message', '_ormbases': ['core.Object']},
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.Contact']"}),
+            'body': ('django.db.models.fields.TextField', [], {}),
+            'mlist': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'mlist'", 'null': 'True', 'to': "orm['messaging.MailingList']"}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'read_by': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'read_by_user'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'recipients': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'message_recipients'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['identities.Contact']"}),
+            'reply_to': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['messaging.Message']"}),
+            'stream': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'stream'", 'null': 'True', 'to': "orm['messaging.MessageStream']"}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'})
+        },
+        'messaging.messagestream': {
+            'Meta': {'ordering': "['name', 'last_updated']", 'object_name': 'MessageStream', '_ormbases': ['core.Object']},
+            'email_incoming': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'incoming'", 'null': 'True', 'to': "orm['messaging.EmailBox']"}),
+            'email_outgoing': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'outgoing'", 'null': 'True', 'to': "orm['messaging.EmailBox']"}),
+            'faulty': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'incoming_password': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'incoming_server_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'incoming_server_type': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'incoming_server_username': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'last_checked': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'outgoing_email': ('django.db.models.fields.EmailField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'outgoing_password': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'outgoing_server_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'outgoing_server_type': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'outgoing_server_username': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'})
+        },
+        'messaging.template': {
+            'Meta': {'object_name': 'Template', '_ormbases': ['core.Object']},
+            'body': ('django.db.models.fields.TextField', [], {}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'subject': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        },
+        'services.service': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Service', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['services.Service']"})
+        },
+        'services.serviceagent': {
+            'Meta': {'ordering': "('related_user', '-active', 'occupied')", 'object_name': 'ServiceAgent', '_ormbases': ['core.Object']},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'available_from': ('django.db.models.fields.TimeField', [], {'null': 'True', 'blank': 'True'}),
+            'available_to': ('django.db.models.fields.TimeField', [], {'null': 'True', 'blank': 'True'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'occupied': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'related_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']"})
+        },
+        'services.servicelevelagreement': {
+            'Meta': {'ordering': "('name', 'client')", 'object_name': 'ServiceLevelAgreement', '_ormbases': ['core.Object']},
+            'available_from': ('django.db.models.fields.TimeField', [], {'null': 'True', 'blank': 'True'}),
+            'available_to': ('django.db.models.fields.TimeField', [], {'null': 'True', 'blank': 'True'}),
+            'client': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'client_sla'", 'null': 'True', 'to': "orm['identities.Contact']"}),
+            'default': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'provider': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'provider_sla'", 'to': "orm['identities.Contact']"}),
+            'response_time': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.Service']"}),
+            'uptime_rate': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'})
+        },
+        'services.ticket': {
+            'Meta': {'ordering': "('-priority', 'reference')", 'object_name': 'Ticket', '_ormbases': ['core.Object']},
+            'assigned': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['services.ServiceAgent']", 'null': 'True', 'blank': 'True'}),
+            'caller': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.Contact']", 'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'message': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['messaging.Message']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'priority': ('django.db.models.fields.IntegerField', [], {'default': '3'}),
+            'queue': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.TicketQueue']", 'null': 'True', 'blank': 'True'}),
+            'reference': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'resolution': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.Service']", 'null': 'True', 'blank': 'True'}),
+            'sla': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.ServiceLevelAgreement']", 'null': 'True', 'blank': 'True'}),
+            'status': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.TicketStatus']"}),
+            'urgency': ('django.db.models.fields.IntegerField', [], {'default': '3'})
+        },
+        'services.ticketqueue': {
+            'Meta': {'ordering': "('name', '-active', 'ticket_code')", 'object_name': 'TicketQueue', '_ormbases': ['core.Object']},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'default_service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.Service']", 'null': 'True', 'blank': 'True'}),
+            'default_ticket_priority': ('django.db.models.fields.IntegerField', [], {'default': '3'}),
+            'default_ticket_status': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.TicketStatus']", 'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'message_stream': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['messaging.MessageStream']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'next_queue': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'previous_set'", 'null': 'True', 'to': "orm['services.TicketQueue']"}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['services.TicketQueue']"}),
+            'ticket_code': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '8', 'null': 'True', 'blank': 'True'}),
+            'waiting_time': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'})
+        },
+        'services.ticketrecord': {
+            'Meta': {'ordering': "['ticket']", 'object_name': 'TicketRecord', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {}),
+            'message': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['messaging.Message']", 'null': 'True', 'blank': 'True'}),
+            'notify': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'record_type': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'ticket': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.Ticket']"}),
+            'updaterecord_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.UpdateRecord']", 'unique': 'True', 'null': 'True', 'blank': 'True'})
+        },
+        'services.ticketstatus': {
+            'Meta': {'ordering': "('hidden', '-active', 'name')", 'object_name': 'TicketStatus', '_ormbases': ['core.Object']},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'hidden': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'})
+        }
+    }
+
+    complete_apps = ['services']
diff --git a/data/treeio/treeio/treeio/services/south_migrations/0003_updaterecords.py b/data/treeio/treeio/treeio/services/south_migrations/0003_updaterecords.py
new file mode 100644
index 0000000..8d415fb
--- /dev/null
+++ b/data/treeio/treeio/treeio/services/south_migrations/0003_updaterecords.py
@@ -0,0 +1,310 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import DataMigration
+from django.db import models
+
+
+class Migration(DataMigration):
+
+    def forwards(self, orm):
+        "Migrate the UpdateRecords"
+        for record in orm['services.TicketRecord'].objects.all():
+            update = orm['core.UpdateRecord'].objects.create()
+            update.author = record.creator
+            if record.record_type == 'manual':
+                update.record_type = 'manual'
+            else:
+                update.record_type = 'update'
+            update.body = record.details
+            update.date_created = record.date_created
+            update.save()
+            update.about.add(record.ticket)
+
+    def backwards(self, orm):
+        raise RuntimeError("Cannot reverse this migration.")
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'core.accessentity': {
+            'Meta': {'object_name': 'AccessEntity'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        },
+        'core.comment': {
+            'Meta': {'object_name': 'Comment'},
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'}),
+            'body': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"})
+        },
+        'core.group': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Group'},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['core.Group']"})
+        },
+        'core.object': {
+            'Meta': {'object_name': 'Object'},
+            'comments': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.Comment']"}),
+            'creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'objects_created'", 'null': 'True', 'to': "orm['core.User']"}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'full_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_full_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'links': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'links_rel_+'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'nuvius_resource': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'object_name': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'object_type': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'read_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_read_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'subscribers': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'subscriptions'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Tag']", 'null': 'True', 'blank': 'True'}),
+            'trash': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+        },
+        'core.tag': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Tag'},
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'})
+        },
+        'core.updaterecord': {
+            'Meta': {'ordering': "['-date_created']", 'object_name': 'UpdateRecord'},
+            'about': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'updates'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.Object']"}),
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'sent_updates'", 'null': 'True', 'to': "orm['core.User']"}),
+            'body': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
+            'comments': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_on_updates'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.Comment']"}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'updates_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'format_message': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'format_strings': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'updates_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'recipients': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'received_updates'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'record_type': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
+            'score': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'sender': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'sent_updates'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'url': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'})
+        },
+        'core.user': {
+            'Meta': {'ordering': "['name']", 'object_name': 'User'},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'default_group': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'default_user_set'", 'null': 'True', 'to': "orm['core.AccessEntity']"}),
+            'disabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_access': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'other_groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'identities.contact': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Contact', '_ormbases': ['core.Object']},
+            'contact_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.ContactType']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['identities.Contact']"}),
+            'related_group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'related_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.AccessEntity']", 'null': 'True', 'blank': 'True'})
+        },
+        'identities.contactfield': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ContactField', '_ormbases': ['core.Object']},
+            'allowed_values': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'field_type': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'required': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'identities.contacttype': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ContactType', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'fields': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['identities.ContactField']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'slug': ('django.db.models.fields.CharField', [], {'max_length': '256'})
+        },
+        'messaging.emailbox': {
+            'Meta': {'ordering': "['last_updated']", 'object_name': 'EmailBox', '_ormbases': ['core.Object']},
+            'email_name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'email_type': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'last_checked': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'server_name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'server_password': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'server_type': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'server_username': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        },
+        'messaging.mailinglist': {
+            'Meta': {'ordering': "['-date_created']", 'object_name': 'MailingList', '_ormbases': ['core.Object']},
+            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'from_contact': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'from_contact_set'", 'to': "orm['identities.Contact']"}),
+            'members': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'members_set'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['identities.Contact']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'opt_in': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['messaging.Template']", 'null': 'True', 'blank': 'True'})
+        },
+        'messaging.message': {
+            'Meta': {'ordering': "['-date_created']", 'object_name': 'Message', '_ormbases': ['core.Object']},
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.Contact']"}),
+            'body': ('django.db.models.fields.TextField', [], {}),
+            'mlist': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'mlist'", 'null': 'True', 'to': "orm['messaging.MailingList']"}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'read_by': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'read_by_user'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'recipients': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'message_recipients'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['identities.Contact']"}),
+            'reply_to': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['messaging.Message']"}),
+            'stream': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'stream'", 'null': 'True', 'to': "orm['messaging.MessageStream']"}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'})
+        },
+        'messaging.messagestream': {
+            'Meta': {'ordering': "['name', 'last_updated']", 'object_name': 'MessageStream', '_ormbases': ['core.Object']},
+            'email_incoming': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'incoming'", 'null': 'True', 'to': "orm['messaging.EmailBox']"}),
+            'email_outgoing': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'outgoing'", 'null': 'True', 'to': "orm['messaging.EmailBox']"}),
+            'faulty': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'incoming_password': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'incoming_server_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'incoming_server_type': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'incoming_server_username': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'last_checked': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'outgoing_email': ('django.db.models.fields.EmailField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'outgoing_password': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'outgoing_server_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'outgoing_server_type': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'outgoing_server_username': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'})
+        },
+        'messaging.template': {
+            'Meta': {'object_name': 'Template', '_ormbases': ['core.Object']},
+            'body': ('django.db.models.fields.TextField', [], {}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'subject': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        },
+        'services.service': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Service', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['services.Service']"})
+        },
+        'services.serviceagent': {
+            'Meta': {'ordering': "('related_user', '-active', 'occupied')", 'object_name': 'ServiceAgent', '_ormbases': ['core.Object']},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'available_from': ('django.db.models.fields.TimeField', [], {'null': 'True', 'blank': 'True'}),
+            'available_to': ('django.db.models.fields.TimeField', [], {'null': 'True', 'blank': 'True'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'occupied': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'related_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']"})
+        },
+        'services.servicelevelagreement': {
+            'Meta': {'ordering': "('name', 'client')", 'object_name': 'ServiceLevelAgreement', '_ormbases': ['core.Object']},
+            'available_from': ('django.db.models.fields.TimeField', [], {'null': 'True', 'blank': 'True'}),
+            'available_to': ('django.db.models.fields.TimeField', [], {'null': 'True', 'blank': 'True'}),
+            'client': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'client_sla'", 'null': 'True', 'to': "orm['identities.Contact']"}),
+            'default': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'provider': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'provider_sla'", 'to': "orm['identities.Contact']"}),
+            'response_time': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.Service']"}),
+            'uptime_rate': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'})
+        },
+        'services.ticket': {
+            'Meta': {'ordering': "('-priority', 'reference')", 'object_name': 'Ticket', '_ormbases': ['core.Object']},
+            'assigned': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['services.ServiceAgent']", 'null': 'True', 'blank': 'True'}),
+            'caller': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.Contact']", 'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'message': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['messaging.Message']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'priority': ('django.db.models.fields.IntegerField', [], {'default': '3'}),
+            'queue': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.TicketQueue']", 'null': 'True', 'blank': 'True'}),
+            'reference': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'resolution': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.Service']", 'null': 'True', 'blank': 'True'}),
+            'sla': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.ServiceLevelAgreement']", 'null': 'True', 'blank': 'True'}),
+            'status': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.TicketStatus']"}),
+            'urgency': ('django.db.models.fields.IntegerField', [], {'default': '3'})
+        },
+        'services.ticketqueue': {
+            'Meta': {'ordering': "('name', '-active', 'ticket_code')", 'object_name': 'TicketQueue', '_ormbases': ['core.Object']},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'default_service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.Service']", 'null': 'True', 'blank': 'True'}),
+            'default_ticket_priority': ('django.db.models.fields.IntegerField', [], {'default': '3'}),
+            'default_ticket_status': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.TicketStatus']", 'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'message_stream': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['messaging.MessageStream']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'next_queue': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'previous_set'", 'null': 'True', 'to': "orm['services.TicketQueue']"}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['services.TicketQueue']"}),
+            'ticket_code': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '8', 'null': 'True', 'blank': 'True'}),
+            'waiting_time': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'})
+        },
+        'services.ticketrecord': {
+            'Meta': {'ordering': "['ticket']", 'object_name': 'TicketRecord', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {}),
+            'message': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['messaging.Message']", 'null': 'True', 'blank': 'True'}),
+            'notify': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'record_type': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'ticket': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.Ticket']"}),
+            'updaterecord_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.UpdateRecord']", 'unique': 'True', 'null': 'True', 'blank': 'True'})
+        },
+        'services.ticketstatus': {
+            'Meta': {'ordering': "('hidden', '-active', 'name')", 'object_name': 'TicketStatus', '_ormbases': ['core.Object']},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'hidden': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'})
+        }
+    }
+
+    complete_apps = ['services']
diff --git a/data/treeio/treeio/treeio/services/south_migrations/0004_auto__del_field_ticketrecord_record_type__del_field_ticketrecord_detai.py b/data/treeio/treeio/treeio/services/south_migrations/0004_auto__del_field_ticketrecord_record_type__del_field_ticketrecord_detai.py
new file mode 100644
index 0000000..2bcc710
--- /dev/null
+++ b/data/treeio/treeio/treeio/services/south_migrations/0004_auto__del_field_ticketrecord_record_type__del_field_ticketrecord_detai.py
@@ -0,0 +1,317 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Deleting field 'TicketRecord.record_type'
+        db.delete_column('services_ticketrecord', 'record_type')
+
+        # Deleting field 'TicketRecord.details'
+        db.delete_column('services_ticketrecord', 'details')
+
+        # Deleting field 'TicketRecord.object_ptr'
+        db.delete_column('services_ticketrecord', 'object_ptr_id')
+
+        # Deleting field 'TicketRecord.ticket'
+        db.delete_column('services_ticketrecord', 'ticket_id')
+
+        # Changing field 'TicketRecord.updaterecord_ptr'
+        db.alter_column('services_ticketrecord', 'updaterecord_ptr_id', self.gf(
+            'django.db.models.fields.related.OneToOneField')(default=1, to=orm['core.UpdateRecord'], unique=True, primary_key=True))
+
+    def backwards(self, orm):
+
+        # User chose to not deal with backwards NULL issues for
+        # 'TicketRecord.record_type'
+        raise RuntimeError(
+            "Cannot reverse this migration. 'TicketRecord.record_type' and its values cannot be restored.")
+
+        # User chose to not deal with backwards NULL issues for
+        # 'TicketRecord.details'
+        raise RuntimeError(
+            "Cannot reverse this migration. 'TicketRecord.details' and its values cannot be restored.")
+
+        # User chose to not deal with backwards NULL issues for
+        # 'TicketRecord.object_ptr'
+        raise RuntimeError(
+            "Cannot reverse this migration. 'TicketRecord.object_ptr' and its values cannot be restored.")
+
+        # User chose to not deal with backwards NULL issues for
+        # 'TicketRecord.ticket'
+        raise RuntimeError(
+            "Cannot reverse this migration. 'TicketRecord.ticket' and its values cannot be restored.")
+
+        # Changing field 'TicketRecord.updaterecord_ptr'
+        db.alter_column('services_ticketrecord', 'updaterecord_ptr_id', self.gf(
+            'django.db.models.fields.related.OneToOneField')(to=orm['core.UpdateRecord'], unique=True, null=True))
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'core.accessentity': {
+            'Meta': {'object_name': 'AccessEntity'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        },
+        'core.comment': {
+            'Meta': {'object_name': 'Comment'},
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'}),
+            'body': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"})
+        },
+        'core.group': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Group', '_ormbases': ['core.AccessEntity']},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True', 'primary_key': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['core.Group']"})
+        },
+        'core.object': {
+            'Meta': {'object_name': 'Object'},
+            'comments': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.Comment']"}),
+            'creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'objects_created'", 'null': 'True', 'to': "orm['core.User']"}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'full_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_full_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'links': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'links_rel_+'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'nuvius_resource': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'object_name': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'object_type': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+            'read_access': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'objects_read_access'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'subscribers': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'subscriptions'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Tag']", 'null': 'True', 'blank': 'True'}),
+            'trash': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'core.tag': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Tag'},
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'})
+        },
+        'core.updaterecord': {
+            'Meta': {'ordering': "['-date_created']", 'object_name': 'UpdateRecord'},
+            'about': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'updates'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.Object']"}),
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'sent_updates'", 'null': 'True', 'to': "orm['core.User']"}),
+            'body': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
+            'comments': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'comments_on_updates'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.Comment']"}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'dislikes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'updates_disliked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'format_message': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'format_strings': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'likes': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'updates_liked'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'recipients': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'received_updates'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.AccessEntity']"}),
+            'record_type': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
+            'score': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'sender': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'sent_updates'", 'null': 'True', 'to': "orm['core.Object']"}),
+            'url': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'})
+        },
+        'core.user': {
+            'Meta': {'ordering': "['name']", 'object_name': 'User', '_ormbases': ['core.AccessEntity']},
+            'accessentity_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.AccessEntity']", 'unique': 'True', 'primary_key': 'True'}),
+            'default_group': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'default_user_set'", 'null': 'True', 'to': "orm['core.Group']"}),
+            'disabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_access': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'other_groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['core.Group']", 'null': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'identities.contact': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Contact', '_ormbases': ['core.Object']},
+            'contact_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.ContactType']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['identities.Contact']"}),
+            'related_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.AccessEntity']", 'null': 'True', 'blank': 'True'})
+        },
+        'identities.contactfield': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ContactField', '_ormbases': ['core.Object']},
+            'allowed_values': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'field_type': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'label': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'required': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'identities.contacttype': {
+            'Meta': {'ordering': "['name']", 'object_name': 'ContactType', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'fields': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['identities.ContactField']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'slug': ('django.db.models.fields.CharField', [], {'max_length': '256'})
+        },
+        'messaging.mailinglist': {
+            'Meta': {'ordering': "['-date_created']", 'object_name': 'MailingList', '_ormbases': ['core.Object']},
+            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'from_contact': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'from_contact_set'", 'to': "orm['identities.Contact']"}),
+            'members': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'members_set'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['identities.Contact']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'opt_in': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['messaging.Template']", 'null': 'True', 'blank': 'True'})
+        },
+        'messaging.message': {
+            'Meta': {'ordering': "['-date_created']", 'object_name': 'Message', '_ormbases': ['core.Object']},
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.Contact']"}),
+            'body': ('django.db.models.fields.TextField', [], {}),
+            'mlist': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'mlist'", 'null': 'True', 'to': "orm['messaging.MailingList']"}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'read_by': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'read_by_user'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['core.User']"}),
+            'recipients': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'message_recipients'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['identities.Contact']"}),
+            'reply_to': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['messaging.Message']"}),
+            'stream': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'stream'", 'null': 'True', 'to': "orm['messaging.MessageStream']"}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'})
+        },
+        'messaging.messagestream': {
+            'Meta': {'ordering': "['name', 'last_updated']", 'object_name': 'MessageStream', '_ormbases': ['core.Object']},
+            'faulty': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'incoming_password': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'incoming_server_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'incoming_server_type': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'incoming_server_username': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'last_checked': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'outgoing_email': ('django.db.models.fields.EmailField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'outgoing_password': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'outgoing_server_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'outgoing_server_type': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'outgoing_server_username': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'})
+        },
+        'messaging.template': {
+            'Meta': {'object_name': 'Template', '_ormbases': ['core.Object']},
+            'body': ('django.db.models.fields.TextField', [], {}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'subject': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        },
+        'services.service': {
+            'Meta': {'ordering': "['name']", 'object_name': 'Service', '_ormbases': ['core.Object']},
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['services.Service']"})
+        },
+        'services.serviceagent': {
+            'Meta': {'ordering': "('related_user', '-active', 'occupied')", 'object_name': 'ServiceAgent', '_ormbases': ['core.Object']},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'available_from': ('django.db.models.fields.TimeField', [], {'null': 'True', 'blank': 'True'}),
+            'available_to': ('django.db.models.fields.TimeField', [], {'null': 'True', 'blank': 'True'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'occupied': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'related_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']"})
+        },
+        'services.servicelevelagreement': {
+            'Meta': {'ordering': "('name', 'client')", 'object_name': 'ServiceLevelAgreement', '_ormbases': ['core.Object']},
+            'available_from': ('django.db.models.fields.TimeField', [], {'null': 'True', 'blank': 'True'}),
+            'available_to': ('django.db.models.fields.TimeField', [], {'null': 'True', 'blank': 'True'}),
+            'client': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'client_sla'", 'null': 'True', 'to': "orm['identities.Contact']"}),
+            'default': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'provider': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'provider_sla'", 'to': "orm['identities.Contact']"}),
+            'response_time': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.Service']"}),
+            'uptime_rate': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'})
+        },
+        'services.ticket': {
+            'Meta': {'ordering': "('-priority', 'reference')", 'object_name': 'Ticket', '_ormbases': ['core.Object']},
+            'assigned': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['services.ServiceAgent']", 'null': 'True', 'blank': 'True'}),
+            'caller': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['identities.Contact']", 'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'message': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['messaging.Message']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'priority': ('django.db.models.fields.IntegerField', [], {'default': '3'}),
+            'queue': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.TicketQueue']", 'null': 'True', 'blank': 'True'}),
+            'reference': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'resolution': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.Service']", 'null': 'True', 'blank': 'True'}),
+            'sla': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.ServiceLevelAgreement']", 'null': 'True', 'blank': 'True'}),
+            'status': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.TicketStatus']"}),
+            'urgency': ('django.db.models.fields.IntegerField', [], {'default': '3'})
+        },
+        'services.ticketqueue': {
+            'Meta': {'ordering': "('name', '-active', 'ticket_code')", 'object_name': 'TicketQueue', '_ormbases': ['core.Object']},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'default_service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.Service']", 'null': 'True', 'blank': 'True'}),
+            'default_ticket_priority': ('django.db.models.fields.IntegerField', [], {'default': '3'}),
+            'default_ticket_status': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.TicketStatus']", 'null': 'True', 'blank': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'message_stream': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['messaging.MessageStream']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'next_queue': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'previous_set'", 'null': 'True', 'to': "orm['services.TicketQueue']"}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'child_set'", 'null': 'True', 'to': "orm['services.TicketQueue']"}),
+            'ticket_code': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '8', 'null': 'True', 'blank': 'True'}),
+            'waiting_time': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'})
+        },
+        'services.ticketrecord': {
+            'Meta': {'ordering': "['-date_created']", 'object_name': 'TicketRecord', '_ormbases': ['core.UpdateRecord']},
+            'message': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['messaging.Message']", 'null': 'True', 'blank': 'True'}),
+            'notify': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'updaterecord_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.UpdateRecord']", 'unique': 'True', 'primary_key': 'True'})
+        },
+        'services.ticketstatus': {
+            'Meta': {'ordering': "('hidden', '-active', 'name')", 'object_name': 'TicketStatus', '_ormbases': ['core.Object']},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'hidden': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'object_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.Object']", 'unique': 'True', 'primary_key': 'True'})
+        }
+    }
+
+    complete_apps = ['services']
diff --git a/data/treeio/treeio/treeio/services/views.py b/data/treeio/treeio/treeio/services/views.py
new file mode 100644
index 0000000..ca48e0f
--- /dev/null
+++ b/data/treeio/treeio/treeio/services/views.py
@@ -0,0 +1,1197 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+"""
+Service Support module: views
+"""
+from django.shortcuts import get_object_or_404
+from django.template import RequestContext
+from django.http import HttpResponseRedirect
+from django.core.urlresolvers import reverse
+from django.db.models import Q
+from treeio.core.conf import settings
+from treeio.core.rendering import render_to_response, render_string_template, render_to_string
+from treeio.core.decorators import treeio_login_required, handle_response_format
+from treeio.core.views import user_denied
+from treeio.core.models import Object, ModuleSetting
+from treeio.services.models import Ticket, TicketRecord, TicketStatus, TicketQueue, Service, \
+    ServiceLevelAgreement, ServiceAgent
+from treeio.services.forms import SettingsForm, MassActionForm, TicketForm, TicketStatusForm, \
+    TicketRecordForm, QueueForm, ServiceForm, ServiceLevelAgreementForm, \
+    AgentForm, FilterForm, SLAFilterForm, AgentFilterForm
+from treeio.identities.models import Contact
+
+
+def _get_filter_query(args, model=Ticket):
+    "Creates a query to filter Tickets based on FilterForm arguments"
+    query = Q()
+
+    for arg in args:
+        if hasattr(model, arg) and args[arg]:
+            kwargs = {str(arg + '__id'): long(args[arg])}
+            query = query & Q(**kwargs)
+
+    return query
+
+
+def _get_default_context(request):
+    "Returns default context for all views as dict()"
+
+    queues = Object.filter_by_request(
+        request, TicketQueue.objects.filter(active=True, parent__isnull=True))
+    statuses = Object.filter_by_request(request, TicketStatus.objects)
+    try:
+        agent = request.user.profile.serviceagent_set.all()[0]
+    except Exception:
+        agent = None
+
+    massform = MassActionForm(request.user.profile)
+
+    context = {
+        'statuses': statuses,
+        'queues': queues,
+        'agent': agent,
+        'massform': massform
+    }
+
+    return context
+
+
+def _process_mass_form(f):
+    "Pre-process request to handle mass action form for Tasks and Milestones"
+
+    def wrap(request, *args, **kwargs):
+        "wrap"
+        if 'massform' in request.POST:
+            for key in request.POST:
+                if 'mass-ticket' in key:
+                    try:
+                        ticket = Ticket.objects.get(pk=request.POST[key])
+                        form = MassActionForm(
+                            request.user.profile, request.POST, instance=ticket)
+                        if form.is_valid() and request.user.profile.has_permission(ticket, mode='w'):
+                            form.save()
+                    except Exception:
+                        pass
+
+        return f(request, *args, **kwargs)
+
+    wrap.__doc__ = f.__doc__
+    wrap.__name__ = f.__name__
+
+    return wrap
+
+
+@handle_response_format
+@treeio_login_required
+@_process_mass_form
+def index(request, response_format='html'):
+    "All available tickets"
+
+    if request.GET:
+        if 'status' in request.GET and request.GET['status']:
+            query = _get_filter_query(request.GET)
+        else:
+            query = Q(status__hidden=False) & _get_filter_query(request.GET)
+        tickets = Object.filter_by_request(
+            request, Ticket.objects.filter(query))
+    else:
+        tickets = Object.filter_by_request(
+            request, Ticket.objects.filter(status__hidden=False))
+
+    filters = FilterForm(request.user.profile, '', request.GET)
+
+    context = _get_default_context(request)
+    context.update({'tickets': tickets,
+                    'filters': filters, })
+
+    return render_to_response('services/index', context,
+                              context_instance=RequestContext(request),
+                              response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+@_process_mass_form
+def index_assigned(request, response_format='html'):
+    "Tickets assigned to current user"
+
+    context = _get_default_context(request)
+    agent = context['agent']
+
+    if agent:
+        query = Q(assigned=agent)
+        if request.GET:
+            if 'status' in request.GET and request.GET['status']:
+                query = query & _get_filter_query(request.GET)
+            else:
+                query = query & Q(
+                    status__hidden=False) & _get_filter_query(request.GET)
+        else:
+            query = query & Q(status__hidden=False)
+        tickets = Object.filter_by_request(
+            request, Ticket.objects.filter(query))
+    else:
+        return user_denied(request, "You are not a Service Support Agent.", response_format=response_format)
+
+    filters = FilterForm(request.user.profile, 'assigned', request.GET)
+
+    context.update({'tickets': tickets,
+                    'filters': filters})
+
+    return render_to_response('services/index_assigned', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+@_process_mass_form
+def index_owned(request, response_format='html'):
+    "Tickets owned by current user"
+
+    context = _get_default_context(request)
+
+    query = Q(caller__related_user=request.user.profile)
+    if request.GET:
+        if 'status' in request.GET and request.GET['status']:
+            query = query & _get_filter_query(request.GET)
+        else:
+            query = query & Q(
+                status__hidden=False) & _get_filter_query(request.GET)
+    else:
+        query = query & Q(status__hidden=False)
+
+    tickets = Object.filter_by_request(request, Ticket.objects.filter(query))
+
+    filters = FilterForm(request.user.profile, 'caller', request.GET)
+
+    context.update({'tickets': tickets,
+                    'filters': filters})
+
+    return render_to_response('services/index_owned', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+#
+# Ticket Statuses
+#
+
+
+@handle_response_format
+@treeio_login_required
+@_process_mass_form
+def status_view(request, status_id, response_format='html'):
+    "Tickets filtered by status"
+
+    status = get_object_or_404(TicketStatus, pk=status_id)
+    if not request.user.profile.has_permission(status):
+        return user_denied(request, message="You don't have access to this Ticket Status")
+
+    query = Q(status=status)
+    if request.GET:
+        query = query & _get_filter_query(request.GET)
+    tickets = Object.filter_by_request(request, Ticket.objects.filter(query))
+
+    filters = FilterForm(request.user.profile, 'status', request.GET)
+
+    context = _get_default_context(request)
+    context.update({'status': status,
+                    'filters': filters,
+                    'tickets': tickets})
+
+    return render_to_response('services/status_view', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def status_edit(request, status_id, response_format='html'):
+    "TicketStatus edit"
+
+    status = get_object_or_404(TicketStatus, pk=status_id)
+    if not request.user.profile.has_permission(status, mode='w') \
+            and not request.user.profile.is_admin('treeio_services'):
+        return user_denied(request, "You don't have access to this Ticket Status", response_format)
+
+    if request.POST:
+        if 'cancel' not in request.POST:
+            form = TicketStatusForm(
+                request.user.profile, request.POST, instance=status)
+            if form.is_valid():
+                status = form.save()
+                return HttpResponseRedirect(reverse('services_status_view', args=[status.id]))
+        else:
+            return HttpResponseRedirect(reverse('services_status_view', args=[status.id]))
+    else:
+        form = TicketStatusForm(request.user.profile, instance=status)
+
+    context = _get_default_context(request)
+    context.update({'form': form,
+                    'status': status})
+
+    return render_to_response('services/status_edit', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def status_delete(request, status_id, response_format='html'):
+    "TicketStatus delete"
+
+    status = get_object_or_404(TicketStatus, pk=status_id)
+    if not request.user.profile.has_permission(status, mode='w'):
+        return user_denied(request, "You don't have access to this Ticket Status", response_format)
+
+    if request.POST:
+        if 'delete' in request.POST:
+            if 'trash' in request.POST:
+                status.trash = True
+                status.save()
+            else:
+                status.delete()
+            return HttpResponseRedirect(reverse('services_settings_view'))
+        elif 'cancel' in request.POST:
+            return HttpResponseRedirect(reverse('services_status_view', args=[status.id]))
+
+    context = _get_default_context(request)
+    context.update({'status': status})
+
+    return render_to_response('services/status_delete', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def status_add(request, response_format='html'):
+    "TicketStatus add"
+
+    if not request.user.profile.is_admin('treeio.services'):
+        return user_denied(request,
+                           message="You don't have administrator access to the Service Support module")
+
+    if request.POST:
+        if 'cancel' not in request.POST:
+            status = TicketStatus()
+            form = TicketStatusForm(
+                request.user.profile, request.POST, instance=status)
+            if form.is_valid():
+                status = form.save()
+                status.set_user_from_request(request)
+                return HttpResponseRedirect(reverse('services_status_view', args=[status.id]))
+        else:
+            return HttpResponseRedirect(reverse('services_settings_view'))
+    else:
+        form = TicketStatusForm(request.user.profile)
+
+    context = _get_default_context(request)
+    context.update({'form': form})
+
+    return render_to_response('services/status_add', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+#
+# Queues
+#
+
+
+@handle_response_format
+@treeio_login_required
+@_process_mass_form
+def queue_view(request, queue_id, response_format='html'):
+    "Queue view"
+
+    queue = get_object_or_404(TicketQueue, pk=queue_id)
+    if not request.user.profile.has_permission(queue):
+        return user_denied(request, message="You don't have access to this Queue")
+
+    query = Q(queue=queue)
+    if request.GET:
+        if 'status' in request.GET and request.GET['status']:
+            query = query & _get_filter_query(request.GET)
+        else:
+            query = query & Q(
+                status__hidden=False) & _get_filter_query(request.GET)
+    else:
+        query = query & Q(status__hidden=False)
+    tickets = Object.filter_by_request(request, Ticket.objects.filter(query))
+
+    filters = FilterForm(request.user.profile, 'queue', request.GET)
+    subqueues = Object.filter_by_request(
+        request, TicketQueue.objects.filter(parent=queue))
+
+    context = _get_default_context(request)
+    context.update({'queue': queue,
+                    'subqueues': subqueues,
+                    'filters': filters,
+                    'tickets': tickets})
+
+    return render_to_response('services/queue_view', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def queue_edit(request, queue_id, response_format='html'):
+    "Queue edit"
+
+    queue = get_object_or_404(TicketQueue, pk=queue_id)
+    if not request.user.profile.has_permission(queue, mode='w'):
+        return user_denied(request, message="You don't have access to this Queue")
+
+    if request.POST:
+        if 'cancel' not in request.POST:
+            form = QueueForm(
+                request.user.profile, request.POST, instance=queue)
+            if form.is_valid():
+                queue = form.save()
+                return HttpResponseRedirect(reverse('services_queue_view', args=[queue.id]))
+        else:
+            return HttpResponseRedirect(reverse('services_queue_view', args=[queue.id]))
+    else:
+        form = QueueForm(request.user.profile, instance=queue)
+
+    context = _get_default_context(request)
+    context.update({'queue': queue, 'form': form})
+
+    return render_to_response('services/queue_edit', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def queue_delete(request, queue_id, response_format='html'):
+    "Queue delete"
+
+    queue = get_object_or_404(TicketQueue, pk=queue_id)
+    if not request.user.profile.has_permission(queue, mode='w'):
+        return user_denied(request, message="You don't have access to this Queue")
+
+    if request.POST:
+        if 'delete' in request.POST:
+            if 'trash' in request.POST:
+                queue.trash = True
+                queue.save()
+            else:
+                queue.delete()
+            return HttpResponseRedirect(reverse('services_settings_view'))
+        elif 'cancel' in request.POST:
+            return HttpResponseRedirect(reverse('services_queue_view', args=[queue.id]))
+
+    query = Q(queue=queue) & Q(status__hidden=False)
+    tickets = Object.filter_by_request(request, Ticket.objects.filter(query))
+    subqueues = Object.filter_by_request(
+        request, TicketQueue.objects.filter(parent=queue))
+
+    context = _get_default_context(request)
+    context.update({'queue': queue,
+                    'subqueues': subqueues,
+                    'tickets': tickets})
+
+    return render_to_response('services/queue_delete', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def queue_add(request, response_format='html'):
+    "Queue add"
+
+    if not request.user.profile.is_admin('treeio.services'):
+        return user_denied(request,
+                           message="You don't have administrator access to the Service Support module")
+
+    if request.POST:
+        if 'cancel' not in request.POST:
+            queue = TicketQueue()
+            form = QueueForm(
+                request.user.profile, request.POST, instance=queue)
+            if form.is_valid():
+                queue = form.save()
+                queue.set_user_from_request(request)
+                return HttpResponseRedirect(reverse('services_queue_view', args=[queue.id]))
+        else:
+            return HttpResponseRedirect(reverse('services_settings_view'))
+    else:
+        form = QueueForm(request.user.profile)
+
+    context = _get_default_context(request)
+    context.update({'form': form})
+
+    return render_to_response('services/queue_add', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+#
+# Tickets
+#
+
+
+@handle_response_format
+@treeio_login_required
+def ticket_view(request, ticket_id, response_format='html'):
+    "Ticket view"
+
+    context = _get_default_context(request)
+    agent = context['agent']
+    profile = request.user.profile
+
+    ticket = get_object_or_404(Ticket, pk=ticket_id)
+    if not profile.has_permission(ticket):
+        return user_denied(request, message="You don't have access to this Ticket")
+
+    if ticket.message:
+        ticket.message.read_by.add(profile)
+
+    if profile.has_permission(ticket, mode='x'):
+        if request.POST:
+            record = TicketRecord(sender=profile.get_contact())
+            record.record_type = 'manual'
+            if ticket.message:
+                record.message = ticket.message
+            form = TicketRecordForm(
+                agent, ticket, request.POST, instance=record)
+            if form.is_valid():
+                record = form.save()
+                record.save()
+                record.set_user_from_request(request)
+                record.about.add(ticket)
+                ticket.set_last_updated()
+                return HttpResponseRedirect(reverse('services_ticket_view', args=[ticket.id]))
+
+        else:
+            form = TicketRecordForm(agent, ticket)
+    else:
+        form = None
+
+    context.update({'ticket': ticket, 'record_form': form})
+
+    return render_to_response('services/ticket_view', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def ticket_edit(request, ticket_id, response_format='html'):
+    "Ticket edit"
+
+    context = _get_default_context(request)
+    agent = context['agent']
+
+    ticket = get_object_or_404(Ticket, pk=ticket_id)
+    if not request.user.profile.has_permission(ticket, mode='w'):
+        return user_denied(request, message="You don't have access to this Ticket")
+
+    if request.POST:
+        if 'cancel' not in request.POST:
+            form = TicketForm(
+                request.user.profile, None, agent, request.POST, instance=ticket)
+            if form.is_valid():
+                ticket = form.save()
+                return HttpResponseRedirect(reverse('services_ticket_view', args=[ticket.id]))
+        else:
+            return HttpResponseRedirect(reverse('services_ticket_view', args=[ticket.id]))
+    else:
+        form = TicketForm(
+            request.user.profile, None, agent, instance=ticket)
+
+    context.update({'form': form,
+                    'ticket': ticket})
+
+    return render_to_response('services/ticket_edit', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def ticket_set_status(request, ticket_id, status_id, response_format='html'):
+    "Ticket quick set: Status"
+    ticket = get_object_or_404(Ticket, pk=ticket_id)
+    if not request.user.profile.has_permission(ticket, mode='w'):
+        return user_denied(request, message="You don't have access to this Ticket")
+
+    status = get_object_or_404(TicketStatus, pk=status_id)
+    if not request.user.profile.has_permission(status):
+        return user_denied(request, message="You don't have access to this Ticket Status")
+
+    if not ticket.status == status:
+        ticket.status = status
+        ticket.save()
+
+    return ticket_view(request, ticket_id, response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def ticket_delete(request, ticket_id, response_format='html'):
+    "Ticket delete"
+
+    ticket = get_object_or_404(Ticket, pk=ticket_id)
+    if not request.user.profile.has_permission(ticket, mode='w'):
+        return user_denied(request, message="You don't have access to this Ticket")
+
+    if request.POST:
+        if 'delete' in request.POST:
+            if 'trash' in request.POST:
+                ticket.trash = True
+                ticket.save()
+            else:
+                ticket.delete()
+            return HttpResponseRedirect(reverse('services_index'))
+        elif 'cancel' in request.POST:
+            return HttpResponseRedirect(reverse('services_ticket_view', args=[ticket.id]))
+
+    context = _get_default_context(request)
+    context.update({'ticket': ticket})
+
+    return render_to_response('services/ticket_delete', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def ticket_add(request, queue_id=None, response_format='html'):
+    "Ticket add"
+
+    context = _get_default_context(request)
+    agent = context['agent']
+    profile = request.user.profile
+
+    queue = None
+    if queue_id:
+        queue = get_object_or_404(TicketQueue, pk=queue_id)
+        if not profile.has_permission(queue, mode='x'):
+            queue = None
+
+    if request.POST:
+        if 'cancel' not in request.POST:
+            ticket = Ticket(creator=profile)
+            if not agent:
+                if queue:
+                    ticket.queue = queue
+                    if queue.default_ticket_status:
+                        ticket.status = queue.default_ticket_status
+                    else:
+                        try:
+                            conf = ModuleSetting.get_for_module(
+                                'treeio.services', 'default_ticket_status')[0]
+                            ticket.status = TicketStatus.objects.get(
+                                pk=long(conf.value))
+                        except:
+                            if 'statuses' in context:
+                                try:
+                                    ticket.status = context['statuses'][0]
+                                except:
+                                    pass
+                    ticket.priority = queue.default_ticket_priority
+                    ticket.service = queue.default_service
+                else:
+                    try:
+                        conf = ModuleSetting.get_for_module(
+                            'treeio.services', 'default_ticket_status')[0]
+                        ticket.status = TicketStatus.objects.get(
+                            pk=long(conf.value))
+                    except:
+                        if 'statuses' in context:
+                            try:
+                                ticket.status = context['statuses'][0]
+                            except:
+                                pass
+                    try:
+                        conf = ModuleSetting.get_for_module(
+                            'treeio.services', 'default_ticket_queue')[0]
+                        ticket.queue = TicketQueue.objects.get(
+                            pk=long(conf.value))
+                    except:
+                        if 'queues' in context:
+                            try:
+                                ticket.queue = context['queues'][0]
+                            except:
+                                pass
+                try:
+                    ticket.caller = profile.get_contact()
+                except:
+                    pass
+            form = TicketForm(
+                profile, queue, agent, request.POST, instance=ticket)
+            if form.is_valid():
+                ticket = form.save()
+                ticket.set_user_from_request(request)
+                return HttpResponseRedirect(reverse('services_ticket_view', args=[ticket.id]))
+        else:
+            return HttpResponseRedirect(reverse('services'))
+    else:
+        form = TicketForm(request.user.profile, queue, agent)
+
+    context.update({'form': form, 'queue': queue})
+
+    return render_to_response('services/ticket_add', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+#
+# Services
+#
+
+
+@handle_response_format
+@treeio_login_required
+def service_catalogue(request, response_format='html'):
+    "All available Services"
+
+    services = Object.filter_by_request(
+        request, Service.objects.filter(parent__isnull=True))
+
+    filters = FilterForm(request.user.profile, '', request.GET)
+
+    context = _get_default_context(request)
+    context.update({'services': services, 'filters': filters})
+
+    return render_to_response('services/service_catalogue', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def service_view(request, service_id, response_format='html'):
+    "Service view"
+
+    service = get_object_or_404(Service, pk=service_id)
+    if not request.user.profile.has_permission(service) \
+            and not request.user.profile.is_admin('treeio_services'):
+        return user_denied(request, message="You don't have access to this Service")
+
+    context = _get_default_context(request)
+    context.update({'service': service})
+
+    return render_to_response('services/service_view', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def service_edit(request, service_id, response_format='html'):
+    "Service edit"
+
+    service = get_object_or_404(Service, pk=service_id)
+    if not request.user.profile.has_permission(service, mode='w') \
+            and not request.user.profile.is_admin('treeio_services'):
+        return user_denied(request, message="You don't have access to this Service")
+
+    if request.POST:
+        if 'cancel' not in request.POST:
+            form = ServiceForm(
+                request.user.profile, request.POST, instance=service)
+            if form.is_valid():
+                service = form.save()
+                return HttpResponseRedirect(reverse('services_service_view', args=[service.id]))
+        else:
+            return HttpResponseRedirect(reverse('services_service_view', args=[service.id]))
+    else:
+        form = ServiceForm(request.user.profile, instance=service)
+
+    context = _get_default_context(request)
+    context.update({'form': form, 'service': service})
+
+    return render_to_response('services/service_edit', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def service_delete(request, service_id, response_format='html'):
+    "Service delete"
+
+    service = get_object_or_404(Service, pk=service_id)
+    if not request.user.profile.has_permission(service, mode='w') \
+            and not request.user.profile.is_admin('treeio_services'):
+        return user_denied(request, message="You don't have access to this Service")
+
+    if request.POST:
+        if 'delete' in request.POST:
+            if 'trash' in request.POST:
+                service.trash = True
+                service.save()
+            else:
+                service.delete()
+            return HttpResponseRedirect(reverse('services_service_catalogue'))
+        elif 'cancel' in request.POST:
+            return HttpResponseRedirect(reverse('services_service_view', args=[service.id]))
+
+    context = _get_default_context(request)
+    context.update({'service': service})
+
+    return render_to_response('services/service_delete', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def service_add(request, response_format='html'):
+    "Service add"
+
+    if not request.user.profile.is_admin('treeio.services'):
+        return user_denied(request,
+                           message="You don't have administrator access to the Service Support module")
+
+    if request.POST:
+        if 'cancel' not in request.POST:
+            service = Service()
+            form = ServiceForm(
+                request.user.profile, request.POST, instance=service)
+            if form.is_valid():
+                service = form.save()
+                service.set_user_from_request(request)
+                return HttpResponseRedirect(reverse('services_service_view', args=[service.id]))
+        else:
+            return HttpResponseRedirect(reverse('services'))
+    else:
+        form = ServiceForm(request.user.profile)
+
+    context = _get_default_context(request)
+    context.update({'form': form})
+
+    return render_to_response('services/service_add', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+#
+# ServiceLevelAgreements
+#
+
+@handle_response_format
+@treeio_login_required
+def sla_index(request, response_format='html'):
+    "All available Service Level Agreements"
+
+    if request.GET:
+        query = _get_filter_query(request.GET, ServiceLevelAgreement)
+        slas = Object.filter_by_request(request,
+                                        ServiceLevelAgreement.objects.filter(query))
+    else:
+        slas = Object.filter_by_request(request,
+                                        ServiceLevelAgreement.objects)
+
+    filters = SLAFilterForm(request.user.profile, '', request.GET)
+
+    context = _get_default_context(request)
+    context.update({'slas': slas, 'filters': filters})
+
+    return render_to_response('services/sla_index', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def sla_view(request, sla_id, response_format='html'):
+    "ServiceLevelAgreement view"
+
+    sla = get_object_or_404(ServiceLevelAgreement, pk=sla_id)
+    if not request.user.profile.has_permission(sla):
+        return user_denied(request, message="You don't have access to this Service Level Agreement")
+
+    context = _get_default_context(request)
+    context.update({'sla': sla})
+
+    return render_to_response('services/sla_view', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def sla_edit(request, sla_id, response_format='html'):
+    "ServiceLevelAgreement edit"
+
+    sla = get_object_or_404(ServiceLevelAgreement, pk=sla_id)
+    if not request.user.profile.has_permission(sla, mode='w'):
+        return user_denied(request, message="You don't have access to this Service Level Agreement")
+
+    if request.POST:
+        if 'cancel' not in request.POST:
+            form = ServiceLevelAgreementForm(
+                request.user.profile, request.POST, instance=sla)
+            if form.is_valid():
+                sla = form.save()
+                return HttpResponseRedirect(reverse('services_sla_view', args=[sla.id]))
+        else:
+            return HttpResponseRedirect(reverse('services_sla_view', args=[sla.id]))
+    else:
+        form = ServiceLevelAgreementForm(
+            request.user.profile, instance=sla)
+
+    context = _get_default_context(request)
+    context.update({'sla': sla, 'form': form})
+
+    return render_to_response('services/sla_edit', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def sla_delete(request, sla_id, response_format='html'):
+    "ServiceLevelAgreement delete"
+
+    sla = get_object_or_404(ServiceLevelAgreement, pk=sla_id)
+    if not request.user.profile.has_permission(sla, mode='w'):
+        return user_denied(request, message="You don't have access to this Service Level Agreement")
+
+    if request.POST:
+        if 'delete' in request.POST:
+            if 'trash' in request.POST:
+                sla.trash = True
+                sla.save()
+            else:
+                sla.delete()
+            return HttpResponseRedirect(reverse('services_sla_index'))
+        elif 'cancel' in request.POST:
+            return HttpResponseRedirect(reverse('services_sla_view', args=[sla.id]))
+
+    context = _get_default_context(request)
+    context.update({'sla': sla})
+
+    return render_to_response('services/sla_delete', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def sla_add(request, response_format='html'):
+    "ServiceLevelAgreement add"
+
+    if not request.user.profile.is_admin('treeio.services'):
+        return user_denied(request,
+                           message="You don't have administrator access to the Service Support module")
+
+    if request.POST:
+        if 'cancel' not in request.POST:
+            sla = ServiceLevelAgreement()
+            form = ServiceLevelAgreementForm(
+                request.user.profile, request.POST, instance=sla)
+            if form.is_valid():
+                sla = form.save()
+                sla.set_user_from_request(request)
+                return HttpResponseRedirect(reverse('services_sla_view', args=[sla.id]))
+        else:
+            return HttpResponseRedirect(reverse('services'))
+    else:
+        form = ServiceLevelAgreementForm(request.user.profile)
+
+    context = _get_default_context(request)
+    context.update({'form': form})
+
+    return render_to_response('services/sla_add', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+#
+# Settings
+#
+@handle_response_format
+@treeio_login_required
+def settings_view(request, response_format='html'):
+    "Settings"
+
+    if not request.user.profile.is_admin('treeio.services'):
+        return user_denied(request,
+                           message="You don't have administrator access to the Service Support module")
+
+    # default ticket status
+    try:
+        conf = ModuleSetting.get_for_module(
+            'treeio.services', 'default_ticket_status')[0]
+        default_ticket_status = TicketStatus.objects.get(pk=long(conf.value))
+    except Exception:
+        default_ticket_status = None
+
+    # default queue
+    try:
+        conf = ModuleSetting.get_for_module(
+            'treeio.services', 'default_ticket_queue')[0]
+        default_ticket_queue = TicketQueue.objects.get(pk=long(conf.value))
+    except Exception:
+        default_ticket_queue = None
+
+    # notify ticket caller by email
+    try:
+        conf = ModuleSetting.get_for_module(
+            'treeio.services', 'send_email_to_caller')[0]
+        send_email_to_caller = conf.value
+    except Exception:
+        send_email_to_caller = settings.HARDTREE_SEND_EMAIL_TO_CALLER
+
+    # notification template
+    send_email_example = ''
+    try:
+        conf = ModuleSetting.get_for_module(
+            'treeio.services', 'send_email_template')[0]
+        send_email_template = conf.value
+    except Exception:
+        send_email_template = None
+
+    queues = TicketQueue.objects.filter(trash=False, parent__isnull=True)
+    statuses = TicketStatus.objects.filter(trash=False)
+
+    if send_email_to_caller:
+        # Render example e-mail
+        try:
+            ticket = Object.filter_by_request(
+                request, Ticket.objects.filter(status__hidden=False, caller__isnull=False))[0]
+        except IndexError:
+            ticket = Ticket(reference='REF123', name='New request')
+        if not ticket.caller:
+            try:
+                caller = Object.filter_by_request(request, Contact.objects)[0]
+            except IndexError:
+                caller = Contact(name='John Smith')
+            ticket.caller = caller
+        try:
+            ticket.status
+        except:
+            try:
+                ticket.status = statuses[0]
+            except IndexError:
+                ticket.status = TicketStatus(name='Open')
+        if send_email_template:
+            try:
+                send_email_example = render_string_template(
+                    send_email_template, {'ticket': ticket})
+            except:
+                send_email_example = render_to_string(
+                    'services/emails/notify_caller', {'ticket': ticket}, response_format='html')
+        else:
+            send_email_example = render_to_string(
+                'services/emails/notify_caller', {'ticket': ticket}, response_format='html')
+
+    context = _get_default_context(request)
+    context.update({'settings_queues': queues,
+                    'settings_statuses': statuses,
+                    'default_ticket_status': default_ticket_status,
+                    'default_ticket_queue': default_ticket_queue,
+                    'send_email_to_caller': send_email_to_caller,
+                    'send_email_example': send_email_example})
+
+    return render_to_response('services/settings_view', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def settings_edit(request, response_format='html'):
+    "Settings"
+
+    if not request.user.profile.is_admin('treeio.services'):
+        return user_denied(request,
+                           message="You don't have administrator access to the Service Support module")
+
+    if request.POST:
+        if 'cancel' not in request.POST:
+            form = SettingsForm(request.user.profile, request.POST)
+            if form.is_valid():
+                form.save()
+                return HttpResponseRedirect(reverse('services_settings_view'))
+        else:
+            return HttpResponseRedirect(reverse('services_settings_view'))
+    else:
+        form = SettingsForm(request.user.profile)
+
+    context = _get_default_context(request)
+    context.update({'form': form})
+
+    return render_to_response('services/settings_edit', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+#
+# Agents
+#
+
+
+@handle_response_format
+@treeio_login_required
+def agent_index(request, response_format='html'):
+    "All available Agents"
+
+    if not request.user.profile.is_admin('treeio.services'):
+        return user_denied(request,
+                           message="You don't have administrator access to the Service Support module")
+
+    if request.GET:
+        query = _get_filter_query(request.GET, ServiceAgent)
+        agents = Object.filter_by_request(request,
+                                          ServiceAgent.objects.filter(query))
+    else:
+        agents = Object.filter_by_request(request,
+                                          ServiceAgent.objects)
+
+    filters = AgentFilterForm(request.user.profile, '', request.GET)
+
+    context = _get_default_context(request)
+    context.update({'agents': agents, 'filters': filters})
+
+    return render_to_response('services/agent_index', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def agent_view(request, agent_id, response_format='html'):
+    "Agent view"
+
+    view_agent = get_object_or_404(ServiceAgent, pk=agent_id)
+    if not request.user.profile.has_permission(view_agent):
+        return user_denied(request, message="You don't have access to this Service Agent")
+
+    context = _get_default_context(request)
+    context.update({'view_agent': view_agent})
+
+    return render_to_response('services/agent_view', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def agent_edit(request, agent_id, response_format='html'):
+    "Agent edit"
+
+    view_agent = get_object_or_404(ServiceAgent, pk=agent_id)
+    if not request.user.profile.has_permission(view_agent):
+        return user_denied(request, message="You don't have access to this Service Agent")
+
+    if request.POST:
+        if 'cancel' not in request.POST:
+            form = AgentForm(
+                request.user.profile, request.POST, instance=view_agent)
+            if form.is_valid():
+                view_agent = form.save()
+                return HttpResponseRedirect(reverse('services_agent_view', args=[view_agent.id]))
+        else:
+            return HttpResponseRedirect(reverse('services_agent_view', args=[view_agent.id]))
+    else:
+        form = AgentForm(request.user.profile, instance=view_agent)
+
+    context = _get_default_context(request)
+    context.update({'form': form, 'view_agent': view_agent})
+
+    return render_to_response('services/agent_edit', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def agent_delete(request, agent_id, response_format='html'):
+    "Agent delete"
+
+    view_agent = get_object_or_404(ServiceAgent, pk=agent_id)
+    if not request.user.profile.has_permission(view_agent, mode='w'):
+        return user_denied(request, message="You don't have access to this Service Agent")
+
+    if request.POST:
+        if 'delete' in request.POST:
+            if 'trash' in request.POST:
+                view_agent.trash = True
+                view_agent.save()
+            else:
+                view_agent.delete()
+            return HttpResponseRedirect(reverse('services_agent_index'))
+        elif 'cancel' in request.POST:
+            return HttpResponseRedirect(reverse('services_agent_view', args=[view_agent.id]))
+
+    context = _get_default_context(request)
+    context.update({'view_agent': view_agent})
+
+    return render_to_response('services/agent_delete', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@handle_response_format
+@treeio_login_required
+def agent_add(request, response_format='html'):
+    "Agent add"
+
+    if not request.user.profile.is_admin('treeio.services'):
+        return user_denied(request,
+                           message="You don't have administrator access to the Service Support module")
+
+    if request.POST:
+        if 'cancel' not in request.POST:
+            new_agent = ServiceAgent()
+            form = AgentForm(
+                request.user.profile, request.POST, instance=new_agent)
+            if form.is_valid():
+                new_agent = form.save()
+                new_agent.set_user_from_request(request)
+                return HttpResponseRedirect(reverse('services_agent_view', args=[new_agent.id]))
+        else:
+            return HttpResponseRedirect(reverse('services_agent_index'))
+    else:
+        form = AgentForm(request.user.profile)
+
+    context = _get_default_context(request)
+    context.update({'form': form})
+
+    return render_to_response('services/agent_add', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+@treeio_login_required
+def widget_index(request, response_format='html'):
+    "All Active Tickets"
+
+    tickets = Object.filter_by_request(
+        request, Ticket.objects.filter(status__hidden=False))
+
+    context = _get_default_context(request)
+    context.update({'tickets': tickets})
+
+    return render_to_response('services/widgets/index', context,
+                              context_instance=RequestContext(request),
+                              response_format=response_format)
+
+
+@treeio_login_required
+def widget_index_assigned(request, response_format='html'):
+    "Tickets assigned to current user"
+
+    context = _get_default_context(request)
+    agent = context['agent']
+
+    if agent:
+        tickets = Object.filter_by_request(request, Ticket.objects.filter(assigned=agent,
+                                                                          status__hidden=False))
+    else:
+        return user_denied(request, "You are not a Service Support Agent.")
+
+    context.update({'tickets': tickets})
+
+    return render_to_response('services/widgets/index_assigned', context,
+                              context_instance=RequestContext(request), response_format=response_format)
+
+
+#
+# AJAX lookups
+#
+@treeio_login_required
+def ajax_ticket_lookup(request, response_format='html'):
+    "Returns a list of matching tickets"
+
+    tickets = []
+    if request.GET and 'term' in request.GET:
+        tickets = Ticket.objects.filter(
+            name__icontains=request.GET['term'])[:10]
+
+    return render_to_response('services/ajax_ticket_lookup',
+                              {'tickets': tickets},
+                              context_instance=RequestContext(request),
+                              response_format=response_format)
+
+
+@treeio_login_required
+def ajax_agent_lookup(request, response_format='html'):
+    "Returns a list of matching agents"
+
+    agents = []
+    if request.GET and 'term' in request.GET:
+        agents = ServiceAgent.objects.filter(Q(related_user__name__icontains=request.GET['term']) |
+                                             Q(related_user__contact__name__icontains=request.GET['term']))
+
+    return render_to_response('services/ajax_agent_lookup',
+                              {'agents': agents},
+                              context_instance=RequestContext(request),
+                              response_format=response_format)
diff --git a/data/treeio/treeio/treeio_project/settings.py b/data/treeio/treeio/treeio_project/settings.py
new file mode 100644
index 0000000..c0410e1
--- /dev/null
+++ b/data/treeio/treeio/treeio_project/settings.py
@@ -0,0 +1,590 @@
+# encoding: utf-8
+# Copyright 2011 Tree.io Limited
+# This file is part of Treeio.
+# License www.tree.io/license
+
+# coding=utf-8
+
+"""
+Django settings for treeio project.
+"""
+
+import os
+from os import path
+from whoosh import fields
+import ConfigParser
+import sys
+
+BASE_DIR = path.dirname(path.dirname(path.abspath(__file__)))
+CONFIG_FILE = 'treeio.ini'
+USER_CONFIG_FILE = path.join(path.dirname(BASE_DIR), CONFIG_FILE)
+DEFAULT_CONFIG_FILE = path.join(BASE_DIR, CONFIG_FILE)
+DEBUG = (True if 'DEBUG' not in os.environ else {'true': True, 'false': False}[os.environ['DEBUG'].lower()])
+DEBUG = True
+TEMPLATE_DEBUG = DEBUG
+
+QUERY_DEBUG = False
+QUERY_DEBUG_FULL = False
+
+ADMINS = (
+    # ('Your Name', 'your_email@domain.com'),
+)
+
+MANAGERS = ADMINS
+DATABASES = {}
+TESTING = 'test' in sys.argv or 'test_coverage' in sys.argv  # Covers regular testing and django-coverage
+
+if TESTING:
+    test_db = os.environ.get('DB', 'sqlite')
+    if test_db == 'mysql':
+        DATABASES = {'default': {
+            'ENGINE': 'django.db.backends.mysql',
+            'NAME': 'treeio',
+            'USER': 'root',
+            }}
+    elif test_db == 'postgres':
+        DATABASES = {'default': {
+            'ENGINE': 'django.db.backends.postgresql_psycopg2',
+            'NAME': 'treeio',
+            'USER': 'postgres',
+        }}
+    elif test_db == 'sqlite':
+        DATABASES = {'default': {'ENGINE': 'django.db.backends.sqlite3'}}
+    elif test_db == 'oracle':
+        DATABASES = {'default': {
+            'ENGINE': 'django.db.backends.oracle',
+            'NAME': 'treeio',
+            'USER': 'treeio',
+            'PASSWORD': 'treeio',
+        }}
+
+    if os.environ.get('MC') == '1':
+        CACHES = {
+            'default': {
+                'BACKEND': 'django.core.cache.backends.memcached.PyLibMCCache',
+                'LOCATION': '127.0.0.1:11211',
+                }
+        }
+
+    PASSWORD_HASHERS = ('django.contrib.auth.hashers.MD5PasswordHasher',)
+    HARDTREE_API_AUTH_ENGINE = 'basic'
+else:
+    CONF = ConfigParser.ConfigParser()
+    CONF.optionxform = str  # to preserve case for the options names
+    CONF.read((DEFAULT_CONFIG_FILE, USER_CONFIG_FILE))
+    DATABASES = {
+        'default': dict(CONF.items('db'))
+    }
+
+# Local time zone for this installation. Choices can be found here:
+# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
+# although not all choices may be available on all operating systems.
+# If running in a Windows environment this must be set to the same as your
+# system time zone.
+TIME_ZONE = 'UTC'
+
+# Language code for this installation. All choices can be found here:
+# http://www.i18nguy.com/unicode/language-identifiers.html
+LANGUAGE_CODE = 'en-GB'
+
+SITE_ID = 1
+
+# If you set this to False, Django will make some optimizations so as not
+# to load the internationalization machinery.
+USE_I18N = True
+FORMAT_MODULE_PATH = 'treeio.formats'
+
+HARDTREE_API_CONSUMER_DB = 'default'
+# OAUTH_DATA_STORE is needed for correct database setting up
+OAUTH_DATA_STORE = 'treeio.core.api.auth.store.store'
+
+# Static files location for Tree.io
+if not DEBUG:
+    STATIC_URL = path.join(BASE_DIR, 'static/')
+else:
+    STATICFILES_DIRS = (
+        path.join(BASE_DIR, 'static'),
+    )
+STATIC_URL = '/static/'
+STATIC_ROOT = os.path.join(path.dirname(BASE_DIR), 'static')
+STATIC_DOC_ROOT = os.path.join(BASE_DIR, 'static')
+STATICFILES_FINDERS = (
+    'django.contrib.staticfiles.finders.FileSystemFinder',
+    'django.contrib.staticfiles.finders.AppDirectoriesFinder',
+    'dajaxice.finders.DajaxiceFinder',
+)
+
+# Absolute path to the directory that holds media.
+# Example: "/home/media/media.lawrence.com/"
+MEDIA_ROOT = os.path.join(STATIC_DOC_ROOT, 'media/')
+
+# URL that handles the media served from MEDIA_ROOT. Make sure to use a
+# trailing slash if there is a path component (optional in other cases).
+# Examples: "http://media.lawrence.com", "http://example.com/media/"
+MEDIA_URL = '/static/media/'
+
+# Captcha Settings
+CAPTCHA_FONT_SIZE = 30
+CAPTCHA_LENGTH = 6
+CAPTCHA_DISABLE = True
+CAPTCHA_FOREGROUND_COLOR = '#333333'
+CAPTCHA_NOISE_FUNCTIONS = []
+
+# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
+# trailing slash.
+# Examples: "http://foo.com/media/", "/media/".
+ADMIN_MEDIA_PREFIX = '/static-admin/'
+
+# Make this unique, and don't share it with anybody.
+SECRET_KEY = 'z_#oc^n&z0c2lix=s$4+z#lsb9qd32qtb!#78nk7=5$_k3lq16'
+
+# List of callables that know how to import templates from various sources.
+# TEMPLATE_LOADERS = (
+#     'django.template.loaders.filesystem.load_template_source',
+#     'django.template.loaders.app_directories.load_template_source',
+#     'django.template.loaders.eggs.load_template_source',
+# )
+if DEBUG or TESTING:
+    TEMPLATE_LOADERS = [
+        'django.template.loaders.app_directories.Loader',
+        'django.template.loaders.filesystem.Loader',
+        'django.template.loaders.eggs.Loader',
+    ]
+else:
+    TEMPLATE_LOADERS = [
+        ('django.template.loaders.cached.Loader', (
+            'django.template.loaders.app_directories.Loader',
+            'django.template.loaders.filesystem.Loader',
+            'django.template.loaders.eggs.Loader',
+            )),
+    ]
+
+TEMPLATE_CONTEXT_PROCESSORS = (
+    "django.contrib.auth.context_processors.auth",
+    "django.core.context_processors.i18n",
+    "django.core.context_processors.debug",
+    "django.core.context_processors.media",
+    "django.core.context_processors.static",
+    "django.core.context_processors.tz",
+    "django.core.context_processors.request",
+    'django.contrib.messages.context_processors.messages',
+)
+
+
+MIDDLEWARE_CLASSES = (
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'treeio.core.middleware.user.AuthMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+    "treeio.core.middleware.user.LanguageMiddleware",
+    "django.middleware.locale.LocaleMiddleware",
+    'django.middleware.common.CommonMiddleware',
+    'johnny.middleware.LocalStoreClearMiddleware',
+    'johnny.middleware.QueryCacheMiddleware',
+    'django.middleware.gzip.GZipMiddleware',
+    # 'treeio.core.middleware.domain.DomainMiddleware',
+    'treeio.core.middleware.user.SSLMiddleware',
+    'django.middleware.csrf.CsrfViewMiddleware',
+    'treeio.core.middleware.chat.ChatAjaxMiddleware',
+    "django.contrib.messages.middleware.MessageMiddleware",
+    "treeio.core.middleware.modules.ModuleDetect",
+    "minidetector.Middleware",
+    "treeio.core.middleware.user.CommonMiddleware",
+    "treeio.core.middleware.user.PopupMiddleware",
+)
+
+
+ROOT_URLCONF = 'treeio_project.urls'
+
+TEMPLATE_DIRS = (
+    os.path.join(BASE_DIR, 'templates'),
+)
+
+
+INSTALLED_APPS = (
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.sites',
+    'django.contrib.admin',
+    'django.contrib.staticfiles',
+    'django_websocket',
+    'django.contrib.messages',
+    'treeio.account',
+    'treeio.core',
+    'treeio.core.api',
+    'treeio.core.search',
+    'treeio.documents',
+    'treeio.events',
+    'treeio.finance',
+    'treeio.identities',
+    'treeio.infrastructure',
+    'treeio.knowledge',
+    'treeio.messaging',
+    'treeio.news',
+    'treeio.projects',
+    'treeio.reports',
+    'treeio.sales',
+    'treeio.services',
+    'dajaxice',
+    'dajax',
+    'coffin',
+    'captcha',
+    'markup_deprecated',
+)
+try:
+    import rosetta
+    INSTALLED_APPS += ('rosetta',)
+except ImportError:
+    pass
+if not DEBUG:
+    INSTALLED_APPS += ('django.contrib.staticfiles',)
+
+AUTH_PROFILE_MODULE = 'core.User'
+
+AUTHENTICATION_BACKENDS = (
+    'django.contrib.auth.backends.ModelBackend',
+    'treeio.core.auth.HashBackend',
+    'treeio.core.auth.EmailBackend',
+)
+
+# LDAP Configuration
+# AUTH_LDAP_SERVER_URI = 'ldap://'
+# AUTH_LDAP_BIND_DN = ""
+# AUTH_LDAP_BIND_PASSWORD = ""
+# AUTH_LDAP_USER_SEARCH = LDAPSearch("ou=users,dc=example,dc=com",
+#        ldap.SCOPE_SUBTREE, "(uid=%(user)s)")
+# AUTH_LDAP_START_TLS = True
+
+#
+# Hardtree configuration
+#
+HARDTREE_MODULE_IDENTIFIER = 'hmodule'
+
+HARDTREE_DEFAULT_USER_ID = 1
+
+HARDTREE_DEFAULT_PERMISSIONS = 'everyone'
+
+HARDTREE_SEND_EMAIL_TO_CALLER = True
+
+HARDTREE_ALLOW_EMAIL_NOTIFICATIONS = True
+HARDTREE_ALLOW_GRITTER_NOTIFICATIONS = True
+
+HARDTREE_PASSWORD_LENGTH_MIN = 4
+
+HARDTREE_RESPONSE_FORMATS = {
+    'html': 'text/html',
+    'mobile': 'text/html',
+    'json': 'text/plain',
+    # 'json': 'application/json',
+    'ajax': 'text/plain',
+    # 'ajax': 'application/json',
+    'csv': 'text/csv',
+    'xls': 'text/xls',
+    'pdf': 'application/pdf',
+    'rss': 'application/rss+xml',
+}
+
+HARDTREE_IMAGE_MAX_SIZE = (300, 400)
+HARDTREE_IMAGE_RESIZE_FILTER = 'ANTIALIAS'
+
+HARDTREE_MINIFY_JSON = False
+
+HARDTREE_PAGINATOR_LENGTH = 20
+HARDTREE_PAGINATOR_PAGES = 15
+
+#
+# CRON Fine-tuning
+#
+
+# How often should we loop through jobs, add/remove from pool, recycle jobs:
+HARDTREE_CRON_PERIOD = 10  # seconds, default 60
+
+# Number of cycles to keep HIGH priority jobs before forcefully terminating
+# HARDTREE_CRON_HIGH_PRIORITY = 10 # default 10 cycles
+
+# Number of cycles to keep LOW priority jobs before forcefully terminating
+# HARDTREE_CRON_LOW_PRIORITY = 3 # default 3 cycles
+
+# Number of seconds since last access to domain to give the job HIGH priority
+# HARDTREE_CRON_QUALIFY_HIGH = 10 # default 10 cycles
+
+# Number of seconds since last access to domain to run cron jobs for the domain
+# HARDTREE_CRON_QUALIFY_RUN = 86400 # seconds, default 86400, i.e. 1 day
+
+# Number of jobs to keep in the pool at the same time
+# HARDTREE_CRON_POOL_SIZE = 10 # default 10
+
+# Priority value at which we should try to gracefully end a job
+# HARDTREE_CRON_SOFT_KILL = 0 # default 0
+
+# Priority value at which we must kill a job using any possible means (kill -9 job)
+# HARDTREE_CRON_HARD_KILL = -1 # defualt -1
+
+# Seconds to wait between SIGKILL signals to a dead job
+# HARDTREE_CRON_GRACE_WAIT = 5 # default 5
+
+# CHAT CRON!
+HARDTREE_CRON_DISABLED = True  # Run chat?
+
+# ## CRON config ends here
+
+HARDTREE_MULTIPLE_LOGINS_DISABLED = False
+
+HARDTREE_SERVER_DEFAULT_TIMEZONE = 49  # (GMT+00:00) UTC
+HARDTREE_SERVER_TIMEZONE = (
+    ('0', u'(GMT-11:00) International Date Line West'),
+    ('1', u'(GMT-11:00) Midway Island'), ('2', u'(GMT-11:00) Samoa'),
+    ('3', u'(GMT-10:00) Hawaii'), ('4', u'(GMT-09:00) Alaska'),
+    ('5', u'(GMT-08:00) Tijuana'), ('6', u'(GMT-08:00) Pacific Time (US & Canada)'),
+    ('7', u'(GMT-07:00) Arizona'), ('8', u'(GMT-07:00) Arizona'),
+    ('9', u'(GMT-08:00) Pacific Time (US & Canada)'), ('10', u'(GMT-07:00) Arizona'),
+    ('11', u'(GMT-07:00) Mountain Time (US & Canada)'), ('12', u'(GMT-07:00) Chihuahua'),
+    ('13', u'(GMT-07:00) Mazatlan'), ('14', u'(GMT-06:00) Central Time (US & Canada)'),
+    ('15', u'(GMT-06:00) Guadalajara'), ('16', u'(GMT-06:00) Mexico City'),
+    ('17', u'(GMT-06:00) Monterrey'), ('18', u'(GMT-06:00) Saskatchewan'),
+    ('19', u'(GMT-05:00) Eastern Time (US & Canada)'), ('20', u'(GMT-05:00) Indiana (East)'),
+    ('21', u'(GMT-05:00) Bogota'), ('22', u'(GMT-05:00) Lima'),
+    ('23', u'(GMT-05:00) Quito'), ('24', u'(GMT-04:30) Caracas'),
+    ('25', u'(GMT-04:00) Atlantic Time (Canada)'), ('26', u'(GMT-04:00) La Paz'),
+    ('27', u'(GMT-04:00) Santiago'), ('28', u'(GMT-03:30) Newfoundland'),
+    ('29', u'(GMT-08:00) Pacific Time (US & Canada)'), ('30', u'(GMT-03:00) Brasilia'),
+    ('31', u'(GMT-03:00) Buenos Aires'), ('32', u'(GMT-03:00) Georgetown'),
+    ('33', u'(GMT-03:00) Greenland'), ('34', u'(GMT-02:00) Mid-Atlantic'),
+    ('35', u'(GMT-01:00) Azores'), ('36', u'(GMT-01:00) Cape Verde Is.'),
+    ('37', u'(GMT+00:00) Casablanca'), ('38', u'(GMT+00:00) Dublin'),
+    ('39', u'(GMT+00:00) Edinburgh'), ('40', u'(GMT+00:00) Lisbon'),
+    ('41', u'(GMT+00:00) London'), ('42', u'(GMT+00:00) Monrovia'),
+    ('43', u'(GMT+00:00) UTC'), ('44', u'(GMT+01:00) Amsterdam'),
+    ('45', u'(GMT+01:00) Belgrade'), ('46', u'(GMT+01:00) Berlin'),
+    ('47', u'(GMT+01:00) Bern'), ('48', u'(GMT+01:00) Bratislava'),
+    ('49', u'(GMT+01:00) Brussels'), ('50', u'(GMT+01:00) Budapest'),
+    ('51', u'(GMT+01:00) Copenhagen'), ('52', u'(GMT+01:00) Ljubljana'),
+    ('53', u'(GMT+01:00) Madrid'), ('54', u'(GMT+01:00) Paris'),
+    ('55', u'(GMT+01:00) Prague'), ('56', u'(GMT+01:00) Rome'),
+    ('57', u'(GMT+01:00) Sarajevo'), ('58', u'(GMT+01:00) Skopje'),
+    ('59', u'(GMT+01:00) Stockholm'), ('60', u'(GMT+01:00) Vienna'),
+    ('61', u'(GMT+01:00) Warsaw'), ('62', u'(GMT+01:00) West Central Africa'),
+    ('63', u'(GMT+01:00) Zagreb'), ('64', u'(GMT+02:00) Athens'),
+    ('65', u'(GMT+02:00) Bucharest'), ('66', u'(GMT+02:00) Cairo'),
+    ('67', u'(GMT+02:00) Harare'), ('68', u'(GMT+02:00) Helsinki'),
+    ('69', u'(GMT+02:00) Istanbul'), ('70', u'(GMT+02:00) Jerusalem'),
+    ('71', u'(GMT+02:00) Kyev'), ('72', u'(GMT+02:00) Minsk'),
+    ('73', u'(GMT+02:00) Pretoria'), ('74', u'(GMT+02:00) Riga'),
+    ('75', u'(GMT+02:00) Sofia'), ('76', u'(GMT+02:00) Tallinn'),
+    ('77', u'(GMT+02:00) Vilnius'), ('78', u'(GMT+03:00) Baghdad'),
+    ('79', u'(GMT+03:00) Kuwait'), ('80', u'(GMT+03:00) Moscow'),
+    ('81', u'(GMT+03:00) Nairobi'), ('82', u'(GMT+03:00) Riyadh'),
+    ('83', u'(GMT+03:00) St. Petersburg'), ('84', u'(GMT+03:00) Volgograd'),
+    ('85', u'(GMT+03:30) Tehran'), ('86', u'(GMT+04:00) Abu Dhabi'),
+    ('87', u'(GMT+04:00) Baku'), ('88', u'(GMT+04:00) Muscat'),
+    ('89', u'(GMT+04:00) Tbilisi'), ('90', u'(GMT+04:00) Yerevan'),
+    ('91', u'(GMT+04:30) Kabul'), ('92', u'(GMT+05:00) Ekaterinburg'),
+    ('93', u'(GMT+05:00) Islamabad'), ('94', u'(GMT+05:00) Karachi'),
+    ('95', u'(GMT+05:00) Tashkent'), ('96', u'(GMT+05:30) Chennai'),
+    ('97', u'(GMT+05:30) Kolkata'), ('98', u'(GMT+05:30) Mumbai'),
+    ('99', u'(GMT+05:30) New Delhi'), ('100', u'(GMT+05:30) Sri Jayawardenepura'),
+    ('101', u'(GMT+05:45) Kathmandu'), ('102', u'(GMT+06:00) Almaty'),
+    ('103', u'(GMT+06:00) Astana'), ('104', u'(GMT+06:00) Dhaka'),
+    ('105', u'(GMT+06:00) Novosibirsk'), ('106', u'(GMT+06:30) Rangoon'),
+    ('107', u'(GMT+07:00) Bangkok'), ('108', u'(GMT+07:00) Hanoi'),
+    ('109', u'(GMT+07:00) Jakarta'), ('110', u'(GMT+07:00) Krasnoyarsk'),
+    ('111', u'(GMT+08:00) Beijing'), ('112', u'(GMT+08:00) Chongqing'),
+    ('113', u'(GMT+08:00) Hong Kong'), ('114', u'(GMT+08:00) Irkutsk'),
+    ('115', u'(GMT+08:00) Kuala Lumpur'), ('116', u'(GMT+08:00) Perth'),
+    ('117', u'(GMT+08:00) Singapore'), ('118', u'(GMT+08:00) Taipei'),
+    ('119', u'(GMT+08:00) Ulaan Bataar'), ('120', u'(GMT+08:00) Urumqi'),
+    ('121', u'(GMT+09:00) Osaka'), ('122', u'(GMT+09:00) Sapporo'),
+    ('123', u'(GMT+09:00) Seoul'), ('124', u'(GMT+09:00) Tokyo'),
+    ('125', u'(GMT+09:00) Yakutsk'), ('126', u'(GMT+09:30) Adelaide'),
+    ('127', u'(GMT+09:30) Darwin'), ('128', u'(GMT+10:00) Brisbane'),
+    ('129', u'(GMT+10:00) Canberra'), ('130', u'(GMT+10:00) Guam'),
+    ('131', u'(GMT+10:00) Hobart'), ('132', u'(GMT+10:00) Melbourne'),
+    ('133', u'(GMT+10:00) Port Moresby'), ('134', u'(GMT+10:00) Sydney'),
+    ('135', u'(GMT+10:00) Vladivostok'), ('136', u'(GMT+11:00) Magadan'),
+    ('137', u'(GMT+11:00) New Caledonia'), ('138', u'(GMT+11:00) Solomon Is.'),
+    ('139', u'(GMT+12:00) Auckland'), ('140', u'(GMT+12:00) Fiji'),
+    ('141', u'(GMT+12:00) Kamchatka'), ('142', u'(GMT+12:00) Marshall Is.'),
+    ('143', u'(GMT+12:00) Wellington'), ('144', u'(GMT+13:00) Nukualofa'),
+)
+
+#
+# Messaging
+#
+HARDTREE_MESSAGING_POP3_LIMIT = 100  # number of emails
+HARDTREE_MESSAGING_IMAP_LIMIT = 200  # number of emails
+
+HARDTREE_MESSAGING_UNSAFE_BLOCKS = (
+    'head', 'object', 'embed', 'applet', 'noframes', 'noscript', 'noembed',
+    'iframe', 'frame', 'frameset'
+)
+
+HARDTREE_MESSAGING_IMAP_DEFAULT_FOLDER_NAME = 'UNSEEN'
+
+HARDTREE_SIGNALS_AUTOCREATE_USER = True
+
+HARDTREE_HELP_LINK_PREFIX = '/help/'
+HARDTREE_HELP_SOURCE = 'http://www.tree.io/help'
+
+HARDTREE_LANGUAGES = (
+    ('en', u'English'),
+    ('ru', u'Русский'),
+    ('es', u'Español'),
+    ('de', u'Deutsche'),
+    ('zh_CN', u'简体中文'),
+    ('fr', u'Français'),
+    ('el', u'ελληνικά'),
+    ('pt_BR', u'português')
+)
+
+HARDTREE_LANGUAGES_DEFAULT = 'en'
+
+LOCALE_PATHS = (BASE_DIR + "/locale",)
+
+HARDTREE_AJAX_RELOAD_ON_REDIRECT = ('home',
+                                    'user_login',
+                                    'account_settings_view',
+                                    'core_admin_index_perspectives',
+                                    'core_admin_perspective_view',
+                                    'core_settings_view')
+
+HARDTREE_FORCE_AJAX_RENDERING = True
+
+#
+# htsafe settings
+#
+
+# Replace unsafe tags
+HARDTREE_SAFE_TAGS = ('div', 'ul', 'li', 'label', 'span', 'strong', 'em', 'p', 'input',
+                      'select', 'textarea', 'br')
+HARDTREE_UNSAFE_TAGS = ('script', 'object', 'embed',
+                        'applet', 'noframes', 'noscript', 'noembed', 'iframe',
+                        'frame', 'frameset')
+
+
+#
+# Hardtree Subcription settings
+#
+
+EVERGREEN_FREE_USERS = 3
+
+USER_PRICE = 15
+
+HARDTREE_SUBSCRIPTION_CUSTOMIZATION = True
+
+HARDTREE_SUBSCRIPTION_USER_LIMIT = 0
+
+HARDTREE_SUBSCRIPTION_BLOCKED = False
+
+HARDTREE_SUBSCRIPTION_SSL_ENABLED = False
+HARDTREE_SUBSCRIPTION_SSL_ENFORCE = False
+
+HARDTREE_DEMO_MODE = False
+
+
+#
+# Nuvius settings (for integration)
+#
+NUVIUS_URL = "http://nuvius.com"
+NUVIUS_KEY = '28563.ff6ed93307fc398a52d312966c122660'
+NUVIUS_SOURCE_ID = "28563"
+NUVIUS_NEXT = "iframe"
+NUVIUS_CHECK_USER_KEYS = True
+
+NUVIUS_DATA_CACHE_LIFE = 600
+CACHE_KEY_PREFIX = 'treeio_'
+
+#
+# Email settings
+#
+
+EMAIL_SERVER = 'localhost'
+IMAP_SERVER = ''
+EMAIL_USERNAME = None
+EMAIL_PASSWORD = None
+EMAIL_FROM = 'noreply@tree.io'
+DEFAULT_SIGNATURE = """
+Thanks!
+The Tree.io Team
+http://www.tree.io
+            """
+
+
+#
+# Search index (Whoosh)
+#
+SEARCH_DISABLED = False
+SEARCH_ENGINE = 'db'
+
+WHOOSH_SCHEMA = fields.Schema(id=fields.ID(stored=True, unique=True),
+                              name=fields.TEXT(stored=True),
+                              type=fields.TEXT(stored=True),
+                              content=fields.TEXT,
+                              url=fields.ID(stored=True))
+
+WHOOSH_INDEX = os.path.join(BASE_DIR, 'storage/search')
+
+#
+# CACHING
+#
+if not TESTING:
+    try:
+        import pylibmc
+        CACHES = {
+            'default': {
+                'BACKEND': 'django.core.cache.backends.memcached.PyLibMCCache',
+                'LOCATION': CONF.get('memcached', 'location'),
+                }
+        }
+    except ImportError:
+        import tempfile
+        CACHES = {
+            'default': {
+                'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
+                'LOCATION': tempfile.mkdtemp('django_cache'),
+                }
+        }
+
+# CACHE_BACKEND="johnny.backends.locmem://"
+
+JOHNNY_MIDDLEWARE_KEY_PREFIX = 'jc_treeio'
+
+DISABLE_QUERYSET_CACHE = False
+
+HARDTREE_OBJECT_BLACKLIST = [
+    'id', 'creator', 'object_name', 'object_type', 'trash', 'full_access',
+    'read_access', 'nuvius_resource', 'object_ptr', 'comments', 'likes',
+    'dislikes', 'tags', 'links', 'subscribers', 'read_by']
+
+HARDTREE_UPDATE_BLACKLIST = [
+    'likes', 'dislikes', 'tags', 'reference', 'total', 'links', 'subscribers',
+    'read_by', 'date_created', 'last_updated']
+
+HARDTREE_TIMEZONE_BLACKLIST = [
+    'date_created', 'last_updated', 'time_from', 'time_to']
+
+WKPATH = os.path.join(BASE_DIR, 'bin/wkhtmltopdf')
+WKCWD = BASE_DIR
+
+CHAT_LONG_POLLING = False
+CHAT_TIMEOUT = 25  # response time if not new data
+CHAT_TIME_SLEEP_THREAD = 25  # interval for "Delete inactive users"
+CHAT_TIME_SLEEP_NEWDATA = 1  # time sleep in expectation of new data
+
+MESSAGE_STORAGE = 'treeio.core.contrib.messages.storage.cache.CacheStorage'
+
+# Dajaxice settings
+DAJAXICE_MEDIA_PREFIX = "dajaxice"
+
+ALLOWED_HOSTS = [
+    'localhost',
+    '127.0.0.1',
+    # '.example.com', # Allow domain and subdomains
+    # '.example.com.', # Also allow FQDN and subdomains
+    ]
+
+TEST_RUNNER = 'django.test.runner.DiscoverRunner'
+
+# monkey patch because dajax still tries to import django simplejson
+import json
+import django.utils
+django.utils.simplejson = json